diff options
| author | Bodo Möller <bodo@openssl.org> | 2000-01-07 13:15:54 +0100 |
|---|---|---|
| committer | Bodo Möller <bodo@openssl.org> | 2000-01-07 13:15:54 +0100 |
| commit | 63da21c01ba1b4fa4bd5adb8b3b36567025b8e15 (patch) | |
| tree | 3538d02fe0742b65179cce5356ac32f3cd587837 /crypto/evp/evp_key.c | |
| parent | add V_CRYPTO_MDEBUG_ALL (diff) | |
| download | openssl-63da21c01ba1b4fa4bd5adb8b3b36567025b8e15.tar.xz openssl-63da21c01ba1b4fa4bd5adb8b3b36567025b8e15.zip | |
make no-des and no-rc2 work.
Diffstat (limited to 'crypto/evp/evp_key.c')
| -rw-r--r-- | crypto/evp/evp_key.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/crypto/evp/evp_key.c b/crypto/evp/evp_key.c index 21eda418bc..667c21cca8 100644 --- a/crypto/evp/evp_key.c +++ b/crypto/evp/evp_key.c @@ -81,15 +81,18 @@ char *EVP_get_pw_prompt(void) return(prompt_string); } -#ifdef NO_DES -int des_read_pw_string(char *buf,int len,const char *prompt,int verify); -#endif - +/* For historical reasons, the standard function for reading passwords is + * in the DES library -- if someone ever wants to disable DES, + * this function will fail */ int EVP_read_pw_string(char *buf, int len, const char *prompt, int verify) { +#ifndef NO_DES if ((prompt == NULL) && (prompt_string[0] != '\0')) prompt=prompt_string; return(des_read_pw_string(buf,len,prompt,verify)); +#else + return -1; +#endif } int EVP_BytesToKey(const EVP_CIPHER *type, EVP_MD *md, unsigned char *salt, |