diff options
| author | Bob Beck <beck@cvs.openbsd.org> | 2015-02-11 03:55:43 +0000 |
|---|---|---|
| committer | Bob Beck <beck@cvs.openbsd.org> | 2015-02-11 03:55:43 +0000 |
| commit | aeaac866c83fd4383009cd21727c6c48c8865291 (patch) | |
| tree | f4fe7cdccd6a8aa4e163c7d3261063aae7366ed2 /lib/libcrypto/rsa/rsa_pmeth.c | |
| parent | fe6ccaf8cdf12c034bd9e4d92a358e0ba8fa116a (diff) | |
get rid of OPENSSL_NO_CMS code we do not use.
ok miod@
Diffstat (limited to 'lib/libcrypto/rsa/rsa_pmeth.c')
| -rw-r--r-- | lib/libcrypto/rsa/rsa_pmeth.c | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/lib/libcrypto/rsa/rsa_pmeth.c b/lib/libcrypto/rsa/rsa_pmeth.c index 954190d5601..6d38a7c923c 100644 --- a/lib/libcrypto/rsa/rsa_pmeth.c +++ b/lib/libcrypto/rsa/rsa_pmeth.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rsa_pmeth.c,v 1.14 2014/07/11 08:44:49 jsing Exp $ */ +/* $OpenBSD: rsa_pmeth.c,v 1.15 2015/02/11 03:55:42 beck Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2006. */ @@ -69,9 +69,6 @@ #include <openssl/rsa.h> #include <openssl/x509.h> -#ifndef OPENSSL_NO_CMS -#include <openssl/cms.h> -#endif #include "evp_locl.h" #include "rsa_locl.h" @@ -462,26 +459,6 @@ bad_pad: case EVP_PKEY_CTRL_PKCS7_DECRYPT: case EVP_PKEY_CTRL_PKCS7_SIGN: return 1; -#ifndef OPENSSL_NO_CMS - case EVP_PKEY_CTRL_CMS_DECRYPT: - { - X509_ALGOR *alg = NULL; - ASN1_OBJECT *encalg = NULL; - - if (p2) - CMS_RecipientInfo_ktri_get0_algs(p2, NULL, - NULL, &alg); - if (alg) - X509_ALGOR_get0(&encalg, NULL, NULL, alg); - if (encalg && OBJ_obj2nid(encalg) == NID_rsaesOaep) - rctx->pad_mode = RSA_PKCS1_OAEP_PADDING; - } - /* FALLTHROUGH */ - - case EVP_PKEY_CTRL_CMS_ENCRYPT: - case EVP_PKEY_CTRL_CMS_SIGN: - return 1; -#endif case EVP_PKEY_CTRL_PEER_KEY: RSAerr(RSA_F_PKEY_RSA_CTRL, RSA_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE); |