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

Transfer parameter handling and key comparison to algorithm methods.

Browse Source
This commit is contained in:
Dr. Stephen Henson 2006-03-20 17:56:05 +00:00
parent 448be74335
commit 6f81892e6b
9 changed files with 271 additions and 226 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
crypto/asn1/ameth_lib.c
View File

@ -64,6 +64,7 @@
extern const EVP_PKEY_ASN1_METHOD rsa_asn1_meths[]; extern const EVP_PKEY_ASN1_METHOD rsa_asn1_meths[];
extern const EVP_PKEY_ASN1_METHOD dsa_asn1_meths[]; extern const EVP_PKEY_ASN1_METHOD dsa_asn1_meths[];
extern const EVP_PKEY_ASN1_METHOD dh_asn1_meth;
extern const EVP_PKEY_ASN1_METHOD eckey_asn1_meth; extern const EVP_PKEY_ASN1_METHOD eckey_asn1_meth;
/* Keep this sorted in type order !! */ /* Keep this sorted in type order !! */
@ -71,6 +72,7 @@ const EVP_PKEY_ASN1_METHOD *standard_methods[] =
{ {
&rsa_asn1_meths[0], &rsa_asn1_meths[0],
&rsa_asn1_meths[1], &rsa_asn1_meths[1],
&dh_asn1_meth,
&dsa_asn1_meths[0], &dsa_asn1_meths[0],
&dsa_asn1_meths[1], &dsa_asn1_meths[1],
&dsa_asn1_meths[2], &dsa_asn1_meths[2],
@ -86,14 +88,16 @@ void main()
for (i = 0; for (i = 0;
i < sizeof(standard_methods)/sizeof(EVP_PKEY_ASN1_METHOD *); i < sizeof(standard_methods)/sizeof(EVP_PKEY_ASN1_METHOD *);
i++) i++)
fprintf(stderr, "Number %d id=%d\n", i, fprintf(stderr, "Number %d id=%d (%s)\n", i,
standard_methods[i]->pkey_id); standard_methods[i]->pkey_id,
OBJ_nid2sn(standard_methods[i]->pkey_id));
} }
#endif #endif
static int ameth_cmp(const EVP_PKEY_ASN1_METHOD * const *a, static int ameth_cmp(const EVP_PKEY_ASN1_METHOD * const *a,
const EVP_PKEY_ASN1_METHOD * const *b) const EVP_PKEY_ASN1_METHOD * const *b)
{ {
/*fprintf(stderr, "Comparing %d with %d\n", (*a)->pkey_id, (*b)->pkey_id);*/
return ((*a)->pkey_id - (*b)->pkey_id); return ((*a)->pkey_id - (*b)->pkey_id);
} }
@ -106,6 +110,8 @@ const EVP_PKEY_ASN1_METHOD *EVP_PKEY_ASN1_find(int type)
sizeof(standard_methods)/sizeof(EVP_PKEY_ASN1_METHOD *), sizeof(standard_methods)/sizeof(EVP_PKEY_ASN1_METHOD *),
sizeof(EVP_PKEY_ASN1_METHOD *), sizeof(EVP_PKEY_ASN1_METHOD *),
(int (*)(const void *, const void *))ameth_cmp); (int (*)(const void *, const void *))ameth_cmp);
if (!ret || !*ret)
return NULL;
if ((*ret)->pkey_flags & ASN1_PKEY_ALIAS) if ((*ret)->pkey_flags & ASN1_PKEY_ALIAS)
return EVP_PKEY_ASN1_find((*ret)->pkey_base_id); return EVP_PKEY_ASN1_find((*ret)->pkey_base_id);
return *ret; return *ret;

22
crypto/asn1/asn1.h
View File

@ -291,13 +291,29 @@ struct evp_pkey_asn1_method_st
int pkey_id; int pkey_id;
int pkey_base_id; int pkey_base_id;
unsigned long pkey_flags; unsigned long pkey_flags;
int (*pub_decode)(EVP_PKEY *pk, X509_PUBKEY *pub); int (*pub_decode)(EVP_PKEY *pk, X509_PUBKEY *pub);
int (*pub_encode)(X509_PUBKEY *pub, EVP_PKEY *pk); int (*pub_encode)(X509_PUBKEY *pub, const EVP_PKEY *pk);
int (*pub_print)(BIO *out, EVP_PKEY *pkey, int indent, ASN1_PCTX *pctx); int (*pub_cmp)(const EVP_PKEY *a, const EVP_PKEY *b);
int (*pub_print)(BIO *out, const EVP_PKEY *pkey, int indent,
ASN1_PCTX *pctx);
int (*priv_decode)(EVP_PKEY *pk, PKCS8_PRIV_KEY_INFO *p8inf); int (*priv_decode)(EVP_PKEY *pk, PKCS8_PRIV_KEY_INFO *p8inf);
int (*priv_encode)(PKCS8_PRIV_KEY_INFO *p8, EVP_PKEY *pk); int (*priv_encode)(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pk);
int (*priv_print)(BIO *out, EVP_PKEY *pkey, int indent, int (*priv_print)(BIO *out, EVP_PKEY *pkey, int indent,
ASN1_PCTX *pctx); ASN1_PCTX *pctx);
int (*pkey_size)(const EVP_PKEY *pk);
int (*pkey_bits)(const EVP_PKEY *pk);
int (*param_decode)(const EVP_PKEY *pk, X509_PUBKEY *pub);
int (*param_encode)(X509_PUBKEY *pub, const EVP_PKEY *pk);
int (*param_missing)(const EVP_PKEY *pk);
int (*param_copy)(EVP_PKEY *to, const EVP_PKEY *from);
int (*param_cmp)(const EVP_PKEY *a, const EVP_PKEY *b);
int (*param_print)(BIO *out, const EVP_PKEY *pkey, int indent,
ASN1_PCTX *pctx);
void (*pkey_free)(EVP_PKEY *pkey); void (*pkey_free)(EVP_PKEY *pkey);
void (*pkey_ctrl)(EVP_PKEY *pkey, int op, long arg1, void *arg2); void (*pkey_ctrl)(EVP_PKEY *pkey, int op, long arg1, void *arg2);
} /* EVP_PKEY_ASN1_METHOD */; } /* EVP_PKEY_ASN1_METHOD */;

1
crypto/asn1/d2i_pr.c
View File

@ -89,6 +89,7 @@ EVP_PKEY *d2i_PrivateKey(int type, EVP_PKEY **a, const unsigned char **pp,
ret->save_type=type; ret->save_type=type;
ret->type=EVP_PKEY_type(type); ret->type=EVP_PKEY_type(type);
ret->ameth = EVP_PKEY_ASN1_find(type);
switch (ret->type) switch (ret->type)
{ {
#ifndef OPENSSL_NO_RSA #ifndef OPENSSL_NO_RSA

6
crypto/dh/Makefile
View File

@ -17,8 +17,10 @@ TEST= dhtest.c
APPS= APPS=
LIB=$(TOP)/libcrypto.a LIB=$(TOP)/libcrypto.a
LIBSRC= dh_asn1.c dh_gen.c dh_key.c dh_lib.c dh_check.c dh_err.c dh_depr.c LIBSRC= dh_asn1.c dh_gen.c dh_key.c dh_lib.c dh_check.c dh_err.c dh_depr.c \
LIBOBJ= dh_asn1.o dh_gen.o dh_key.o dh_lib.o dh_check.o dh_err.o dh_depr.o dh_ameth.c
LIBOBJ= dh_asn1.o dh_gen.o dh_key.o dh_lib.o dh_check.o dh_err.o dh_depr.o \
dh_ameth.o
SRC= $(LIBSRC) SRC= $(LIBSRC)

83
crypto/dsa/dsa_ameth.c
View File

@ -119,7 +119,7 @@ static int dsa_pub_decode(EVP_PKEY *pkey, X509_PUBKEY *pubkey)
} }
static int dsa_pub_encode(X509_PUBKEY *pk, EVP_PKEY *pkey) static int dsa_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey)
{ {
DSA *dsa; DSA *dsa;
void *pval; void *pval;
@ -168,6 +168,14 @@ static int dsa_pub_encode(X509_PUBKEY *pk, EVP_PKEY *pkey)
return 0; return 0;
} }
static int dsa_pub_cmp(const EVP_PKEY *a, const EVP_PKEY *b)
{
if (BN_cmp(b->pkey.dsa->pub_key,a->pkey.dsa->pub_key) != 0)
return 0;
else
return 1;
}
/* In PKCS#8 DSA: you just get a private key integer and parameters in the /* In PKCS#8 DSA: you just get a private key integer and parameters in the
* AlgorithmIdentifier the pubkey must be recalculated. * AlgorithmIdentifier the pubkey must be recalculated.
*/ */
@ -278,7 +286,7 @@ static int dsa_priv_decode(EVP_PKEY *pkey, PKCS8_PRIV_KEY_INFO *p8)
return 0; return 0;
} }
static int dsa_priv_encode(PKCS8_PRIV_KEY_INFO *p8, EVP_PKEY *pkey) static int dsa_priv_encode(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pkey)
{ {
ASN1_STRING *params = NULL; ASN1_STRING *params = NULL;
ASN1_INTEGER *prkey = NULL; ASN1_INTEGER *prkey = NULL;
@ -330,6 +338,64 @@ err:
return 0; return 0;
} }
static int int_dsa_size(const EVP_PKEY *pkey)
{
return(DSA_size(pkey->pkey.dsa));
}
static int dsa_bits(const EVP_PKEY *pkey)
{
return BN_num_bits(pkey->pkey.dsa->p);
}
static int dsa_missing_parameters(const EVP_PKEY *pkey)
{
DSA *dsa;
dsa=pkey->pkey.dsa;
if ((dsa->p == NULL) || (dsa->q == NULL) || (dsa->g == NULL))
return 1;
return 0;
}
static int dsa_copy_parameters(EVP_PKEY *to, const EVP_PKEY *from)
{
BIGNUM *a;
if ((a=BN_dup(from->pkey.dsa->p)) == NULL)
return 0;
if (to->pkey.dsa->p != NULL)
BN_free(to->pkey.dsa->p);
to->pkey.dsa->p=a;
if ((a=BN_dup(from->pkey.dsa->q)) == NULL)
return 0;
if (to->pkey.dsa->q != NULL)
BN_free(to->pkey.dsa->q);
to->pkey.dsa->q=a;
if ((a=BN_dup(from->pkey.dsa->g)) == NULL)
return 0;
if (to->pkey.dsa->g != NULL)
BN_free(to->pkey.dsa->g);
to->pkey.dsa->g=a;
return 1;
}
static int dsa_cmp_parameters(const EVP_PKEY *a, const EVP_PKEY *b)
{
if ( BN_cmp(a->pkey.dsa->p,b->pkey.dsa->p) ||
BN_cmp(a->pkey.dsa->q,b->pkey.dsa->q) ||
BN_cmp(a->pkey.dsa->g,b->pkey.dsa->g))
return 0;
else
return 1;
}
static void int_dsa_free(EVP_PKEY *pkey)
{
DSA_free(pkey->pkey.dsa);
}
/* NB these are sorted in pkey_id order, lowest first */ /* NB these are sorted in pkey_id order, lowest first */
const EVP_PKEY_ASN1_METHOD dsa_asn1_meths[] = const EVP_PKEY_ASN1_METHOD dsa_asn1_meths[] =
@ -363,13 +429,26 @@ const EVP_PKEY_ASN1_METHOD dsa_asn1_meths[] =
EVP_PKEY_DSA, EVP_PKEY_DSA,
EVP_PKEY_DSA, EVP_PKEY_DSA,
0, 0,
dsa_pub_decode, dsa_pub_decode,
dsa_pub_encode, dsa_pub_encode,
dsa_pub_cmp,
0, 0,
dsa_priv_decode, dsa_priv_decode,
dsa_priv_encode, dsa_priv_encode,
0, 0,
int_dsa_size,
dsa_bits,
0,0,
dsa_missing_parameters,
dsa_copy_parameters,
dsa_cmp_parameters,
0, 0,
int_dsa_free,
0 0
} }
}; };

92
crypto/ec/ec_ameth.c
View File

@ -95,7 +95,7 @@ static int eckey_param2type(int *pptype, void **ppval, EC_KEY *ec_key)
return 1; return 1;
} }
static int eckey_pub_encode(X509_PUBKEY *pk, EVP_PKEY *pkey) static int eckey_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey)
{ {
EC_KEY *ec_key = pkey->pkey.ec; EC_KEY *ec_key = pkey->pkey.ec;
void *pval = NULL; void *pval = NULL;
@ -218,6 +218,20 @@ static int eckey_pub_decode(EVP_PKEY *pkey, X509_PUBKEY *pubkey)
return 0; return 0;
} }
static int eckey_pub_cmp(const EVP_PKEY *a, const EVP_PKEY *b)
{
int r;
const EC_GROUP *group = EC_KEY_get0_group(b->pkey.ec);
const EC_POINT *pa = EC_KEY_get0_public_key(a->pkey.ec),
*pb = EC_KEY_get0_public_key(b->pkey.ec);
r = EC_POINT_cmp(group, pa, pb, NULL);
if (r == 0)
return 1;
if (r == 1)
return 0;
return -2;
}
static int eckey_priv_decode(EVP_PKEY *pkey, PKCS8_PRIV_KEY_INFO *p8) static int eckey_priv_decode(EVP_PKEY *pkey, PKCS8_PRIV_KEY_INFO *p8)
{ {
const unsigned char *p = NULL; const unsigned char *p = NULL;
@ -290,7 +304,7 @@ static int eckey_priv_decode(EVP_PKEY *pkey, PKCS8_PRIV_KEY_INFO *p8)
return 0; return 0;
} }
static int eckey_priv_encode(PKCS8_PRIV_KEY_INFO *p8, EVP_PKEY *pkey) static int eckey_priv_encode(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pkey)
{ {
EC_KEY *ec_key; EC_KEY *ec_key;
unsigned char *ep, *p; unsigned char *ep, *p;
@ -344,17 +358,91 @@ static int eckey_priv_encode(PKCS8_PRIV_KEY_INFO *p8, EVP_PKEY *pkey)
return 1; return 1;
} }
static int int_ec_size(const EVP_PKEY *pkey)
{
return ECDSA_size(pkey->pkey.ec);
}
static int ec_bits(const EVP_PKEY *pkey)
{
BIGNUM *order = BN_new();
const EC_GROUP *group;
int ret;
if (!order)
{
ERR_clear_error();
return 0;
}
group = EC_KEY_get0_group(pkey->pkey.ec);
if (!EC_GROUP_get_order(group, order, NULL))
{
ERR_clear_error();
return 0;
}
ret = BN_num_bits(order);
BN_free(order);
return ret;
}
static int ec_missing_parameters(const EVP_PKEY *pkey)
{
if (EC_KEY_get0_group(pkey->pkey.ec) == NULL)
return 1;
return 0;
}
int ec_copy_parameters(EVP_PKEY *to, const EVP_PKEY *from)
{
EC_GROUP *group = EC_GROUP_dup(EC_KEY_get0_group(from->pkey.ec));
if (group == NULL)
return 0;
if (EC_KEY_set_group(to->pkey.ec, group) == 0)
return 0;
EC_GROUP_free(group);
return 1;
}
int ec_cmp_parameters(const EVP_PKEY *a, const EVP_PKEY *b)
{
const EC_GROUP *group_a = EC_KEY_get0_group(a->pkey.ec),
*group_b = EC_KEY_get0_group(b->pkey.ec);
if (EC_GROUP_cmp(group_a, group_b, NULL))
return 0;
else
return 1;
}
static void int_ec_free(EVP_PKEY *pkey)
{
EC_KEY_free(pkey->pkey.ec);
}
EVP_PKEY_ASN1_METHOD eckey_asn1_meth = EVP_PKEY_ASN1_METHOD eckey_asn1_meth =
{ {
EVP_PKEY_EC, EVP_PKEY_EC,
0, 0,
0, 0,
eckey_pub_decode, eckey_pub_decode,
eckey_pub_encode, eckey_pub_encode,
eckey_pub_cmp,
0, 0,
eckey_priv_decode, eckey_priv_decode,
eckey_priv_encode, eckey_priv_encode,
0, 0,
int_ec_size,
ec_bits,
0,0,
ec_missing_parameters,
ec_copy_parameters,
ec_cmp_parameters,
0, 0,
int_ec_free,
0 0
}; };

1
crypto/evp/evp.h
View File

@ -128,6 +128,7 @@ struct evp_pkey_st
int type; int type;
int save_type; int save_type;
int references; int references;
const EVP_PKEY_ASN1_METHOD *ameth;
union { union {
char *ptr; char *ptr;
#ifndef OPENSSL_NO_RSA #ifndef OPENSSL_NO_RSA

244
crypto/evp/p_lib.c
View File

@ -78,62 +78,16 @@ static void EVP_PKEY_free_it(EVP_PKEY *x);
int EVP_PKEY_bits(EVP_PKEY *pkey) int EVP_PKEY_bits(EVP_PKEY *pkey)
{ {
if (0) if (pkey && pkey->ameth && pkey->ameth->pkey_bits)
return 0; return pkey->ameth->pkey_bits(pkey);
#ifndef OPENSSL_NO_RSA return 0;
else if (pkey->type == EVP_PKEY_RSA)
return(BN_num_bits(pkey->pkey.rsa->n));
#endif
#ifndef OPENSSL_NO_DSA
else if (pkey->type == EVP_PKEY_DSA)
return(BN_num_bits(pkey->pkey.dsa->p));
#endif
#ifndef OPENSSL_NO_EC
else if (pkey->type == EVP_PKEY_EC)
{
BIGNUM *order = BN_new();
const EC_GROUP *group;
int ret;
if (!order)
{
ERR_clear_error();
return 0;
}
group = EC_KEY_get0_group(pkey->pkey.ec);
if (!EC_GROUP_get_order(group, order, NULL))
{
ERR_clear_error();
return 0;
}
ret = BN_num_bits(order);
BN_free(order);
return ret;
}
#endif
return(0);
} }
int EVP_PKEY_size(EVP_PKEY *pkey) int EVP_PKEY_size(EVP_PKEY *pkey)
{ {
if (pkey == NULL) if (pkey && pkey->ameth && pkey->ameth->pkey_size)
return(0); return pkey->ameth->pkey_size(pkey);
#ifndef OPENSSL_NO_RSA return 0;
if (pkey->type == EVP_PKEY_RSA)
return(RSA_size(pkey->pkey.rsa));
else
#endif
#ifndef OPENSSL_NO_DSA
if (pkey->type == EVP_PKEY_DSA)
return(DSA_size(pkey->pkey.dsa));
#endif
#ifndef OPENSSL_NO_ECDSA
if (pkey->type == EVP_PKEY_EC)
return(ECDSA_size(pkey->pkey.ec));
#endif
return(0);
} }
int EVP_PKEY_save_parameters(EVP_PKEY *pkey, int mode) int EVP_PKEY_save_parameters(EVP_PKEY *pkey, int mode)
@ -174,88 +128,26 @@ int EVP_PKEY_copy_parameters(EVP_PKEY *to, const EVP_PKEY *from)
EVPerr(EVP_F_EVP_PKEY_COPY_PARAMETERS,EVP_R_MISSING_PARAMETERS); EVPerr(EVP_F_EVP_PKEY_COPY_PARAMETERS,EVP_R_MISSING_PARAMETERS);
goto err; goto err;
} }
#ifndef OPENSSL_NO_DSA if (from->ameth && from->ameth->param_copy)
if (to->type == EVP_PKEY_DSA) return from->ameth->param_copy(to, from);
{
BIGNUM *a;
if ((a=BN_dup(from->pkey.dsa->p)) == NULL) goto err;
if (to->pkey.dsa->p != NULL) BN_free(to->pkey.dsa->p);
to->pkey.dsa->p=a;
if ((a=BN_dup(from->pkey.dsa->q)) == NULL) goto err;
if (to->pkey.dsa->q != NULL) BN_free(to->pkey.dsa->q);
to->pkey.dsa->q=a;
if ((a=BN_dup(from->pkey.dsa->g)) == NULL) goto err;
if (to->pkey.dsa->g != NULL) BN_free(to->pkey.dsa->g);
to->pkey.dsa->g=a;
}
#endif
#ifndef OPENSSL_NO_EC
if (to->type == EVP_PKEY_EC)
{
EC_GROUP *group = EC_GROUP_dup(EC_KEY_get0_group(from->pkey.ec));
if (group == NULL)
goto err;
if (EC_KEY_set_group(to->pkey.ec, group) == 0)
goto err;
EC_GROUP_free(group);
}
#endif
return(1);
err: err:
return(0); return 0;
} }
int EVP_PKEY_missing_parameters(const EVP_PKEY *pkey) int EVP_PKEY_missing_parameters(const EVP_PKEY *pkey)
{ {
#ifndef OPENSSL_NO_DSA if (pkey->ameth && pkey->ameth->param_missing)
if (pkey->type == EVP_PKEY_DSA) return pkey->ameth->param_missing(pkey);
{ return 0;
DSA *dsa;
dsa=pkey->pkey.dsa;
if ((dsa->p == NULL) || (dsa->q == NULL) || (dsa->g == NULL))
return(1);
}
#endif
#ifndef OPENSSL_NO_EC
if (pkey->type == EVP_PKEY_EC)
{
if (EC_KEY_get0_group(pkey->pkey.ec) == NULL)
return(1);
}
#endif
return(0);
} }
int EVP_PKEY_cmp_parameters(const EVP_PKEY *a, const EVP_PKEY *b) int EVP_PKEY_cmp_parameters(const EVP_PKEY *a, const EVP_PKEY *b)
{ {
#ifndef OPENSSL_NO_DSA if (a->type != b->type)
if ((a->type == EVP_PKEY_DSA) && (b->type == EVP_PKEY_DSA)) return -1;
{ if (a->ameth && a->ameth->param_cmp)
if ( BN_cmp(a->pkey.dsa->p,b->pkey.dsa->p) || return a->ameth->param_cmp(a, b);
BN_cmp(a->pkey.dsa->q,b->pkey.dsa->q) || return -1;
BN_cmp(a->pkey.dsa->g,b->pkey.dsa->g))
return(0);
else
return(1);
}
#endif
#ifndef OPENSSL_NO_EC
if (a->type == EVP_PKEY_EC && b->type == EVP_PKEY_EC)
{
const EC_GROUP *group_a = EC_KEY_get0_group(a->pkey.ec),
*group_b = EC_KEY_get0_group(b->pkey.ec);
if (EC_GROUP_cmp(group_a, group_b, NULL))
return 0;
else
return 1;
}
#endif
return(-1);
} }
int EVP_PKEY_cmp(const EVP_PKEY *a, const EVP_PKEY *b) int EVP_PKEY_cmp(const EVP_PKEY *a, const EVP_PKEY *b)
@ -266,48 +158,10 @@ int EVP_PKEY_cmp(const EVP_PKEY *a, const EVP_PKEY *b)
if (EVP_PKEY_cmp_parameters(a, b) == 0) if (EVP_PKEY_cmp_parameters(a, b) == 0)
return 0; return 0;
switch (a->type) if (a->ameth && a->ameth->pub_cmp)
{ return a->ameth->pub_cmp(a, b);
#ifndef OPENSSL_NO_RSA
case EVP_PKEY_RSA:
if (BN_cmp(b->pkey.rsa->n,a->pkey.rsa->n) != 0
|| BN_cmp(b->pkey.rsa->e,a->pkey.rsa->e) != 0)
return 0;
break;
#endif
#ifndef OPENSSL_NO_DSA
case EVP_PKEY_DSA:
if (BN_cmp(b->pkey.dsa->pub_key,a->pkey.dsa->pub_key) != 0)
return 0;
break;
#endif
#ifndef OPENSSL_NO_EC
case EVP_PKEY_EC:
{
int r;
const EC_GROUP *group = EC_KEY_get0_group(b->pkey.ec);
const EC_POINT *pa = EC_KEY_get0_public_key(a->pkey.ec),
*pb = EC_KEY_get0_public_key(b->pkey.ec);
r = EC_POINT_cmp(group, pa, pb, NULL);
if (r != 0)
{
if (r == 1)
return 0;
else
return -2;
}
}
break;
#endif
#ifndef OPENSSL_NO_DH
case EVP_PKEY_DH:
return -2;
#endif
default:
return -2;
}
return 1; return -2;
} }
EVP_PKEY *EVP_PKEY_new(void) EVP_PKEY *EVP_PKEY_new(void)
@ -322,6 +176,7 @@ EVP_PKEY *EVP_PKEY_new(void)
} }
ret->type=EVP_PKEY_NONE; ret->type=EVP_PKEY_NONE;
ret->references=1; ret->references=1;
ret->ameth=NULL;
ret->pkey.ptr=NULL; ret->pkey.ptr=NULL;
ret->attributes=NULL; ret->attributes=NULL;
ret->save_parameters=1; ret->save_parameters=1;
@ -330,10 +185,13 @@ EVP_PKEY *EVP_PKEY_new(void)
int EVP_PKEY_assign(EVP_PKEY *pkey, int type, char *key) int EVP_PKEY_assign(EVP_PKEY *pkey, int type, char *key)
{ {
const EVP_PKEY_ASN1_METHOD *ameth;
if (pkey == NULL) return(0); if (pkey == NULL) return(0);
if (pkey->pkey.ptr != NULL) if (pkey->pkey.ptr != NULL)
EVP_PKEY_free_it(pkey); EVP_PKEY_free_it(pkey);
pkey->type=EVP_PKEY_type(type); ameth = EVP_PKEY_ASN1_find(type);
pkey->ameth = ameth;
pkey->type = ameth->pkey_id;
pkey->save_type=type; pkey->save_type=type;
pkey->pkey.ptr=key; pkey->pkey.ptr=key;
return(key != NULL); return(key != NULL);
@ -425,24 +283,11 @@ DH *EVP_PKEY_get1_DH(EVP_PKEY *pkey)
int EVP_PKEY_type(int type) int EVP_PKEY_type(int type)
{ {
switch (type) const EVP_PKEY_ASN1_METHOD *ameth;
{ ameth = EVP_PKEY_ASN1_find(type);
case EVP_PKEY_RSA: if (ameth)
case EVP_PKEY_RSA2: return ameth->pkey_id;
return(EVP_PKEY_RSA); return NID_undef;
case EVP_PKEY_DSA:
case EVP_PKEY_DSA1:
case EVP_PKEY_DSA2:
case EVP_PKEY_DSA3:
case EVP_PKEY_DSA4:
return(EVP_PKEY_DSA);
case EVP_PKEY_DH:
return(EVP_PKEY_DH);
case EVP_PKEY_EC:
return(EVP_PKEY_EC);
default:
return(NID_undef);
}
} }
void EVP_PKEY_free(EVP_PKEY *x) void EVP_PKEY_free(EVP_PKEY *x)
@ -471,32 +316,7 @@ void EVP_PKEY_free(EVP_PKEY *x)
static void EVP_PKEY_free_it(EVP_PKEY *x) static void EVP_PKEY_free_it(EVP_PKEY *x)
{ {
switch (x->type) if (x->ameth && x->ameth->pkey_free)
{ x->ameth->pkey_free(x);
#ifndef OPENSSL_NO_RSA
case EVP_PKEY_RSA:
case EVP_PKEY_RSA2:
RSA_free(x->pkey.rsa);
break;
#endif
#ifndef OPENSSL_NO_DSA
case EVP_PKEY_DSA:
case EVP_PKEY_DSA2:
case EVP_PKEY_DSA3:
case EVP_PKEY_DSA4:
DSA_free(x->pkey.dsa);
break;
#endif
#ifndef OPENSSL_NO_EC
case EVP_PKEY_EC:
EC_KEY_free(x->pkey.ec);
break;
#endif
#ifndef OPENSSL_NO_DH
case EVP_PKEY_DH:
DH_free(x->pkey.dh);
break;
#endif
}
} }

38
crypto/rsa/rsa_ameth.c
View File

@ -61,7 +61,7 @@
#include <openssl/x509.h> #include <openssl/x509.h>
#include <openssl/rsa.h> #include <openssl/rsa.h>
static int rsa_pub_encode(X509_PUBKEY *pk, EVP_PKEY *pkey) static int rsa_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey)
{ {
unsigned char *penc = NULL; unsigned char *penc = NULL;
int penclen; int penclen;
@ -92,6 +92,14 @@ static int rsa_pub_decode(EVP_PKEY *pkey, X509_PUBKEY *pubkey)
return 1; return 1;
} }
static int rsa_pub_cmp(const EVP_PKEY *a, const EVP_PKEY *b)
{
if (BN_cmp(b->pkey.rsa->n,a->pkey.rsa->n) != 0
|| BN_cmp(b->pkey.rsa->e,a->pkey.rsa->e) != 0)
return 0;
return 1;
}
static int rsa_priv_decode(EVP_PKEY *pkey, PKCS8_PRIV_KEY_INFO *p8) static int rsa_priv_decode(EVP_PKEY *pkey, PKCS8_PRIV_KEY_INFO *p8)
{ {
const unsigned char *p; const unsigned char *p;
@ -108,7 +116,7 @@ static int rsa_priv_decode(EVP_PKEY *pkey, PKCS8_PRIV_KEY_INFO *p8)
return 1; return 1;
} }
static int rsa_priv_encode(PKCS8_PRIV_KEY_INFO *p8, EVP_PKEY *pkey) static int rsa_priv_encode(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pkey)
{ {
unsigned char *rk = NULL; unsigned char *rk = NULL;
int rklen; int rklen;
@ -130,19 +138,43 @@ static int rsa_priv_encode(PKCS8_PRIV_KEY_INFO *p8, EVP_PKEY *pkey)
return 1; return 1;
} }
static int int_rsa_size(const EVP_PKEY *pkey)
{
return RSA_size(pkey->pkey.rsa);
}
static int rsa_bits(const EVP_PKEY *pkey)
{
return BN_num_bits(pkey->pkey.rsa->n);
}
static void int_rsa_free(EVP_PKEY *pkey)
{
RSA_free(pkey->pkey.rsa);
}
const EVP_PKEY_ASN1_METHOD rsa_asn1_meths[] = const EVP_PKEY_ASN1_METHOD rsa_asn1_meths[] =
{ {
{ {
EVP_PKEY_RSA, EVP_PKEY_RSA,
EVP_PKEY_RSA, EVP_PKEY_RSA,
0, 0,
rsa_pub_decode, rsa_pub_decode,
rsa_pub_encode, rsa_pub_encode,
rsa_pub_cmp,
0, 0,
rsa_priv_decode, rsa_priv_decode,
rsa_priv_encode, rsa_priv_encode,
0, 0,
0,
int_rsa_size,
rsa_bits,
0,0,0,0,0,0,
int_rsa_free,
0 0
}, },