diff options
| author | Ulf Möller <ulf@openssl.org> | 1999-04-27 01:14:46 +0000 |
|---|---|---|
| committer | Ulf Möller <ulf@openssl.org> | 1999-04-27 01:14:46 +0000 |
| commit | f5d7a031a3c3e7b1700a67d6dc19daf3718ce6ee (patch) | |
| tree | f5db72824de4586c35cef513ed48aff0d4b69a6b /crypto/evp/evp_pkey.c | |
| parent | b64f825671861144e1c24f2a5498a95a083021cd (diff) | |
| download | openssl-f5d7a031a3c3e7b1700a67d6dc19daf3718ce6ee.tar.gz | |
New Configure option no-<cipher> (rsa, idea, rc5, ...).
Diffstat (limited to 'crypto/evp/evp_pkey.c')
| -rw-r--r-- | crypto/evp/evp_pkey.c | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/crypto/evp/evp_pkey.c b/crypto/evp/evp_pkey.c index 8bea61ebbd..421e452db1 100644 --- a/crypto/evp/evp_pkey.c +++ b/crypto/evp/evp_pkey.c @@ -67,14 +67,19 @@ EVP_PKEY *EVP_PKCS82PKEY (PKCS8_PRIV_KEY_INFO *p8) { EVP_PKEY *pkey; +#ifndef NO_RSA RSA *rsa; +#endif +#ifndef NO_DSA DSA *dsa; ASN1_INTEGER *dsapriv; - X509_ALGOR *a; STACK *ndsa; BN_CTX *ctx; + int plen; +#endif + X509_ALGOR *a; unsigned char *p; - int plen, pkeylen; + int pkeylen; char obj_tmp[80]; switch (p8->broken) { @@ -100,6 +105,7 @@ EVP_PKEY *EVP_PKCS82PKEY (PKCS8_PRIV_KEY_INFO *p8) a = p8->pkeyalg; switch (OBJ_obj2nid(a->algorithm)) { +#ifndef NO_RSA case NID_rsaEncryption: if (!(rsa = d2i_RSAPrivateKey (NULL, &p, pkeylen))) { EVPerr(EVP_F_EVP_PKCS82PKEY, EVP_R_DECODE_ERROR); @@ -107,7 +113,8 @@ EVP_PKEY *EVP_PKCS82PKEY (PKCS8_PRIV_KEY_INFO *p8) } EVP_PKEY_assign_RSA (pkey, rsa); break; - +#endif +#ifndef NO_DSA case NID_dsa: /* PKCS#8 DSA is weird: you just get a private key integer * and parameters in the AlgorithmIdentifier the pubkey must @@ -174,7 +181,7 @@ EVP_PKEY *EVP_PKCS82PKEY (PKCS8_PRIV_KEY_INFO *p8) EVP_PKEY_assign_DSA (pkey, dsa); BN_CTX_free (ctx); break; - +#endif default: EVPerr(EVP_F_EVP_PKCS82PKEY, EVP_R_UNSUPPORTED_PRIVATE_KEY_ALGORITHM); if (!a->algorithm) strcpy (obj_tmp, "NULL"); @@ -191,9 +198,11 @@ EVP_PKEY *EVP_PKCS82PKEY (PKCS8_PRIV_KEY_INFO *p8) PKCS8_PRIV_KEY_INFO *EVP_PKEY2PKCS8(EVP_PKEY *pkey) { PKCS8_PRIV_KEY_INFO *p8; +#ifndef NO_DSA ASN1_INTEGER *dpkey; unsigned char *p, *q; int len; +#endif if (!(p8 = PKCS8_PRIV_KEY_INFO_new())) { EVPerr(EVP_F_EVP_PKEY2PKCS8,ERR_R_MALLOC_FAILURE); return NULL; @@ -205,6 +214,7 @@ PKCS8_PRIV_KEY_INFO *EVP_PKEY2PKCS8(EVP_PKEY *pkey) return NULL; } switch (EVP_PKEY_type(pkey->type)) { +#ifndef NO_RSA case EVP_PKEY_RSA: p8->pkeyalg->algorithm = OBJ_nid2obj(NID_rsaEncryption); @@ -216,7 +226,8 @@ PKCS8_PRIV_KEY_INFO *EVP_PKEY2PKCS8(EVP_PKEY *pkey) return NULL; } break; - +#endif +#ifndef NO_DSA case EVP_PKEY_DSA: p8->pkeyalg->algorithm = OBJ_nid2obj(NID_dsa); @@ -249,7 +260,7 @@ PKCS8_PRIV_KEY_INFO *EVP_PKEY2PKCS8(EVP_PKEY *pkey) } ASN1_INTEGER_free (dpkey); break; - +#endif default: EVPerr(EVP_F_EVP_PKEY2PKCS8, EVP_R_UNSUPPORTED_PRIVATE_KEY_ALGORITHM); PKCS8_PRIV_KEY_INFO_free (p8); |