diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/libcrypto/evp/evp_key.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/lib/libcrypto/evp/evp_key.c b/src/lib/libcrypto/evp/evp_key.c index d6ce373735..1f3d758268 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.32 2024/01/05 10:15:36 tb Exp $ */ | 1 | /* $OpenBSD: evp_key.c,v 1.33 2024/01/05 10:18:52 tb 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 | * |
| @@ -75,18 +75,17 @@ EVP_set_pw_prompt(const char *prompt) | |||
| 75 | { | 75 | { |
| 76 | if (prompt == NULL) | 76 | if (prompt == NULL) |
| 77 | prompt_string[0] = '\0'; | 77 | prompt_string[0] = '\0'; |
| 78 | else { | 78 | else |
| 79 | strlcpy(prompt_string, prompt, sizeof(prompt_string)); | 79 | strlcpy(prompt_string, prompt, sizeof(prompt_string)); |
| 80 | } | ||
| 81 | } | 80 | } |
| 82 | 81 | ||
| 83 | char * | 82 | char * |
| 84 | EVP_get_pw_prompt(void) | 83 | EVP_get_pw_prompt(void) |
| 85 | { | 84 | { |
| 86 | if (prompt_string[0] == '\0') | 85 | if (prompt_string[0] == '\0') |
| 87 | return (NULL); | 86 | return NULL; |
| 88 | else | 87 | |
| 89 | return (prompt_string); | 88 | return prompt_string; |
| 90 | } | 89 | } |
| 91 | 90 | ||
| 92 | int | 91 | int |
| @@ -155,7 +154,7 @@ EVP_BytesToKey(const EVP_CIPHER *type, const EVP_MD *md, | |||
| 155 | } | 154 | } |
| 156 | 155 | ||
| 157 | if (data == NULL) | 156 | if (data == NULL) |
| 158 | return (nkey); | 157 | return nkey; |
| 159 | 158 | ||
| 160 | EVP_MD_CTX_init(&c); | 159 | EVP_MD_CTX_init(&c); |
| 161 | for (;;) { | 160 | for (;;) { |
