Make sure to initialize AES counters to obtain proper results.

[openssl.git] / apps / apps.c

diff --git a/apps/apps.c b/apps/apps.c
index ac9e3daa5e9e3245a24df81165457e535b820be1..62fa21d5d0babc838cbfe2ad918d6db00428b201 100644 (file)
--- a/apps/apps.c
+++ b/apps/apps.c
@@ -126,16 +126,6 @@
 #include <openssl/engine.h>
 #endif
 
-#ifdef OPENSSL_SYS_WINDOWS
-#define strcasecmp _stricmp
-#else
-#  ifdef NO_STRINGS_H
-    int        strcasecmp();
-#  else
-#    include <strings.h>
-#  endif /* NO_STRINGS_H */
-#endif
-
 #define NON_MAIN
 #include "apps.h"
 #undef NON_MAIN
@@ -378,22 +368,6 @@ int WIN32_rename(char *from, char *to)
        }
 #endif
 
-#ifdef OPENSSL_SYS_VMS
-int VMS_strcasecmp(const char *str1, const char *str2)
-       {
-       while (*str1 && *str2)
-               {
-               int res = toupper(*str1) - toupper(*str2);
-               if (res) return res < 0 ? -1 : 1;
-               }
-       if (*str1)
-               return 1;
-       if (*str2)
-               return -1;
-       return 0;
-       }
-#endif
-
 int chopup_args(ARGS *arg, char *buf, int *argc, char **argv[])
        {
        int num,len,i;
@@ -501,7 +475,7 @@ static int ui_read(UI *ui, UI_STRING *uis)
                        {
                        const char *password =
                                ((PW_CB_DATA *)UI_get0_user_data(ui))->password;
-                       if (password[0] != '\0')
+                       if (password && password[0] != '\0')
                                {
                                UI_set_result(ui, uis, password);
                                return 1;
@@ -525,7 +499,7 @@ static int ui_write(UI *ui, UI_STRING *uis)
                        {
                        const char *password =
                                ((PW_CB_DATA *)UI_get0_user_data(ui))->password;
-                       if (password[0] != '\0')
+                       if (password && password[0] != '\0')
                                return 1;
                        }
                default: