[openssh-commits] [openssh] 01/01: ifdef out EVP_R_PRIVATE_KEY_DECODE_ERROR

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

dtucker pushed a commit to branch master
in repository openssh.

commit bd5d7d239525d595ecea92765334af33a45d9d63
Author: Darren Tucker <dtucker at zip.com.au>
Date:   Sun Feb 12 15:45:15 2017 +1100

    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.
---
 sshkey.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sshkey.c b/sshkey.c
index 0567592..31710e5 100644
--- a/sshkey.c
+++ b/sshkey.c
@@ -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:

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.