Tree - rpms/bacula - src.fedoraproject.org

Blob History Raw

	38cff71	`diff -Naur bacula-7.4.0.old/src/lib/crypto.c bacula-7.4.0/src/lib/crypto.c`
	38cff71	`--- bacula-7.4.0.old/src/lib/crypto.c 2016-01-25 21:00:14.019670307 +0100`
	38cff71	`+++ bacula-7.4.0/src/lib/crypto.c 2016-01-25 21:00:22.216798164 +0100`
	38cff71	`@@ -42,7 +42,7 @@`
	d1fa04c	`* For OpenSSL version 1.x, EVP_PKEY_encrypt no longer`
	d1fa04c	`* exists. It was not an official API.`
	d1fa04c	`*/`
	d1fa04c	`-#ifdef HAVE_OPENSSLv1`
Jan Görig	7f55ce9	`+#if (OPENSSL_VERSION_NUMBER >= 0x10000000L)`
	d1fa04c	`#define EVP_PKEY_encrypt EVP_PKEY_encrypt_old`
	d1fa04c	`#define EVP_PKEY_decrypt EVP_PKEY_decrypt_old`
	d1fa04c	`#endif`
	38cff71	`diff -Naur bacula-7.4.0.old/src/lib/tls.c bacula-7.4.0/src/lib/tls.c`
	38cff71	`--- bacula-7.4.0.old/src/lib/tls.c 2016-01-25 21:00:14.019670307 +0100`
	38cff71	`+++ bacula-7.4.0/src/lib/tls.c 2016-01-25 21:00:22.218798196 +0100`
	38cff71	`@@ -329,7 +329,7 @@`
	d1fa04c	`extname = OBJ_nid2sn(OBJ_obj2nid(X509_EXTENSION_get_object(ext)));`
	111191f
	d1fa04c	`if (strcmp(extname, "subjectAltName") == 0) {`
	d1fa04c	`-#ifdef HAVE_OPENSSLv1`
Jan Görig	7f55ce9	`+#if (OPENSSL_VERSION_NUMBER >= 0x10000000L)`
	d1fa04c	`const X509V3_EXT_METHOD *method;`
	d1fa04c	`#else`
	d1fa04c	`X509V3_EXT_METHOD *method;`