Date: Tue, 13 Apr 2010 13:00:14 GMT From: Vladimir Pushkar <vladimir.pushkar@gmail.com> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/145642: sysutils/bacula-client: bacula-client-5.0.0 does not compile with openssl-1.0.0 Message-ID: <201004131300.o3DD0EA3018703@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/145642; it has been noted by GNATS.
From: Vladimir Pushkar <vladimir.pushkar@gmail.com>
To: bug-followup@freebsd.org, vladimir.pushkar@gmail.com
Cc:
Subject: Re: ports/145642: sysutils/bacula-client: bacula-client-5.0.0 does
not compile with openssl-1.0.0
Date: Tue, 13 Apr 2010 15:34:45 +0300
FIX:
patch-lib-crypto.c:
--- src/lib/crypto.c.orig 2010-01-25 09:56:28.000000000 +0200
+++ src/lib/crypto.c 2010-04-13 15:12:17.000000000 +0300
@@ -309,7 +309,11 @@
*/
static ASN1_OCTET_STRING *openssl_cert_keyid(X509 *cert) {
X509_EXTENSION *ext;
+#if (OPENSSL_VERSION_NUMBER < 0x10000000L)
X509V3_EXT_METHOD *method;
+#else
+ const X509V3_EXT_METHOD *method;
+#endif
ASN1_OCTET_STRING *keyid;
int i;
#if (OPENSSL_VERSION_NUMBER >= 0x0090800FL)
@@ -973,6 +977,10 @@
free (sig);
}
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+#define EVP_PKEY_decrypt EVP_PKEY_decrypt_old
+#define EVP_PKEY_encrypt EVP_PKEY_encrypt_old
+#endif
/*
* Create a new encryption session.
* Returns: A pointer to a CRYPTO_SESSION object on success.
patch-lib-tls.c:
--- src/lib/tls.c.orig 2010-01-25 09:56:28.000000000 +0200
+++ src/lib/tls.c 2010-04-13 15:20:20.000000000 +0300
@@ -315,7 +315,11 @@
extname = OBJ_nid2sn(OBJ_obj2nid(X509_EXTENSION_get_object(ext)));
if (strcmp(extname, "subjectAltName") == 0) {
+#if (OPENSSL_VERSION_NUMBER >= 0x10000000L)
+ const X509V3_EXT_METHOD *method;
+#else
X509V3_EXT_METHOD *method;
+#endif
STACK_OF(CONF_VALUE) *val;
CONF_VALUE *nval;
void *extstr = NULL;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201004131300.o3DD0EA3018703>