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