Remove OPENSSL_NO_AES guards

[openssl.git] / apps / cms.c

diff --git a/apps/cms.c b/apps/cms.c
index 1f0e19208eff99b0285984e8ca676460392bd63a..a74ca9d4cac6904184b65775e1029e5b6185db9a 100644 (file)
--- 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,
     {"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"},
     {"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
 # 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;
             wrap_cipher = EVP_des_ede3_wrap();
 # endif
             break;

-# ifndef OPENSSL_NO_AES

         case OPT_AES128_WRAP:
             wrap_cipher = EVP_aes_128_wrap();
             break;
         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;
         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();
         }
     }
     argc = opt_num_rest();