Commit 0f4d2607 authored by Richard Levitte's avatar Richard Levitte
Browse files

Recent changes from 0.9.6-stable

parent db0edbb7

INSTALL.W32

+1 −1
Original line number Original line Diff line number Diff line
@@ -216,7 +216,7 @@ 
	$ md c:\openssl\lib

	$ md c:\openssl\lib

	$ md c:\openssl\include

	$ md c:\openssl\include

	$ md c:\openssl\include\openssl

	$ md c:\openssl\include\openssl

	$ copy /b inc32\*               c:\openssl\include\openssl

	$ copy /b inc32\openssl\*       c:\openssl\include\openssl

	$ copy /b out32dll\ssleay32.lib c:\openssl\lib

	$ copy /b out32dll\ssleay32.lib c:\openssl\lib

	$ copy /b out32dll\libeay32.lib c:\openssl\lib

	$ copy /b out32dll\libeay32.lib c:\openssl\lib

	$ copy /b out32dll\ssleay32.dll c:\openssl\bin

	$ copy /b out32dll\ssleay32.dll c:\openssl\bin

apps/pkcs8.c

+5 −6
Original line number Original line Diff line number Diff line
@@ -249,7 +249,7 @@ int MAIN(int argc, char **argv) 
		}

		}

		BIO_free(in);

		BIO_free(in);

		if (!(p8inf = EVP_PKEY2PKCS8_broken(pkey, p8_broken))) {

		if (!(p8inf = EVP_PKEY2PKCS8_broken(pkey, p8_broken))) {

			BIO_printf(bio_err, "Error converting key\n", outfile);

			BIO_printf(bio_err, "Error converting key\n");

			ERR_print_errors(bio_err);

			ERR_print_errors(bio_err);

			return (1);

			return (1);

		}

		}
@@ -273,8 +273,7 @@ int MAIN(int argc, char **argv) 
			if (!(p8 = PKCS8_encrypt(pbe_nid, cipher,

			if (!(p8 = PKCS8_encrypt(pbe_nid, cipher,

					p8pass, strlen(p8pass),

					p8pass, strlen(p8pass),

					NULL, 0, iter, p8inf))) {

					NULL, 0, iter, p8inf))) {

				BIO_printf(bio_err, "Error encrypting key\n",

				BIO_printf(bio_err, "Error encrypting key\n");

								 outfile);

				ERR_print_errors(bio_err);

				ERR_print_errors(bio_err);

				return (1);

				return (1);

			}

			}
@@ -317,7 +316,7 @@ int MAIN(int argc, char **argv) 
		}

		}





		if (!p8) {

		if (!p8) {

			BIO_printf (bio_err, "Error reading key\n", outfile);

			BIO_printf (bio_err, "Error reading key\n");

			ERR_print_errors(bio_err);

			ERR_print_errors(bio_err);

			return (1);

			return (1);

		}

		}
@@ -331,13 +330,13 @@ int MAIN(int argc, char **argv) 
	}

	}





	if (!p8inf) {

	if (!p8inf) {

		BIO_printf(bio_err, "Error decrypting key\n", outfile);

		BIO_printf(bio_err, "Error decrypting key\n");

		ERR_print_errors(bio_err);

		ERR_print_errors(bio_err);

		return (1);

		return (1);

	}

	}





	if (!(pkey = EVP_PKCS82PKEY(p8inf))) {

	if (!(pkey = EVP_PKCS82PKEY(p8inf))) {

		BIO_printf(bio_err, "Error converting key\n", outfile);

		BIO_printf(bio_err, "Error converting key\n");

		ERR_print_errors(bio_err);

		ERR_print_errors(bio_err);

		return (1);

		return (1);

	}

	}

apps/x509.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1090,7 +1090,7 @@ static int x509_certify(X509_STORE *ctx, char *CAfile, const EVP_MD *digest, 
	BIO_free(io);

	BIO_free(io);

	io=NULL;

	io=NULL;

	

	

	if (!X509_STORE_add_cert(ctx,x)) goto end;

	/*if (!X509_STORE_add_cert(ctx,x)) goto end;*/





	/* NOTE: this certificate can/should be self signed, unless it was

	/* NOTE: this certificate can/should be self signed, unless it was

	 * a certificate request in which case it is not. */

	 * a certificate request in which case it is not. */

crypto/md5/asm/md5-586.pl

+1 −1
Original line number Original line Diff line number Diff line
@@ -293,7 +293,7 @@ sub md5_block 
	 &mov(&DWP(12,$tmp2,"",0),$D);

	 &mov(&DWP(12,$tmp2,"",0),$D);





	&cmp($tmp1,$X) unless $normal;			# check count

	&cmp($tmp1,$X) unless $normal;			# check count

	 &jge(&label("start")) unless $normal;

	 &jae(&label("start")) unless $normal;





	&pop("eax"); # pop the temp variable off the stack

	&pop("eax"); # pop the temp variable off the stack

	 &pop("ebx");

	 &pop("ebx");

crypto/perlasm/x86ms.pl

+3 −0
Original line number Original line Diff line number Diff line
@@ -141,7 +141,10 @@ sub main'jle { &out1("jle",@_); } 
sub main'jz	{ &out1("jz",@_); }

sub main'jz	{ &out1("jz",@_); }

sub main'jge	{ &out1("jge",@_); }

sub main'jge	{ &out1("jge",@_); }

sub main'jl	{ &out1("jl",@_); }

sub main'jl	{ &out1("jl",@_); }

sub main'ja	{ &out1("ja",@_); }

sub main'jae	{ &out1("jae",@_); }

sub main'jb	{ &out1("jb",@_); }

sub main'jb	{ &out1("jb",@_); }

sub main'jbe	{ &out1("jbe",@_); }

sub main'jc	{ &out1("jc",@_); }

sub main'jc	{ &out1("jc",@_); }

sub main'jnc	{ &out1("jnc",@_); }

sub main'jnc	{ &out1("jnc",@_); }

sub main'jnz	{ &out1("jnz",@_); }

sub main'jnz	{ &out1("jnz",@_); }