2016-01-25 20:12:28 +00:00
|
|
|
diff -Naur bacula-7.4.0.old/src/lib/crypto.c bacula-7.4.0/src/lib/crypto.c
|
|
|
|
|
--- bacula-7.4.0.old/src/lib/crypto.c 2016-01-25 21:00:14.019670307 +0100
|
|
|
|
|
+++ bacula-7.4.0/src/lib/crypto.c 2016-01-25 21:00:22.216798164 +0100
|
|
|
|
|
@@ -42,7 +42,7 @@
|
2014-05-15 14:02:42 +00:00
|
|
|
* For OpenSSL version 1.x, EVP_PKEY_encrypt no longer
|
|
|
|
|
* exists. It was not an official API.
|
|
|
|
|
*/
|
|
|
|
|
-#ifdef HAVE_OPENSSLv1
|
|
|
|
|
+#if (OPENSSL_VERSION_NUMBER >= 0x10000000L)
|
|
|
|
|
#define EVP_PKEY_encrypt EVP_PKEY_encrypt_old
|
|
|
|
|
#define EVP_PKEY_decrypt EVP_PKEY_decrypt_old
|
|
|
|
|
#endif
|
2016-01-25 20:12:28 +00:00
|
|
|
diff -Naur bacula-7.4.0.old/src/lib/tls.c bacula-7.4.0/src/lib/tls.c
|
|
|
|
|
--- bacula-7.4.0.old/src/lib/tls.c 2016-01-25 21:00:14.019670307 +0100
|
|
|
|
|
+++ bacula-7.4.0/src/lib/tls.c 2016-01-25 21:00:22.218798196 +0100
|
|
|
|
|
@@ -329,7 +329,7 @@
|
2014-05-15 14:02:42 +00:00
|
|
|
extname = OBJ_nid2sn(OBJ_obj2nid(X509_EXTENSION_get_object(ext)));
|
|
|
|
|
|
|
|
|
|
if (strcmp(extname, "subjectAltName") == 0) {
|
|
|
|
|
-#ifdef HAVE_OPENSSLv1
|
|
|
|
|
+#if (OPENSSL_VERSION_NUMBER >= 0x10000000L)
|
|
|
|
|
const X509V3_EXT_METHOD *method;
|
|
|
|
|
#else
|
|
|
|
|
X509V3_EXT_METHOD *method;
|
