diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2017-02-12 05:45:15 +0100 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2017-02-12 05:45:15 +0100 |
| commit | bd5d7d239525d595ecea92765334af33a45d9d63 (patch) | |
| tree | c6f5ebb0455ff26502b78d4f90f8d804c67d3ebe /sshkey.c | |
| parent | upstream commit (diff) | |
| download | openssh-bd5d7d239525d595ecea92765334af33a45d9d63.tar.xz openssh-bd5d7d239525d595ecea92765334af33a45d9d63.zip | |
ifdef out EVP_R_PRIVATE_KEY_DECODE_ERROR
EVP_R_PRIVATE_KEY_DECODE_ERROR was added in OpenSSL 1.0.0 so ifdef out
for the benefit of OpenSSL versions prior to that.
Diffstat (limited to '')
| -rw-r--r-- | sshkey.c | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -3812,7 +3812,9 @@ sshkey_parse_private_pem_fileblob(struct sshbuf *blob, int type, goto out; case EVP_R_BN_DECODE_ERROR: case EVP_R_DECODE_ERROR: +#ifdef EVP_R_PRIVATE_KEY_DECODE_ERROR case EVP_R_PRIVATE_KEY_DECODE_ERROR: +#endif r = SSH_ERR_INVALID_FORMAT; goto out; default: |