Blame bacula-7.0.3-openssl.patch
|
Simone Caronni |
47fa61 |
diff -Naur bacula-7.0.3.old/src/lib/crypto.c bacula-7.0.3/src/lib/crypto.c
|
|
Simone Caronni |
47fa61 |
--- bacula-7.0.3.old/src/lib/crypto.c 2014-05-15 15:45:13.744148767 +0200
|
|
Simone Caronni |
47fa61 |
+++ bacula-7.0.3/src/lib/crypto.c 2014-05-15 15:45:23.381043832 +0200
|
|
Simone Caronni |
47fa61 |
@@ -39,7 +39,7 @@
|
|
Jon Ciesla |
d1fa04 |
* For OpenSSL version 1.x, EVP_PKEY_encrypt no longer
|
|
Jon Ciesla |
d1fa04 |
* exists. It was not an official API.
|
|
Jon Ciesla |
d1fa04 |
*/
|
|
Jon Ciesla |
d1fa04 |
-#ifdef HAVE_OPENSSLv1
|
|
Jan Görig |
7f55ce |
+#if (OPENSSL_VERSION_NUMBER >= 0x10000000L)
|
|
Jon Ciesla |
d1fa04 |
#define EVP_PKEY_encrypt EVP_PKEY_encrypt_old
|
|
Jon Ciesla |
d1fa04 |
#define EVP_PKEY_decrypt EVP_PKEY_decrypt_old
|
|
Jon Ciesla |
d1fa04 |
#endif
|
|
Simone Caronni |
47fa61 |
diff -Naur bacula-7.0.3.old/src/lib/tls.c bacula-7.0.3/src/lib/tls.c
|
|
Simone Caronni |
47fa61 |
--- bacula-7.0.3.old/src/lib/tls.c 2014-05-15 15:45:13.742148789 +0200
|
|
Simone Caronni |
47fa61 |
+++ bacula-7.0.3/src/lib/tls.c 2014-05-15 15:45:23.381043832 +0200
|
|
Simone Caronni |
47fa61 |
@@ -304,7 +304,7 @@
|
|
Jon Ciesla |
d1fa04 |
extname = OBJ_nid2sn(OBJ_obj2nid(X509_EXTENSION_get_object(ext)));
|
|
Jon Ciesla |
111191 |
|
|
Jon Ciesla |
d1fa04 |
if (strcmp(extname, "subjectAltName") == 0) {
|
|
Jon Ciesla |
d1fa04 |
-#ifdef HAVE_OPENSSLv1
|
|
Jan Görig |
7f55ce |
+#if (OPENSSL_VERSION_NUMBER >= 0x10000000L)
|
|
Jon Ciesla |
d1fa04 |
const X509V3_EXT_METHOD *method;
|
|
Jon Ciesla |
d1fa04 |
#else
|
|
Jon Ciesla |
d1fa04 |
X509V3_EXT_METHOD *method;
|