diff options
Diffstat (limited to 'src/lib/libcrypto/evp/evp_key.c')
-rw-r--r-- | src/lib/libcrypto/evp/evp_key.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/lib/libcrypto/evp/evp_key.c b/src/lib/libcrypto/evp/evp_key.c index 21eda418bc..667c21cca8 100644 --- a/src/lib/libcrypto/evp/evp_key.c +++ b/src/lib/libcrypto/evp/evp_key.c | |||
@@ -81,15 +81,18 @@ char *EVP_get_pw_prompt(void) | |||
81 | return(prompt_string); | 81 | return(prompt_string); |
82 | } | 82 | } |
83 | 83 | ||
84 | #ifdef NO_DES | 84 | /* For historical reasons, the standard function for reading passwords is |
85 | int des_read_pw_string(char *buf,int len,const char *prompt,int verify); | 85 | * in the DES library -- if someone ever wants to disable DES, |
86 | #endif | 86 | * this function will fail */ |
87 | |||
88 | int EVP_read_pw_string(char *buf, int len, const char *prompt, int verify) | 87 | int EVP_read_pw_string(char *buf, int len, const char *prompt, int verify) |
89 | { | 88 | { |
89 | #ifndef NO_DES | ||
90 | if ((prompt == NULL) && (prompt_string[0] != '\0')) | 90 | if ((prompt == NULL) && (prompt_string[0] != '\0')) |
91 | prompt=prompt_string; | 91 | prompt=prompt_string; |
92 | return(des_read_pw_string(buf,len,prompt,verify)); | 92 | return(des_read_pw_string(buf,len,prompt,verify)); |
93 | #else | ||
94 | return -1; | ||
95 | #endif | ||
93 | } | 96 | } |
94 | 97 | ||
95 | int EVP_BytesToKey(const EVP_CIPHER *type, EVP_MD *md, unsigned char *salt, | 98 | int EVP_BytesToKey(const EVP_CIPHER *type, EVP_MD *md, unsigned char *salt, |