diff options
author | marha <marha@users.sourceforge.net> | 2014-04-14 23:45:39 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2014-04-14 23:45:39 +0200 |
commit | 7c21629fbeb51b65fd0625bb36d888587d62fd89 (patch) | |
tree | 425433df36d64f529d2222de2d1680e0b0abca3f /openssl/apps/apps.c | |
parent | 0bd141efd4832e01c8b269b8566dd5749e30ed55 (diff) | |
parent | 242d48135a12fc9167430f391ba0d27d9ad44c6b (diff) | |
download | vcxsrv-7c21629fbeb51b65fd0625bb36d888587d62fd89.tar.gz vcxsrv-7c21629fbeb51b65fd0625bb36d888587d62fd89.tar.bz2 vcxsrv-7c21629fbeb51b65fd0625bb36d888587d62fd89.zip |
Merge remote-tracking branch 'origin/released'
Conflicts:
openssl/Configure
openssl/Makefile
openssl/util/pl/VC-32.pl
Diffstat (limited to 'openssl/apps/apps.c')
-rw-r--r-- | openssl/apps/apps.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/openssl/apps/apps.c b/openssl/apps/apps.c index 1096eee4c..b76db10a5 100644 --- a/openssl/apps/apps.c +++ b/openssl/apps/apps.c @@ -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 @@ -2841,7 +2841,7 @@ double app_tminterval(int stop,int usertime) if (proc==NULL) { - if (GetVersion() < 0x80000000) + if (check_winnt()) proc = OpenProcess(PROCESS_QUERY_INFORMATION,FALSE, GetCurrentProcessId()); if (proc==NULL) proc = (HANDLE)-1; |