提交 b160f282 编写于 作者: R Richard Levitte

Don't require any length of password when decrypting

RT#2534
Reviewed-by: NTim Hudson <tjh@openssl.org>
上级 8f41ff2d
...@@ -98,17 +98,23 @@ int PEM_def_callback(char *buf, int num, int w, void *key) ...@@ -98,17 +98,23 @@ int PEM_def_callback(char *buf, int num, int w, void *key)
prompt = "Enter PEM pass phrase:"; prompt = "Enter PEM pass phrase:";
for (;;) { for (;;) {
i = EVP_read_pw_string_min(buf, MIN_LENGTH, num, prompt, w); /*
* We assume that w == 0 means decryption,
* while w == 1 means encryption
*/
int min_len = w ? MIN_LENGTH : 0;
i = EVP_read_pw_string_min(buf, min_len, num, prompt, w);
if (i != 0) { if (i != 0) {
PEMerr(PEM_F_PEM_DEF_CALLBACK, PEM_R_PROBLEMS_GETTING_PASSWORD); PEMerr(PEM_F_PEM_DEF_CALLBACK, PEM_R_PROBLEMS_GETTING_PASSWORD);
memset(buf, 0, (unsigned int)num); memset(buf, 0, (unsigned int)num);
return (-1); return (-1);
} }
j = strlen(buf); j = strlen(buf);
if (j < MIN_LENGTH) { if (min_len && j < min_len) {
fprintf(stderr, fprintf(stderr,
"phrase is too short, needs to be at least %d chars\n", "phrase is too short, needs to be at least %d chars\n",
MIN_LENGTH); min_len);
} else } else
break; break;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册