summaryrefslogtreecommitdiffstats
path: root/apps/cms.c
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2016-04-13 11:28:45 +0100
committerMatt Caswell <matt@openssl.org>2016-04-13 21:25:24 +0100
commit5158c763f5af973b26dd1927956ac27b6171de5c (patch)
tree4ca9540aa6a821c4d367a76341ac6a551aeeeaa8 /apps/cms.c
parent7ec8de16fe23e207d3e1bbb95d53843dbc9c06c8 (diff)
Remove OPENSSL_NO_AES guards
no-aes is no longer a Configure option and therefore the OPENSSL_NO_AES guards can be removed. Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'apps/cms.c')
-rw-r--r--apps/cms.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/apps/cms.c b/apps/cms.c
index 1f0e19208e..a74ca9d4ca 100644
--- a/apps/cms.c
+++ b/apps/cms.c
@@ -214,11 +214,9 @@ OPTIONS cms_options[] = {
{"receipt_request_to", OPT_RR_TO, 's'},
{"", OPT_CIPHER, '-', "Any supported cipher"},
OPT_V_OPTIONS,
-# ifndef OPENSSL_NO_AES
{"aes128-wrap", OPT_AES128_WRAP, '-', "Use AES128 to wrap key"},
{"aes192-wrap", OPT_AES192_WRAP, '-', "Use AES192 to wrap key"},
{"aes256-wrap", OPT_AES256_WRAP, '-', "Use AES256 to wrap key"},
-# endif
# ifndef OPENSSL_NO_DES
{"des3-wrap", OPT_3DES_WRAP, '-', "Use 3DES-EDE to wrap key"},
# endif
@@ -603,7 +601,6 @@ int cms_main(int argc, char **argv)
wrap_cipher = EVP_des_ede3_wrap();
# endif
break;
-# ifndef OPENSSL_NO_AES
case OPT_AES128_WRAP:
wrap_cipher = EVP_aes_128_wrap();
break;
@@ -613,12 +610,6 @@ int cms_main(int argc, char **argv)
case OPT_AES256_WRAP:
wrap_cipher = EVP_aes_256_wrap();
break;
-# else
- case OPT_AES128_WRAP:
- case OPT_AES192_WRAP:
- case OPT_AES256_WRAP:
- break;
-# endif
}
}
argc = opt_num_rest();