diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2006-03-22 13:09:35 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2006-03-22 13:09:35 +0000 |
| commit | 35208f368ceb7814ad93688657bfa05ff2b548ec (patch) | |
| tree | 2e66022b19bc685363a327e8fdcc7e083a942d34 /crypto/asn1/t_req.c | |
| parent | c788e5936564c6b4927f7236a79aac20b5673986 (diff) | |
| download | openssl-35208f368ceb7814ad93688657bfa05ff2b548ec.tar.gz | |
Gather printing routines into EVP_PKEY_ASN1_METHOD.
Diffstat (limited to 'crypto/asn1/t_req.c')
| -rw-r--r-- | crypto/asn1/t_req.c | 28 |
1 files changed, 2 insertions, 26 deletions
diff --git a/crypto/asn1/t_req.c b/crypto/asn1/t_req.c index c779a9bb18..0d169c9acc 100644 --- a/crypto/asn1/t_req.c +++ b/crypto/asn1/t_req.c @@ -149,34 +149,10 @@ int X509_REQ_print_ex(BIO *bp, X509_REQ *x, unsigned long nmflags, unsigned long ERR_print_errors(bp); } else -#ifndef OPENSSL_NO_RSA - if (pkey->type == EVP_PKEY_RSA) - { - BIO_printf(bp,"%12sRSA Public Key: (%d bit)\n","", - BN_num_bits(pkey->pkey.rsa->n)); - RSA_print(bp,pkey->pkey.rsa,16); - } - else -#endif -#ifndef OPENSSL_NO_DSA - if (pkey->type == EVP_PKEY_DSA) { - BIO_printf(bp,"%12sDSA Public Key:\n",""); - DSA_print(bp,pkey->pkey.dsa,16); + EVP_PKEY_print_public(bp, pkey, 16, NULL); + EVP_PKEY_free(pkey); } - else -#endif -#ifndef OPENSSL_NO_EC - if (pkey->type == EVP_PKEY_EC) - { - BIO_printf(bp, "%12sEC Public Key: \n",""); - EC_KEY_print(bp, pkey->pkey.ec, 16); - } - else -#endif - BIO_printf(bp,"%12sUnknown Public Key:\n",""); - - EVP_PKEY_free(pkey); } if(!(cflag & X509_FLAG_NO_ATTRIBUTES)) |