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_spki.c | |
parent | c788e5936564c6b4927f7236a79aac20b5673986 (diff) |
Gather printing routines into EVP_PKEY_ASN1_METHOD.
Diffstat (limited to 'crypto/asn1/t_spki.c')
-rw-r--r-- | crypto/asn1/t_spki.c | 31 |
1 files changed, 3 insertions, 28 deletions
diff --git a/crypto/asn1/t_spki.c b/crypto/asn1/t_spki.c index c2a5797dd8..3544c97127 100644 --- a/crypto/asn1/t_spki.c +++ b/crypto/asn1/t_spki.c @@ -82,36 +82,11 @@ int NETSCAPE_SPKI_print(BIO *out, NETSCAPE_SPKI *spki) (i == NID_undef)?"UNKNOWN":OBJ_nid2ln(i)); pkey = X509_PUBKEY_get(spki->spkac->pubkey); if(!pkey) BIO_printf(out, " Unable to load public key\n"); - else { -#ifndef OPENSSL_NO_RSA - if (pkey->type == EVP_PKEY_RSA) - { - BIO_printf(out," RSA Public Key: (%d bit)\n", - BN_num_bits(pkey->pkey.rsa->n)); - RSA_print(out,pkey->pkey.rsa,2); - } - else -#endif -#ifndef OPENSSL_NO_DSA - if (pkey->type == EVP_PKEY_DSA) - { - BIO_printf(out," DSA Public Key:\n"); - DSA_print(out,pkey->pkey.dsa,2); - } - else -#endif -#ifndef OPENSSL_NO_EC - if (pkey->type == EVP_PKEY_EC) + else { - BIO_printf(out, " EC Public Key:\n"); - EC_KEY_print(out, pkey->pkey.ec,2); - } - else -#endif - - BIO_printf(out," Unknown Public Key:\n"); + EVP_PKEY_print_public(out, pkey, 4, NULL); EVP_PKEY_free(pkey); - } + } chal = spki->spkac->challenge; if(chal->length) BIO_printf(out, " Challenge String: %s\n", chal->data); |