diff options
| author | Bob Beck <beck@cvs.openbsd.org> | 2000-03-19 11:13:56 +0000 |
|---|---|---|
| committer | Bob Beck <beck@cvs.openbsd.org> | 2000-03-19 11:13:56 +0000 |
| commit | 49f56637dd22e4a7b21187190845bdf93f225b6c (patch) | |
| tree | 53fb7836f5f49958bff0a86c3daad74163301583 /lib/libcrypto/asn1/t_x509.c | |
| parent | 3fcaa7468f9b0354a53219db5fef7803a96ef49e (diff) | |
OpenSSL 0.9.5 merge
*warning* this bumps shared lib minors for libssl and libcrypto from 2.1 to 2.2
if you are using the ssl26 packages for ssh and other things to work you will
need to get new ones (see ~beck/libsslsnap/<arch>) on cvs or ~beck/src-patent.tar.gz on cvs
Diffstat (limited to 'lib/libcrypto/asn1/t_x509.c')
| -rw-r--r-- | lib/libcrypto/asn1/t_x509.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/lib/libcrypto/asn1/t_x509.c b/lib/libcrypto/asn1/t_x509.c index 42f4d498cfa..6ee1065ce94 100644 --- a/lib/libcrypto/asn1/t_x509.c +++ b/lib/libcrypto/asn1/t_x509.c @@ -188,11 +188,7 @@ int X509_print(BIO *bp, X509 *x) BIO_printf(bp,"%8sX509v3 extensions:\n",""); for (i=0; i<n; i++) { -#if 0 - int data_type,pack_type; -#endif ASN1_OBJECT *obj; - ex=X509_get_ext(x,i); if (BIO_printf(bp,"%12s","") <= 0) goto err; obj=X509_EXTENSION_get_object(ex); @@ -203,7 +199,7 @@ int X509_print(BIO *bp, X509 *x) if(!X509V3_EXT_print(bp, ex, 0, 16)) { BIO_printf(bp, "%16s", ""); - ASN1_OCTET_STRING_print(bp,ex->value); + M_ASN1_OCTET_STRING_print(bp,ex->value); } if (BIO_write(bp,"\n",1) <= 0) goto err; } @@ -223,10 +219,11 @@ int X509_print(BIO *bp, X509 *x) ((i+1) == n)?"":":") <= 0) goto err; } if (BIO_write(bp,"\n",1) != 1) goto err; + if (!X509_CERT_AUX_print(bp, x->aux, 0)) goto err; ret=1; err: if (str != NULL) ASN1_STRING_free(str); - if (m != NULL) Free((char *)m); + if (m != NULL) Free(m); return(ret); } |