Fix new -aes command argument handling

diff --git a/apps/pkcs12.c b/apps/pkcs12.c
index 6a23b64f5e1c947547860453e5861950f5fe974f..1f5a45694730ee4a5578287e99b2f89ec02dc80a 100644 (file)
--- a/apps/pkcs12.c
+++ b/apps/pkcs12.c
@@ -155,9 +155,9 @@ int MAIN(int argc, char **argv)
 #endif
                else if (!strcmp (*args, "-des3")) enc = EVP_des_ede3_cbc();
 #ifndef OPENSSL_NO_AES
 #endif
                else if (!strcmp (*args, "-des3")) enc = EVP_des_ede3_cbc();
 #ifndef OPENSSL_NO_AES

-               else if (!strcmp(*argv,"-aes128")) enc=EVP_aes_128_cbc();
-               else if (!strcmp(*argv,"-aes192")) enc=EVP_aes_192_cbc();
-               else if (!strcmp(*argv,"-aes256")) enc=EVP_aes_256_cbc();
+               else if (!strcmp(*args,"-aes128")) enc=EVP_aes_128_cbc();
+               else if (!strcmp(*args,"-aes192")) enc=EVP_aes_192_cbc();
+               else if (!strcmp(*args,"-aes256")) enc=EVP_aes_256_cbc();

 #endif
                else if (!strcmp (*args, "-noiter")) iter = 1;
                else if (!strcmp (*args, "-maciter"))
 #endif
                else if (!strcmp (*args, "-noiter")) iter = 1;
                else if (!strcmp (*args, "-maciter"))

diff --git a/apps/smime.c b/apps/smime.c
index cd750e32b7cb9d157719f787fdad9e6f6dffc58e..28a11066392d7ed0f0b9e19e554ed375768e2948 100644 (file)
--- a/apps/smime.c
+++ b/apps/smime.c
@@ -133,11 +133,11 @@ int MAIN(int argc, char **argv)
                                cipher = EVP_rc2_64_cbc();
 #endif
 #ifndef OPENSSL_NO_AES
                                cipher = EVP_rc2_64_cbc();
 #endif
 #ifndef OPENSSL_NO_AES

-               else if (!strcmp(*argv,"-aes128") == 0)
+               else if (!strcmp(*args,"-aes128"))

                                cipher = EVP_aes_128_cbc();
                                cipher = EVP_aes_128_cbc();

-               else if (!strcmp(*argv,"-aes192") == 0)
+               else if (!strcmp(*args,"-aes192"))

                                cipher = EVP_aes_192_cbc();
                                cipher = EVP_aes_192_cbc();

-               else if (!strcmp(*argv,"-aes256") == 0)
+               else if (!strcmp(*args,"-aes256"))

                                cipher = EVP_aes_256_cbc();
 #endif
                else if (!strcmp (*args, "-text")) 
                                cipher = EVP_aes_256_cbc();
 #endif
                else if (!strcmp (*args, "-text"))