diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2015-03-28 13:53:16 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2015-03-28 15:39:18 +0000 |
| commit | b1f3442857c1fd76e91941141bf671d19e90a79d (patch) | |
| tree | b0e75221e48b9fb7cced5215ccd7b5495343d80c | |
| parent | f0e6871df2e4641d0532e8f99d26c7a6454d03df (diff) | |
Remove d2i_X509_PKEY and i2d_X509_PKEY
Remove partially implemented d2i_X509_PKEY and i2d_X509_PKEY: nothing
uses them and they don't work properly. Update ordinals.
Reviewed-by: Kurt Roeckx <kurt@openssl.org>
| -rw-r--r-- | crypto/asn1/x_pkey.c | 38 | ||||
| -rw-r--r-- | crypto/x509/x509.h | 3 | ||||
| -rwxr-xr-x | util/libeay.num | 4 |
3 files changed, 2 insertions, 43 deletions
diff --git a/crypto/asn1/x_pkey.c b/crypto/asn1/x_pkey.c index f24c0ce914..2b131e4a59 100644 --- a/crypto/asn1/x_pkey.c +++ b/crypto/asn1/x_pkey.c @@ -63,44 +63,6 @@ #include <openssl/asn1_mac.h> #include <openssl/x509.h> -/* need to implement */ -int i2d_X509_PKEY(X509_PKEY *a, unsigned char **pp) -{ - return (0); -} - -X509_PKEY *d2i_X509_PKEY(X509_PKEY **a, const unsigned char **pp, long length) -{ - int i; - M_ASN1_D2I_vars(a, X509_PKEY *, X509_PKEY_new); - - M_ASN1_D2I_Init(); - M_ASN1_D2I_start_sequence(); - M_ASN1_D2I_get_x(X509_ALGOR, ret->enc_algor, d2i_X509_ALGOR); - M_ASN1_D2I_get_x(ASN1_OCTET_STRING, ret->enc_pkey, d2i_ASN1_OCTET_STRING); - - ret->cipher.cipher = - EVP_get_cipherbyname(OBJ_nid2ln - (OBJ_obj2nid(ret->enc_algor->algorithm))); - if (ret->cipher.cipher == NULL) { - c.error = ASN1_R_UNSUPPORTED_CIPHER; - c.line = __LINE__; - goto err; - } - if (ret->enc_algor->parameter->type == V_ASN1_OCTET_STRING) { - i = ret->enc_algor->parameter->value.octet_string->length; - if (i > EVP_MAX_IV_LENGTH) { - c.error = ASN1_R_IV_TOO_LARGE; - c.line = __LINE__; - goto err; - } - memcpy(ret->cipher.iv, - ret->enc_algor->parameter->value.octet_string->data, i); - } else - memset(ret->cipher.iv, 0, EVP_MAX_IV_LENGTH); - M_ASN1_D2I_Finish(a, X509_PKEY_free, ASN1_F_D2I_X509_PKEY); -} - X509_PKEY *X509_PKEY_new(void) { X509_PKEY *ret = NULL; diff --git a/crypto/x509/x509.h b/crypto/x509/x509.h index 7a59dab2d6..6f481b590b 100644 --- a/crypto/x509/x509.h +++ b/crypto/x509/x509.h @@ -782,9 +782,6 @@ int X509_CRL_get0_by_cert(X509_CRL *crl, X509_REVOKED **ret, X509 *x); X509_PKEY *X509_PKEY_new(void); void X509_PKEY_free(X509_PKEY *a); -int i2d_X509_PKEY(X509_PKEY *a, unsigned char **pp); -X509_PKEY *d2i_X509_PKEY(X509_PKEY **a, const unsigned char **pp, - long length); DECLARE_ASN1_FUNCTIONS(NETSCAPE_SPKI) DECLARE_ASN1_FUNCTIONS(NETSCAPE_SPKAC) diff --git a/util/libeay.num b/util/libeay.num index b8484119e5..50ddb97404 100755 --- a/util/libeay.num +++ b/util/libeay.num @@ -755,7 +755,7 @@ d2i_X509_CRL_fp 761 EXIST::FUNCTION:STDIO d2i_X509_EXTENSION 762 EXIST::FUNCTION: d2i_X509_NAME 763 EXIST::FUNCTION: d2i_X509_NAME_ENTRY 764 EXIST::FUNCTION: -d2i_X509_PKEY 765 EXIST::FUNCTION: +d2i_X509_PKEY 765 NOEXIST::FUNCTION: d2i_X509_PUBKEY 766 EXIST::FUNCTION: d2i_X509_REQ 767 EXIST::FUNCTION: d2i_X509_REQ_INFO 768 EXIST::FUNCTION: @@ -857,7 +857,7 @@ i2d_X509_CRL_fp 864 EXIST::FUNCTION:STDIO i2d_X509_EXTENSION 865 EXIST::FUNCTION: i2d_X509_NAME 866 EXIST::FUNCTION: i2d_X509_NAME_ENTRY 867 EXIST::FUNCTION: -i2d_X509_PKEY 868 EXIST::FUNCTION: +i2d_X509_PKEY 868 NOEXIST::FUNCTION: i2d_X509_PUBKEY 869 EXIST::FUNCTION: i2d_X509_REQ 870 EXIST::FUNCTION: i2d_X509_REQ_INFO 871 EXIST::FUNCTION: |