mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-01-18 13:44:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Handle empty X509_NAME in printing routines.

Browse Source
This commit is contained in:
Dr. Stephen Henson 2001-06-26 12:04:35 +00:00
parent c458a33196
commit 1e325f6149
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@ -11,6 +11,9 @@
*) applies to 0.9.6a (/0.9.6b) and 0.9.7 *) applies to 0.9.6a (/0.9.6b) and 0.9.7
+) applies to 0.9.7 only +) applies to 0.9.7 only
*) Handle special case when X509_NAME is empty in X509 printing routines.
[Steve Henson]
*) In dsa_do_verify (crypto/dsa/dsa_ossl.c), verify that r and s are *) In dsa_do_verify (crypto/dsa/dsa_ossl.c), verify that r and s are
positive and less than q. positive and less than q.
[Bodo Moeller] [Bodo Moeller]

4
crypto/asn1/t_x509.c
View File

@ -176,7 +176,7 @@ int X509_print_ex(BIO *bp, X509 *x, unsigned long nmflags, unsigned long cflag)
if(!(cflag & X509_FLAG_NO_ISSUER)) if(!(cflag & X509_FLAG_NO_ISSUER))
{ {
if (BIO_printf(bp," Issuer:%c",mlch) <= 0) goto err; if (BIO_printf(bp," Issuer:%c",mlch) <= 0) goto err;
if (!X509_NAME_print_ex(bp,X509_get_issuer_name(x),nmindent, nmflags)) goto err; if (X509_NAME_print_ex(bp,X509_get_issuer_name(x),nmindent, nmflags) < 0) goto err;
if (BIO_write(bp,"\n",1) <= 0) goto err; if (BIO_write(bp,"\n",1) <= 0) goto err;
} }
if(!(cflag & X509_FLAG_NO_VALIDITY)) if(!(cflag & X509_FLAG_NO_VALIDITY))
@ -191,7 +191,7 @@ int X509_print_ex(BIO *bp, X509 *x, unsigned long nmflags, unsigned long cflag)
if(!(cflag & X509_FLAG_NO_SUBJECT)) if(!(cflag & X509_FLAG_NO_SUBJECT))
{ {
if (BIO_printf(bp," Subject:%c",mlch) <= 0) goto err; if (BIO_printf(bp," Subject:%c",mlch) <= 0) goto err;
if (!X509_NAME_print_ex(bp,X509_get_subject_name(x),nmindent, nmflags)) goto err; if (X509_NAME_print_ex(bp,X509_get_subject_name(x),nmindent, nmflags) < 0) goto err;
if (BIO_write(bp,"\n",1) <= 0) goto err; if (BIO_write(bp,"\n",1) <= 0) goto err;
} }
if(!(cflag & X509_FLAG_NO_PUBKEY)) if(!(cflag & X509_FLAG_NO_PUBKEY))

2
crypto/x509/x509_obj.c
View File

@ -214,6 +214,8 @@ int i;
} }
else else
p=buf; p=buf;
if (i == 0)
*p = '\0';
return(p); return(p);
err: err:
X509err(X509_F_X509_NAME_ONELINE,ERR_R_MALLOC_FAILURE); X509err(X509_F_X509_NAME_ONELINE,ERR_R_MALLOC_FAILURE);