generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove d2i_X509_PKEY and i2d_X509_PKEY

Browse Source 
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>
This commit is contained in:
Dr. Stephen Henson 2015-03-28 13:53:16 +00:00
parent f0e6871df2
commit b1f3442857
3 changed files with 2 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
crypto/asn1/x_pkey.c
View File

@ -63,44 +63,6 @@
#include <openssl/asn1_mac.h> #include <openssl/asn1_mac.h>
#include <openssl/x509.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 *X509_PKEY_new(void)
{ {
X509_PKEY *ret = NULL; X509_PKEY *ret = NULL;

3
crypto/x509/x509.h
View File

@ -782,9 +782,6 @@ int X509_CRL_get0_by_cert(X509_CRL *crl, X509_REVOKED **ret, X509 *x);
X509_PKEY *X509_PKEY_new(void); X509_PKEY *X509_PKEY_new(void);
void X509_PKEY_free(X509_PKEY *a); 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_SPKI)
DECLARE_ASN1_FUNCTIONS(NETSCAPE_SPKAC) DECLARE_ASN1_FUNCTIONS(NETSCAPE_SPKAC)

4
util/libeay.num
View File

@ -755,7 +755,7 @@ d2i_X509_CRL_fp 761 EXIST::FUNCTION:STDIO
d2i_X509_EXTENSION 762 EXIST::FUNCTION: d2i_X509_EXTENSION 762 EXIST::FUNCTION:
d2i_X509_NAME 763 EXIST::FUNCTION: d2i_X509_NAME 763 EXIST::FUNCTION:
d2i_X509_NAME_ENTRY 764 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_PUBKEY 766 EXIST::FUNCTION:
d2i_X509_REQ 767 EXIST::FUNCTION: d2i_X509_REQ 767 EXIST::FUNCTION:
d2i_X509_REQ_INFO 768 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_EXTENSION 865 EXIST::FUNCTION:
i2d_X509_NAME 866 EXIST::FUNCTION: i2d_X509_NAME 866 EXIST::FUNCTION:
i2d_X509_NAME_ENTRY 867 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_PUBKEY 869 EXIST::FUNCTION:
i2d_X509_REQ 870 EXIST::FUNCTION: i2d_X509_REQ 870 EXIST::FUNCTION:
i2d_X509_REQ_INFO 871 EXIST::FUNCTION: i2d_X509_REQ_INFO 871 EXIST::FUNCTION: