[openssh-commits] [openssh] 02/04: Remove compat code for OpenSSL < 0.9.7.

[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 8fed0a5fe7b4e78a6810b133d8e91be9742ee0a1
Author: Darren Tucker <dtucker at zip.com.au>
Date:   Wed Mar 29 10:16:15 2017 +1100

    Remove compat code for OpenSSL < 0.9.7.
    
    Resyncs that code with OpenBSD upstream.
---
 sshkey.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/sshkey.c b/sshkey.c
index 53a7674..3c48784 100644
--- a/sshkey.c
+++ b/sshkey.c
@@ -3513,11 +3513,7 @@ sshkey_private_pem_to_blob(struct sshkey *key, struct sshbuf *blob,
 	int success, r;
 	int blen, len = strlen(_passphrase);
 	u_char *passphrase = (len > 0) ? (u_char *)_passphrase : NULL;
-#if (OPENSSL_VERSION_NUMBER < 0x00907000L)
-	const EVP_CIPHER *cipher = (len > 0) ? EVP_des_ede3_cbc() : NULL;
-#else
- 	const EVP_CIPHER *cipher = (len > 0) ? EVP_aes_128_cbc() : NULL;
-#endif
+	const EVP_CIPHER *cipher = (len > 0) ? EVP_aes_128_cbc() : NULL;
 	const u_char *bptr;
 	BIO *bio = NULL;
 

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