summaryrefslogtreecommitdiff
path: root/sshkey.c
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2017-03-29 10:16:15 +1100
committerDarren Tucker <dtucker@zip.com.au>2017-03-29 10:16:15 +1100
commit8fed0a5fe7b4e78a6810b133d8e91be9742ee0a1 (patch)
treedfecbb0e3f9bdb799871cfdb71a05a848b35cb25 /sshkey.c
parent608ec1f62ff22fdccc3952e51463d79c43cbd0d3 (diff)
Remove compat code for OpenSSL < 0.9.7.
Resyncs that code with OpenBSD upstream.
Diffstat (limited to 'sshkey.c')
-rw-r--r--sshkey.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/sshkey.c b/sshkey.c
index 53a7674b..3c487849 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;