summaryrefslogtreecommitdiffstats
path: root/crypto/asn1
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2010-03-07 17:02:47 +0000
committerDr. Stephen Henson <steve@openssl.org>2010-03-07 17:02:47 +0000
commit809cd0a22da9dbc62a33ce30d6704214e3ca5427 (patch)
treec9edc5fc5b022486a3de500074bbe4d4093e8b60 /crypto/asn1
parentbea29921a8df8077d222e4ca73d78a38af7e5b81 (diff)
print outermost signature algorithm parameters too
Diffstat (limited to 'crypto/asn1')
-rw-r--r--crypto/asn1/t_x509.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/crypto/asn1/t_x509.c b/crypto/asn1/t_x509.c
index d7eab16339..bd22a8dd4f 100644
--- a/crypto/asn1/t_x509.c
+++ b/crypto/asn1/t_x509.c
@@ -168,12 +168,16 @@ int X509_print_ex(BIO *bp, X509 *x, unsigned long nmflags, unsigned long cflag)
if(!(cflag & X509_FLAG_NO_SIGNAME))
{
+ if(X509_signature_print(bp, x->sig_alg, NULL) <= 0)
+ goto err;
+#if 0
if (BIO_printf(bp,"%8sSignature Algorithm: ","") <= 0)
goto err;
if (i2a_ASN1_OBJECT(bp, ci->signature->algorithm) <= 0)
goto err;
if (BIO_puts(bp, "\n") <= 0)
goto err;
+#endif
}
if(!(cflag & X509_FLAG_NO_ISSUER))
@@ -327,8 +331,9 @@ int X509_signature_print(BIO *bp, X509_ALGOR *sigalg, ASN1_STRING *sig)
return ameth->sig_print(bp, sigalg, sig, 9, 0);
}
}
-
- return X509_signature_dump(bp, sig, 9);
+ if (sig)
+ return X509_signature_dump(bp, sig, 9);
+ return 1;
}
int ASN1_STRING_print(BIO *bp, const ASN1_STRING *v)