diff options
| -rw-r--r-- | src/lib/libcrypto/evp/evp_key.c | 5 | ||||
| -rw-r--r-- | src/lib/libssl/src/crypto/evp/evp_key.c | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/src/lib/libcrypto/evp/evp_key.c b/src/lib/libcrypto/evp/evp_key.c index 0c5d9bc001..4380be9137 100644 --- a/src/lib/libcrypto/evp/evp_key.c +++ b/src/lib/libcrypto/evp/evp_key.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: evp_key.c,v 1.16 2014/07/10 13:58:22 jsing Exp $ */ | 1 | /* $OpenBSD: evp_key.c,v 1.17 2014/07/10 19:30:06 miod Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -87,9 +87,6 @@ EVP_get_pw_prompt(void) | |||
| 87 | return (prompt_string); | 87 | return (prompt_string); |
| 88 | } | 88 | } |
| 89 | 89 | ||
| 90 | /* For historical reasons, the standard function for reading passwords is | ||
| 91 | * in the DES library -- if someone ever wants to disable DES, | ||
| 92 | * this function will fail */ | ||
| 93 | int | 90 | int |
| 94 | EVP_read_pw_string(char *buf, int len, const char *prompt, int verify) | 91 | EVP_read_pw_string(char *buf, int len, const char *prompt, int verify) |
| 95 | { | 92 | { |
diff --git a/src/lib/libssl/src/crypto/evp/evp_key.c b/src/lib/libssl/src/crypto/evp/evp_key.c index 0c5d9bc001..4380be9137 100644 --- a/src/lib/libssl/src/crypto/evp/evp_key.c +++ b/src/lib/libssl/src/crypto/evp/evp_key.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: evp_key.c,v 1.16 2014/07/10 13:58:22 jsing Exp $ */ | 1 | /* $OpenBSD: evp_key.c,v 1.17 2014/07/10 19:30:06 miod Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -87,9 +87,6 @@ EVP_get_pw_prompt(void) | |||
| 87 | return (prompt_string); | 87 | return (prompt_string); |
| 88 | } | 88 | } |
| 89 | 89 | ||
| 90 | /* For historical reasons, the standard function for reading passwords is | ||
| 91 | * in the DES library -- if someone ever wants to disable DES, | ||
| 92 | * this function will fail */ | ||
| 93 | int | 90 | int |
| 94 | EVP_read_pw_string(char *buf, int len, const char *prompt, int verify) | 91 | EVP_read_pw_string(char *buf, int len, const char *prompt, int verify) |
| 95 | { | 92 | { |
