Jon Ciesla 063899
diff -up bacula-5.0.2/bacula-5.0.2/src/lib/crypto.c.openssl bacula-5.0.2/bacula-5.0.2/src/lib/crypto.c
Jon Ciesla 063899
--- bacula-5.0.2/bacula-5.0.2/src/lib/crypto.c.openssl	2010-04-27 21:58:29.000000000 +0200
Jon Ciesla 063899
+++ bacula-5.0.2/bacula-5.0.2/src/lib/crypto.c	2010-06-01 17:51:52.846894465 +0200
Jon Ciesla 063899
@@ -51,7 +51,7 @@
Jon Ciesla 063899
  * For OpenSSL version 1.x, EVP_PKEY_encrypt no longer
Jon Ciesla 063899
  *  exists.  It was not an official API.
Jon Ciesla 063899
  */
Jon Ciesla 063899
-#ifdef HAVE_OPENSSLv1
Jon Ciesla 063899
+#ifdef OPENSSL_VERSION_NUMBER >= 0x10000000L
Jon Ciesla 063899
 #define EVP_PKEY_encrypt EVP_PKEY_encrypt_old
Jon Ciesla 063899
 #define EVP_PKEY_decrypt EVP_PKEY_decrypt_old
Jon Ciesla 063899
 #endif
Jon Ciesla 063899
diff -up bacula-5.0.2/bacula-5.0.2/src/lib/tls.c.openssl bacula-5.0.2/bacula-5.0.2/src/lib/tls.c
Jon Ciesla 063899
--- bacula-5.0.2/bacula-5.0.2/src/lib/tls.c.openssl	2010-04-27 21:58:29.000000000 +0200
Jon Ciesla 063899
+++ bacula-5.0.2/bacula-5.0.2/src/lib/tls.c	2010-06-01 17:52:15.535769446 +0200
Jon Ciesla 063899
@@ -315,7 +315,7 @@ bool tls_postconnect_verify_host(JCR *jc
Jon Ciesla 063899
          extname = OBJ_nid2sn(OBJ_obj2nid(X509_EXTENSION_get_object(ext)));
Jon Ciesla 063899
 
Jon Ciesla 063899
          if (strcmp(extname, "subjectAltName") == 0) {
Jon Ciesla 063899
-#ifdef HAVE_OPENSSLv1
Jon Ciesla 063899
+#ifdef OPENSSL_VERSION_NUMBER >= 0x10000000L
Jon Ciesla 063899
             const X509V3_EXT_METHOD *method;
Jon Ciesla 063899
 #else
Jon Ciesla 063899
             X509V3_EXT_METHOD *method;