Commit a5232ab0 authored by Richard Levitte's avatar Richard Levitte
Browse files

Merge in the latest changes from 0.9.6-stable, including the version 

updates.

The tags will be OpenSSL_0_9_6d-beta1 and OpenSSL-engine-0_9_6d-beta1.
parent d2f64ef7

CHANGES

+3 −0
Original line number Diff line number Diff line
@@ -4,6 +4,9 @@ 


 Changes between 0.9.6c and 0.9.6d  [XX xxx XXXX]



  *) Check various X509_...() return values in apps/req.c.

     [Nils Larsch <nla@trustcenter.de>]



  *) Fix BASE64 decode (EVP_DecodeUpdate) for data with CR/LF ended lines:

     an end-of-file condition would erronously be flagged, when the CRLF

     was just at the end of a processed block. The bug was discovered when

README

+1 −1
Original line number Diff line number Diff line 


 OpenSSL 0.9.6d-dev [engine] XX xxx XXXX

 OpenSSL 0.9.6d-beta1 [engine] 17 Apr 2002



 Copyright (c) 1998-2002 The OpenSSL Project

 Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson

STATUS

+2 −1
Original line number Diff line number Diff line 


  OpenSSL STATUS                           Last modified at

  ______________                           $Date: 2002/02/26 13:41:15 $

  ______________                           $Date: 2002/04/17 12:52:31 $



  DEVELOPMENT STATE



    o  OpenSSL 0.9.7:  Under development...

    o  OpenSSL 0.9.6d: Feature freeze, beta1 April 17th, 2002

    o  OpenSSL 0.9.6c: Released on December  21st, 2001

    o  OpenSSL 0.9.6b: Released on July       9th, 2001

    o  OpenSSL 0.9.6a: Released on April      5th, 2001

apps/req.c

+9 −12
Original line number Diff line number Diff line
@@ -291,7 +291,7 @@ int MAIN(int argc, char **argv) 
						goto end;

						}



					dtmp=X509_get_pubkey(xtmp);

					if ((dtmp=X509_get_pubkey(xtmp)) == NULL) goto end;

					if (dtmp->type == EVP_PKEY_DSA)

						dsa_params=DSAparams_dup(dtmp->pkey.dsa);

					EVP_PKEY_free(dtmp);
@@ -758,17 +758,14 @@ loop: 


			/* Set version to V3 */

			if(!X509_set_version(x509ss, 2)) goto end;

			ASN1_INTEGER_set(X509_get_serialNumber(x509ss),0L);



			X509_set_issuer_name(x509ss,

				X509_REQ_get_subject_name(req));

			X509_gmtime_adj(X509_get_notBefore(x509ss),0);

			X509_gmtime_adj(X509_get_notAfter(x509ss),

				(long)60*60*24*days);

			X509_set_subject_name(x509ss,

				X509_REQ_get_subject_name(req));

			if (!ASN1_INTEGER_set(X509_get_serialNumber(x509ss),0L)) goto end;



			if (!X509_set_issuer_name(x509ss, X509_REQ_get_subject_name(req))) goto end;

			if (!X509_gmtime_adj(X509_get_notBefore(x509ss),0)) goto end;

			if (!X509_gmtime_adj(X509_get_notAfter(x509ss), (long)60*60*24*days)) goto end;

			if (!X509_set_subject_name(x509ss, X509_REQ_get_subject_name(req))) goto end;

			tmppkey = X509_REQ_get_pubkey(req);

			X509_set_pubkey(x509ss,tmppkey);

			if (!tmppkey || !X509_set_pubkey(x509ss,tmppkey)) goto end;

			EVP_PKEY_free(tmppkey);



			/* Set up V3 context struct */
@@ -999,7 +996,7 @@ static int make_REQ(X509_REQ *req, EVP_PKEY *pkey, int attribs) 
	else i = prompt_info(req, dn_sk, dn_sect, attr_sk, attr_sect, attribs);

	if(!i) goto err;



	X509_REQ_set_pubkey(req,pkey);

	if (!X509_REQ_set_pubkey(req,pkey)) goto err;



	ret=1;

err:

crypto/opensslv.h

+2 −2
Original line number Diff line number Diff line
@@ -25,8 +25,8 @@ 
 * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for

 *  major minor fix final patch/beta)

 */

#define OPENSSL_VERSION_NUMBER	0x00906040L

#define OPENSSL_VERSION_TEXT	"OpenSSL 0.9.6d-dev [engine] XX xxx XXXX"

#define OPENSSL_VERSION_NUMBER	0x00906041L

#define OPENSSL_VERSION_TEXT	"OpenSSL 0.9.6d-beta1 [engine] 17 Apr 2002"

#define OPENSSL_VERSION_PTEXT	" part of " OPENSSL_VERSION_TEXT