summaryrefslogtreecommitdiffstats
path: root/crypto/openssl/apps/apps.c
diff options
context:
space:
mode:
authorjkim <jkim@FreeBSD.org>2014-04-10 22:39:22 +0000
committerjkim <jkim@FreeBSD.org>2014-04-10 22:39:22 +0000
commitaeb5a4ff70fa036e3502afc9daf7d02795216340 (patch)
treec5b5657bc6509d897204957128bcbeac4535b4b7 /crypto/openssl/apps/apps.c
parent8f4a94c1c91787a4ac5272d05fa061275e720a27 (diff)
downloadFreeBSD-src-aeb5a4ff70fa036e3502afc9daf7d02795216340.zip
FreeBSD-src-aeb5a4ff70fa036e3502afc9daf7d02795216340.tar.gz
MFC: r261037, r264278
Merge OpenSSL 1.0.1f and 1.0.1g.
Diffstat (limited to 'crypto/openssl/apps/apps.c')
-rw-r--r--crypto/openssl/apps/apps.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/crypto/openssl/apps/apps.c b/crypto/openssl/apps/apps.c
index 1096eee..b76db10 100644
--- a/crypto/openssl/apps/apps.c
+++ b/crypto/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;
OpenPOWER on IntegriCloud