version 1.100, 2020/02/26 13:40:09 |
version 1.101, 2020/03/06 18:21:28 |
|
|
r = SSH_ERR_KEY_UNKNOWN_CIPHER; |
r = SSH_ERR_KEY_UNKNOWN_CIPHER; |
goto out; |
goto out; |
} |
} |
if ((passphrase == NULL || strlen(passphrase) == 0) && |
|
strcmp(ciphername, "none") != 0) { |
|
/* passphrase required */ |
|
r = SSH_ERR_KEY_WRONG_PASSPHRASE; |
|
goto out; |
|
} |
|
if (strcmp(kdfname, "none") != 0 && strcmp(kdfname, "bcrypt") != 0) { |
if (strcmp(kdfname, "none") != 0 && strcmp(kdfname, "bcrypt") != 0) { |
r = SSH_ERR_KEY_UNKNOWN_CIPHER; |
r = SSH_ERR_KEY_UNKNOWN_CIPHER; |
goto out; |
goto out; |
} |
} |
if (!strcmp(kdfname, "none") && strcmp(ciphername, "none") != 0) { |
if (strcmp(kdfname, "none") == 0 && strcmp(ciphername, "none") != 0) { |
r = SSH_ERR_INVALID_FORMAT; |
r = SSH_ERR_INVALID_FORMAT; |
|
goto out; |
|
} |
|
if ((passphrase == NULL || strlen(passphrase) == 0) && |
|
strcmp(kdfname, "none") != 0) { |
|
/* passphrase required */ |
|
r = SSH_ERR_KEY_WRONG_PASSPHRASE; |
goto out; |
goto out; |
} |
} |
if (nkeys != 1) { |
if (nkeys != 1) { |