- dtucker@cvs.openbsd.org 2010/01/08 21:50:49

[openssh.git] / authfile.c

diff --git a/authfile.c b/authfile.c
index 22df6c64b3e7c5ce7f15cced080d052098725f69..3fbe11b0e0fd61847fc1f0ebfec4a609f8194d8b 100644 (file)
--- a/authfile.c
+++ b/authfile.c
@@ -47,6 +47,9 @@
 #include <openssl/evp.h>
 #include <openssl/pem.h>
 
+/* compatibility with old or broken OpenSSL versions */
+#include "openbsd-compat/openssl-compat.h"
+
 #include <errno.h>
 #include <fcntl.h>
 #include <stdarg.h>
@@ -184,7 +187,11 @@ key_save_private_pem(Key *key, const char *filename, const char *_passphrase,
        int success = 0;
        int 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
 
        if (len > 0 && len <= 4) {
                error("passphrase too short: have %d bytes, need > 4", len);