From 8fed0a5fe7b4e78a6810b133d8e91be9742ee0a1 Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Wed, 29 Mar 2017 10:16:15 +1100 Subject: [PATCH] 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 53a7674b5..3c487849e 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;