mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-04-06 20:20:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

print outermost signature algorithm parameters too

Browse Source
This commit is contained in:
Dr. Stephen Henson 2010-03-07 17:02:47 +00:00
parent bea29921a8
commit 809cd0a22d
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
crypto/asn1/t_x509.c
View File

@ -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)

5
crypto/rsa/rsa_ameth.c
View File

@ -400,8 +400,9 @@ static int rsa_sig_print(BIO *bp, const X509_ALGOR *sigalg,
if (!rv)
return 0;
}
return X509_signature_dump(bp, sig, indent);
if (sig)
return X509_signature_dump(bp, sig, indent);
return 1;
}
static int rsa_pkey_ctrl(EVP_PKEY *pkey, int op, long arg1, void *arg2)