25 lines
1.0 KiB
Diff
25 lines
1.0 KiB
Diff
|
diff -Naur bacula-7.0.3.old/src/lib/crypto.c bacula-7.0.3/src/lib/crypto.c
|
||
|
|
--- bacula-7.0.3.old/src/lib/crypto.c 2014-05-15 15:45:13.744148767 +0200
|
||
|
|
+++ bacula-7.0.3/src/lib/crypto.c 2014-05-15 15:45:23.381043832 +0200
|
||
|
|
@@ -39,7 +39,7 @@
|
||
|
|
* 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
|
||
|
|
diff -Naur bacula-7.0.3.old/src/lib/tls.c bacula-7.0.3/src/lib/tls.c
|
||
|
|
--- bacula-7.0.3.old/src/lib/tls.c 2014-05-15 15:45:13.742148789 +0200
|
||
|
|
+++ bacula-7.0.3/src/lib/tls.c 2014-05-15 15:45:23.381043832 +0200
|
||
|
|
@@ -304,7 +304,7 @@
|
||
|
|
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;
|