diff options
author | Darren Tucker <dtucker@zip.com.au> | 2017-03-29 10:16:15 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2017-03-29 10:16:15 +1100 |
commit | 8fed0a5fe7b4e78a6810b133d8e91be9742ee0a1 (patch) | |
tree | dfecbb0e3f9bdb799871cfdb71a05a848b35cb25 | |
parent | 608ec1f62ff22fdccc3952e51463d79c43cbd0d3 (diff) |
Remove compat code for OpenSSL < 0.9.7.
Resyncs that code with OpenBSD upstream.
-rw-r--r-- | sshkey.c | 6 |
1 files changed, 1 insertions, 5 deletions
@@ -3513,11 +3513,7 @@ sshkey_private_pem_to_blob(struct sshkey *key, struct sshbuf *blob, | |||
3513 | int success, r; | 3513 | int success, r; |
3514 | int blen, len = strlen(_passphrase); | 3514 | int blen, len = strlen(_passphrase); |
3515 | u_char *passphrase = (len > 0) ? (u_char *)_passphrase : NULL; | 3515 | u_char *passphrase = (len > 0) ? (u_char *)_passphrase : NULL; |
3516 | #if (OPENSSL_VERSION_NUMBER < 0x00907000L) | 3516 | const EVP_CIPHER *cipher = (len > 0) ? EVP_aes_128_cbc() : NULL; |
3517 | const EVP_CIPHER *cipher = (len > 0) ? EVP_des_ede3_cbc() : NULL; | ||
3518 | #else | ||
3519 | const EVP_CIPHER *cipher = (len > 0) ? EVP_aes_128_cbc() : NULL; | ||
3520 | #endif | ||
3521 | const u_char *bptr; | 3517 | const u_char *bptr; |
3522 | BIO *bio = NULL; | 3518 | BIO *bio = NULL; |
3523 | 3519 | ||