Simone Caronni 9ad917
diff -Naur bacula-9.0.6.old/src/lib/crypto.c bacula-9.0.6/src/lib/crypto.c
Simone Caronni 9ad917
--- bacula-9.0.6.old/src/lib/crypto.c	2017-12-07 15:42:03.771178189 +0100
Simone Caronni 9ad917
+++ bacula-9.0.6/src/lib/crypto.c	2017-12-07 15:42:25.300578772 +0100
Simone Caronni 38cff7
@@ -42,7 +42,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 9ad917
diff -Naur bacula-9.0.6.old/src/lib/tls.c bacula-9.0.6/src/lib/tls.c
Simone Caronni 9ad917
--- bacula-9.0.6.old/src/lib/tls.c	2017-12-07 15:42:03.770178170 +0100
Simone Caronni 9ad917
+++ bacula-9.0.6/src/lib/tls.c	2017-12-07 15:42:26.891608376 +0100
Simone Caronni 9ad917
@@ -47,9 +47,6 @@
Simone Caronni f89001
 
Simone Caronni 9ad917
 #include "openssl-compat.h"
Simone Caronni f89001
 
Simone Caronni f89001
-/* No anonymous ciphers, no <128 bit ciphers, no export ciphers, no MD5 ciphers */
Simone Caronni f89001
-#define TLS_DEFAULT_CIPHERS "ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH"
Simone Caronni f89001
-
Simone Caronni f89001
 /* TLS Context Structure */
Simone Caronni f89001
 struct TLS_Context {
Simone Caronni f89001
    SSL_CTX *openssl;
Simone Caronni 9ad917
@@ -206,7 +203,7 @@
Simone Caronni f89001
       SSL_CTX_set_options(ctx->openssl, SSL_OP_SINGLE_DH_USE);
Simone Caronni f89001
    }
Simone Caronni f89001
 
Simone Caronni f89001
-   if (SSL_CTX_set_cipher_list(ctx->openssl, TLS_DEFAULT_CIPHERS) != 1) {
Simone Caronni f89001
+   if (SSL_CTX_set_cipher_list(ctx->openssl, "PROFILE=SYSTEM") != 1) {
Simone Caronni f89001
       Jmsg0(NULL, M_ERROR, 0,
Simone Caronni f89001
              _("Error setting cipher list, no valid ciphers available\n"));
Simone Caronni f89001
       goto err;
Simone Caronni 9ad917
@@ -328,7 +325,7 @@
Simone Caronni 9ad917
          extname = OBJ_nid2sn(OBJ_obj2nid(X509_EXTENSION_get_object(ext)));
Simone Caronni 9ad917
 
Simone Caronni 9ad917
          if (strcmp(extname, "subjectAltName") == 0) {
Simone Caronni 9ad917
-#ifdef HAVE_OPENSSLv1
Simone Caronni 9ad917
+#if (OPENSSL_VERSION_NUMBER >= 0x10000000L)
Simone Caronni 9ad917
             const X509V3_EXT_METHOD *method;
Simone Caronni 9ad917
 #else
Simone Caronni 9ad917
             X509V3_EXT_METHOD *method;