mirror of
https://github.com/openssl/openssl.git
synced 2024-11-29 04:55:11 +08:00
Print out OID of unknown signature or public key
algorithms.
This commit is contained in:
parent
db4a465974
commit
4ff18c8c3e
4
CHANGES
4
CHANGES
@ -3,6 +3,10 @@
|
||||
|
||||
Changes between 0.9.6 and 0.9.7 [xx XXX 2000]
|
||||
|
||||
*) If signature or public key algorithm is unrecognized print out its
|
||||
OID rather that just UNKOWN.
|
||||
[Steve Henson]
|
||||
|
||||
*) Avoid coredump with unsupported or invalid public keys by checking if
|
||||
X509_get_pubkey() fails in PKCS7_verify(). Fix memory leak when
|
||||
PKCS7_verify() fails with non detached data.
|
||||
|
@ -165,9 +165,11 @@ int X509_print_ex(BIO *bp, X509 *x, unsigned long nmflags, unsigned long cflag)
|
||||
|
||||
if(!(cflag & X509_FLAG_NO_SIGNAME))
|
||||
{
|
||||
i=OBJ_obj2nid(ci->signature->algorithm);
|
||||
if (BIO_printf(bp,"%8sSignature Algorithm: %s\n","",
|
||||
(i == NID_undef)?"UNKNOWN":OBJ_nid2ln(i)) <= 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;
|
||||
}
|
||||
|
||||
@ -194,9 +196,12 @@ int X509_print_ex(BIO *bp, X509 *x, unsigned long nmflags, unsigned long cflag)
|
||||
{
|
||||
if (BIO_write(bp,"\n Subject Public Key Info:\n",34) <= 0)
|
||||
goto err;
|
||||
i=OBJ_obj2nid(ci->key->algor->algorithm);
|
||||
if (BIO_printf(bp,"%12sPublic Key Algorithm: %s\n","",
|
||||
(i == NID_undef)?"UNKNOWN":OBJ_nid2ln(i)) <= 0) goto err;
|
||||
if (BIO_printf(bp,"%12sPublic Key Algorithm: ","") <= 0)
|
||||
goto err;
|
||||
if (i2a_ASN1_OBJECT(bp, ci->key->algor->algorithm) <= 0)
|
||||
goto err;
|
||||
if (BIO_puts(bp, "\n") <= 0)
|
||||
goto err;
|
||||
|
||||
pkey=X509_get_pubkey(x);
|
||||
if (pkey == NULL)
|
||||
|
Loading…
Reference in New Issue
Block a user