Use correct length when prompting for password.
authorDr. Stephen Henson <steve@openssl.org>
Fri, 4 Apr 2014 11:44:43 +0000 (12:44 +0100)
committerDr. Stephen Henson <steve@openssl.org>
Fri, 4 Apr 2014 12:08:42 +0000 (13:08 +0100)
Use bufsiz - 1 not BUFSIZ - 1 when prompting for a password in
the openssl utility.

Thanks to Rob Mackinnon, Leviathan Security for reporting this issue.
(cherry picked from commit 7ba08a4d73c1bdfd3aced09a628b1d7d7747cdca)

apps/apps.c

index d73e60f70a04f85b2b5108f562f2b4e83f70f7f6..6bf15f2c53cdda9ca6b5324cdcfd6475db86f687 100644 (file)
@@ -586,12 +586,12 @@ int password_callback(char *buf, int bufsiz, int verify,
 
                if (ok >= 0)
                        ok = UI_add_input_string(ui,prompt,ui_flags,buf,
-                               PW_MIN_LENGTH,BUFSIZ-1);
+                               PW_MIN_LENGTH,bufsiz-1);
                if (ok >= 0 && verify)
                        {
                        buff = (char *)OPENSSL_malloc(bufsiz);
                        ok = UI_add_verify_string(ui,prompt,ui_flags,buff,
-                               PW_MIN_LENGTH,BUFSIZ-1, buf);
+                               PW_MIN_LENGTH,bufsiz-1, buf);
                        }
                if (ok >= 0)
                        do