Commit 696335ab authored by Richard Levitte's avatar Richard Levitte
Browse files

Recent changes from 0.9.6-stable

parent 322f190a
Loading
Loading
Loading
Loading
+16 −0
Original line number Original line Diff line number Diff line
@@ -40,3 +40,19 @@ scripts use the same name for output and input files, which means different
will interfere with each other and lead to test failure.
will interfere with each other and lead to test failure.


The solution is simple for now: don't run parallell make when testing.
The solution is simple for now: don't run parallell make when testing.


* Bugs in gcc 3.0 triggered

According to a problem report, there are bugs in gcc 3.0 that are
triggered by some of the code in OpenSSL, more specifically in
PEM_get_EVP_CIPHER_INFO().  The triggering code is the following:

	header+=11;
	if (*header != '4') return(0); header++;
	if (*header != ',') return(0); header++;

What happens is that gcc might optimize a little too agressively, and
you end up with an extra incrementation when *header != '4'.

We recommend that you upgrade gcc to as high a 3.x version as you can.
+2 −0
Original line number Original line Diff line number Diff line
@@ -633,12 +633,14 @@ bad:
	       that to access().  However, time's too short to do that just
	       that to access().  However, time's too short to do that just
	       now.
	       now.
            */
            */
#ifndef VXWORKS
		if (access(outdir,R_OK|W_OK|X_OK) != 0)
		if (access(outdir,R_OK|W_OK|X_OK) != 0)
			{
			{
			BIO_printf(bio_err,"I am unable to access the %s directory\n",outdir);
			BIO_printf(bio_err,"I am unable to access the %s directory\n",outdir);
			perror(outdir);
			perror(outdir);
			goto err;
			goto err;
			}
			}
#endif


		if (stat(outdir,&sb) != 0)
		if (stat(outdir,&sb) != 0)
			{
			{
+1 −1
Original line number Original line Diff line number Diff line
@@ -1284,7 +1284,7 @@ static int www_body(char *hostname, int s, unsigned char *context)
			else
			else
				{
				{
				BIO_printf(bio_s_out,"read R BLOCK\n");
				BIO_printf(bio_s_out,"read R BLOCK\n");
#ifndef MSDOS
#if !defined(MSDOS) && !defined(VXWORKS)
				sleep(1);
				sleep(1);
#endif
#endif
				continue;
				continue;
+5 −0
Original line number Original line Diff line number Diff line
@@ -116,6 +116,11 @@
#include <sys/param.h>
#include <sys/param.h>
#endif
#endif


#ifdef VXWORKS
#include <tickLib.h>
#undef SIGALRM
#endif

/* The following if from times(3) man page.  It may need to be changed
/* The following if from times(3) man page.  It may need to be changed
*/
*/
#ifndef HZ
#ifndef HZ
+1 −0
Original line number Original line Diff line number Diff line
@@ -57,6 +57,7 @@
 */
 */


#include "des_locl.h"
#include "des_locl.h"
#include <openssl/crypto.h>


int des_read_password(des_cblock *key, const char *prompt, int verify)
int des_read_password(des_cblock *key, const char *prompt, int verify)
	{
	{
Loading