generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
updates.

The tags will be OpenSSL_0_9_6d-beta1 and OpenSSL-engine-0_9_6d-beta1.
This commit is contained in:
Richard Levitte
2002-04-17 12:52:33 +00:00
parent d2f64ef725
commit a5232ab0a0
5 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@@ -4,6 +4,9 @@
Changes between 0.9.6c and 0.9.6d [XX xxx XXXX] 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: *) Fix BASE64 decode (EVP_DecodeUpdate) for data with CR/LF ended lines:
an end-of-file condition would erronously be flagged, when the CRLF 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 was just at the end of a processed block. The bug was discovered when

2
README
View File

@@ -1,5 +1,5 @@
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) 1998-2002 The OpenSSL Project
Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson

3
STATUS
View File

@@ -1,10 +1,11 @@
OpenSSL STATUS Last modified at OpenSSL STATUS Last modified at
______________ $Date: 2002/02/26 13:41:15 $ ______________ $Date: 2002/04/17 12:52:31 $
DEVELOPMENT STATE DEVELOPMENT STATE
o OpenSSL 0.9.7: Under development... 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.6c: Released on December 21st, 2001
o OpenSSL 0.9.6b: Released on July 9th, 2001 o OpenSSL 0.9.6b: Released on July 9th, 2001
o OpenSSL 0.9.6a: Released on April 5th, 2001 o OpenSSL 0.9.6a: Released on April 5th, 2001

19
apps/req.c
View File

@@ -291,7 +291,7 @@ int MAIN(int argc, char **argv)
goto end; goto end;
} }
dtmp=X509_get_pubkey(xtmp); if ((dtmp=X509_get_pubkey(xtmp)) == NULL) goto end;
if (dtmp->type == EVP_PKEY_DSA) if (dtmp->type == EVP_PKEY_DSA)
dsa_params=DSAparams_dup(dtmp->pkey.dsa); dsa_params=DSAparams_dup(dtmp->pkey.dsa);
EVP_PKEY_free(dtmp); EVP_PKEY_free(dtmp);
@@ -758,17 +758,14 @@ loop:
/* Set version to V3 */ /* Set version to V3 */
if(!X509_set_version(x509ss, 2)) goto end; if(!X509_set_version(x509ss, 2)) goto end;
ASN1_INTEGER_set(X509_get_serialNumber(x509ss),0L); if (!ASN1_INTEGER_set(X509_get_serialNumber(x509ss),0L)) goto end;
X509_set_issuer_name(x509ss, if (!X509_set_issuer_name(x509ss, X509_REQ_get_subject_name(req))) goto end;
X509_REQ_get_subject_name(req)); if (!X509_gmtime_adj(X509_get_notBefore(x509ss),0)) goto end;
X509_gmtime_adj(X509_get_notBefore(x509ss),0); if (!X509_gmtime_adj(X509_get_notAfter(x509ss), (long)60*60*24*days)) goto end;
X509_gmtime_adj(X509_get_notAfter(x509ss), if (!X509_set_subject_name(x509ss, X509_REQ_get_subject_name(req))) goto end;
(long)60*60*24*days);
X509_set_subject_name(x509ss,
X509_REQ_get_subject_name(req));
tmppkey = X509_REQ_get_pubkey(req); tmppkey = X509_REQ_get_pubkey(req);
X509_set_pubkey(x509ss,tmppkey); if (!tmppkey || !X509_set_pubkey(x509ss,tmppkey)) goto end;
EVP_PKEY_free(tmppkey); EVP_PKEY_free(tmppkey);
/* Set up V3 context struct */ /* 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); else i = prompt_info(req, dn_sk, dn_sect, attr_sk, attr_sect, attribs);
if(!i) goto err; if(!i) goto err;
X509_REQ_set_pubkey(req,pkey); if (!X509_REQ_set_pubkey(req,pkey)) goto err;
ret=1; ret=1;
err: err:

4
crypto/opensslv.h
View File

@@ -25,8 +25,8 @@
* (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
* major minor fix final patch/beta) * major minor fix final patch/beta)
*/ */
#define OPENSSL_VERSION_NUMBER 0x00906040L #define OPENSSL_VERSION_NUMBER 0x00906041L
#define OPENSSL_VERSION_TEXT "OpenSSL 0.9.6d-dev [engine] XX xxx XXXX" #define OPENSSL_VERSION_TEXT "OpenSSL 0.9.6d-beta1 [engine] 17 Apr 2002"
#define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT #define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT