Deleted Added
full compact
apps.c (246772) apps.c (264278)
1/* apps/apps.c */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved.
4 *
5 * This package is an SSL implementation written
6 * by Eric Young (eay@cryptsoft.com).
7 * The implementation was written so as to conform with Netscapes SSL.
8 *

--- 572 unchanged lines hidden (view full) ---

581 prompt = UI_construct_prompt(ui, "pass phrase",
582 prompt_info);
583
584 ui_flags |= UI_INPUT_FLAG_DEFAULT_PWD;
585 UI_ctrl(ui, UI_CTRL_PRINT_ERRORS, 1, 0, 0);
586
587 if (ok >= 0)
588 ok = UI_add_input_string(ui,prompt,ui_flags,buf,
1/* apps/apps.c */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved.
4 *
5 * This package is an SSL implementation written
6 * by Eric Young (eay@cryptsoft.com).
7 * The implementation was written so as to conform with Netscapes SSL.
8 *

--- 572 unchanged lines hidden (view full) ---

581 prompt = UI_construct_prompt(ui, "pass phrase",
582 prompt_info);
583
584 ui_flags |= UI_INPUT_FLAG_DEFAULT_PWD;
585 UI_ctrl(ui, UI_CTRL_PRINT_ERRORS, 1, 0, 0);
586
587 if (ok >= 0)
588 ok = UI_add_input_string(ui,prompt,ui_flags,buf,
589 PW_MIN_LENGTH,BUFSIZ-1);
589 PW_MIN_LENGTH,bufsiz-1);
590 if (ok >= 0 && verify)
591 {
592 buff = (char *)OPENSSL_malloc(bufsiz);
593 ok = UI_add_verify_string(ui,prompt,ui_flags,buff,
590 if (ok >= 0 && verify)
591 {
592 buff = (char *)OPENSSL_malloc(bufsiz);
593 ok = UI_add_verify_string(ui,prompt,ui_flags,buff,
594 PW_MIN_LENGTH,BUFSIZ-1, buf);
594 PW_MIN_LENGTH,bufsiz-1, buf);
595 }
596 if (ok >= 0)
597 do
598 {
599 ok = UI_process(ui);
600 }
601 while (ok < 0 && UI_ctrl(ui, UI_CTRL_IS_REDOABLE, 0, 0, 0));
602

--- 2233 unchanged lines hidden (view full) ---

2836 double ret=0;
2837 static ULARGE_INTEGER tmstart;
2838 static int warning=1;
2839#ifdef _WIN32_WINNT
2840 static HANDLE proc=NULL;
2841
2842 if (proc==NULL)
2843 {
595 }
596 if (ok >= 0)
597 do
598 {
599 ok = UI_process(ui);
600 }
601 while (ok < 0 && UI_ctrl(ui, UI_CTRL_IS_REDOABLE, 0, 0, 0));
602

--- 2233 unchanged lines hidden (view full) ---

2836 double ret=0;
2837 static ULARGE_INTEGER tmstart;
2838 static int warning=1;
2839#ifdef _WIN32_WINNT
2840 static HANDLE proc=NULL;
2841
2842 if (proc==NULL)
2843 {
2844 if (GetVersion() < 0x80000000)
2844 if (check_winnt())
2845 proc = OpenProcess(PROCESS_QUERY_INFORMATION,FALSE,
2846 GetCurrentProcessId());
2847 if (proc==NULL) proc = (HANDLE)-1;
2848 }
2849
2850 if (usertime && proc!=(HANDLE)-1)
2851 {
2852 FILETIME junk;

--- 242 unchanged lines hidden ---
2845 proc = OpenProcess(PROCESS_QUERY_INFORMATION,FALSE,
2846 GetCurrentProcessId());
2847 if (proc==NULL) proc = (HANDLE)-1;
2848 }
2849
2850 if (usertime && proc!=(HANDLE)-1)
2851 {
2852 FILETIME junk;

--- 242 unchanged lines hidden ---