Date: Tue, 12 Mar 2019 04:18:32 +0000 (UTC) From: Cy Schubert <cy@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r495423 - in head/security: krb5-115/files krb5-116/files krb5-117/files krb5-devel/files Message-ID: <201903120418.x2C4IWsk053622@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cy Date: Tue Mar 12 04:18:32 2019 New Revision: 495423 URL: https://svnweb.freebsd.org/changeset/ports/495423 Log: Fix build with LibreSSL 2.9. PR: 234064 Submitted by: Charlie Li <ml+freebsd@vishwin.info> Modified: head/security/krb5-115/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.c (contents, props changed) head/security/krb5-115/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.h (contents, props changed) head/security/krb5-116/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.c (contents, props changed) head/security/krb5-116/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.h (contents, props changed) head/security/krb5-117/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.c (contents, props changed) head/security/krb5-117/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.h (contents, props changed) head/security/krb5-devel/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.c (contents, props changed) head/security/krb5-devel/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.h (contents, props changed) Modified: head/security/krb5-115/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.c ============================================================================== --- head/security/krb5-115/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.c Tue Mar 12 04:14:54 2019 (r495422) +++ head/security/krb5-115/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.c Tue Mar 12 04:18:32 2019 (r495423) @@ -1,6 +1,6 @@ ---- plugins/preauth/pkinit/pkinit_crypto_openssl.c.orig 2018-05-03 07:34:47.000000000 -0700 -+++ plugins/preauth/pkinit/pkinit_crypto_openssl.c 2018-06-12 18:38:30.978823000 -0700 -@@ -188,7 +188,8 @@ +--- plugins/preauth/pkinit/pkinit_crypto_openssl.c.orig 2018-11-01 23:51:07 UTC ++++ plugins/preauth/pkinit/pkinit_crypto_openssl.c +@@ -188,7 +188,8 @@ pkinit_pkcs11_code_to_text(int err); (*_x509_pp) = PKCS7_cert_from_signer_info(_p7,_si) #endif @@ -10,13 +10,14 @@ /* 1.1 standardizes constructor and destructor names, renaming * EVP_MD_CTX_{create,destroy} and deprecating ASN1_STRING_data. */ -@@ -3040,7 +3041,8 @@ +@@ -3040,7 +3041,9 @@ cleanup: return retval; } -#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+#if (defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L) && \ -+ !defined(LIBRESSL_VERSION_NUMBER) ++#if ((defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L) && \ ++ !defined(LIBRESSL_VERSION_NUMBER)) || \ ++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x20900000L) /* * We need to decode DomainParameters from RFC 3279 section 2.3.3. We would Modified: head/security/krb5-115/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.h ============================================================================== --- head/security/krb5-115/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.h Tue Mar 12 04:14:54 2019 (r495422) +++ head/security/krb5-115/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.h Tue Mar 12 04:18:32 2019 (r495423) @@ -1,12 +1,13 @@ ---- plugins/preauth/pkinit/pkinit_crypto_openssl.h.orig 2018-05-03 07:34:47.000000000 -0700 -+++ plugins/preauth/pkinit/pkinit_crypto_openssl.h 2018-06-12 18:35:23.603366000 -0700 -@@ -46,7 +46,8 @@ +--- plugins/preauth/pkinit/pkinit_crypto_openssl.h.orig 2018-11-01 23:51:07 UTC ++++ plugins/preauth/pkinit/pkinit_crypto_openssl.h +@@ -46,7 +46,9 @@ #include <openssl/asn1.h> #include <openssl/pem.h> -#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+#if (defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L) && \ -+ !defined(LIBRESSL_VERSION_NUMBER) ++#if ((defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L) && \ ++ !defined(LIBRESSL_VERSION_NUMBER)) || \ ++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x20900000L) #include <openssl/asn1t.h> #else #include <openssl/asn1_mac.h> Modified: head/security/krb5-116/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.c ============================================================================== --- head/security/krb5-116/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.c Tue Mar 12 04:14:54 2019 (r495422) +++ head/security/krb5-116/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.c Tue Mar 12 04:18:32 2019 (r495423) @@ -1,6 +1,6 @@ ---- plugins/preauth/pkinit/pkinit_crypto_openssl.c.orig 2018-05-03 07:34:47.000000000 -0700 -+++ plugins/preauth/pkinit/pkinit_crypto_openssl.c 2018-06-12 18:38:30.978823000 -0700 -@@ -188,7 +188,8 @@ +--- plugins/preauth/pkinit/pkinit_crypto_openssl.c.orig 2018-11-01 23:51:07 UTC ++++ plugins/preauth/pkinit/pkinit_crypto_openssl.c +@@ -188,7 +188,8 @@ pkinit_pkcs11_code_to_text(int err); (*_x509_pp) = PKCS7_cert_from_signer_info(_p7,_si) #endif @@ -10,13 +10,14 @@ /* 1.1 standardizes constructor and destructor names, renaming * EVP_MD_CTX_{create,destroy} and deprecating ASN1_STRING_data. */ -@@ -3040,7 +3041,8 @@ +@@ -3040,7 +3041,9 @@ cleanup: return retval; } -#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+#if (defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L) && \ -+ !defined(LIBRESSL_VERSION_NUMBER) ++#if ((defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L) && \ ++ !defined(LIBRESSL_VERSION_NUMBER)) || \ ++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x20900000L) /* * We need to decode DomainParameters from RFC 3279 section 2.3.3. We would Modified: head/security/krb5-116/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.h ============================================================================== --- head/security/krb5-116/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.h Tue Mar 12 04:14:54 2019 (r495422) +++ head/security/krb5-116/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.h Tue Mar 12 04:18:32 2019 (r495423) @@ -1,12 +1,13 @@ ---- plugins/preauth/pkinit/pkinit_crypto_openssl.h.orig 2018-05-03 07:34:47.000000000 -0700 -+++ plugins/preauth/pkinit/pkinit_crypto_openssl.h 2018-06-12 18:35:23.603366000 -0700 -@@ -46,7 +46,8 @@ +--- plugins/preauth/pkinit/pkinit_crypto_openssl.h.orig 2018-11-01 23:51:07 UTC ++++ plugins/preauth/pkinit/pkinit_crypto_openssl.h +@@ -46,7 +46,9 @@ #include <openssl/asn1.h> #include <openssl/pem.h> -#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+#if (defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L) && \ -+ !defined(LIBRESSL_VERSION_NUMBER) ++#if ((defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L) && \ ++ !defined(LIBRESSL_VERSION_NUMBER)) || \ ++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x20900000L) #include <openssl/asn1t.h> #else #include <openssl/asn1_mac.h> Modified: head/security/krb5-117/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.c ============================================================================== --- head/security/krb5-117/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.c Tue Mar 12 04:14:54 2019 (r495422) +++ head/security/krb5-117/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.c Tue Mar 12 04:18:32 2019 (r495423) @@ -1,6 +1,6 @@ ---- plugins/preauth/pkinit/pkinit_crypto_openssl.c.orig 2018-05-03 07:34:47.000000000 -0700 -+++ plugins/preauth/pkinit/pkinit_crypto_openssl.c 2018-06-12 18:38:30.978823000 -0700 -@@ -188,7 +188,8 @@ +--- plugins/preauth/pkinit/pkinit_crypto_openssl.c.orig 2018-11-01 23:51:07 UTC ++++ plugins/preauth/pkinit/pkinit_crypto_openssl.c +@@ -188,7 +188,8 @@ pkinit_pkcs11_code_to_text(int err); (*_x509_pp) = PKCS7_cert_from_signer_info(_p7,_si) #endif @@ -10,13 +10,14 @@ /* 1.1 standardizes constructor and destructor names, renaming * EVP_MD_CTX_{create,destroy} and deprecating ASN1_STRING_data. */ -@@ -3040,7 +3041,8 @@ +@@ -3040,7 +3041,9 @@ cleanup: return retval; } -#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+#if (defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L) && \ -+ !defined(LIBRESSL_VERSION_NUMBER) ++#if ((defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L) && \ ++ !defined(LIBRESSL_VERSION_NUMBER)) || \ ++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x20900000L) /* * We need to decode DomainParameters from RFC 3279 section 2.3.3. We would Modified: head/security/krb5-117/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.h ============================================================================== --- head/security/krb5-117/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.h Tue Mar 12 04:14:54 2019 (r495422) +++ head/security/krb5-117/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.h Tue Mar 12 04:18:32 2019 (r495423) @@ -1,12 +1,13 @@ ---- plugins/preauth/pkinit/pkinit_crypto_openssl.h.orig 2018-05-03 07:34:47.000000000 -0700 -+++ plugins/preauth/pkinit/pkinit_crypto_openssl.h 2018-06-12 18:35:23.603366000 -0700 -@@ -46,7 +46,8 @@ +--- plugins/preauth/pkinit/pkinit_crypto_openssl.h.orig 2018-11-01 23:51:07 UTC ++++ plugins/preauth/pkinit/pkinit_crypto_openssl.h +@@ -46,7 +46,9 @@ #include <openssl/asn1.h> #include <openssl/pem.h> -#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+#if (defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L) && \ -+ !defined(LIBRESSL_VERSION_NUMBER) ++#if ((defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L) && \ ++ !defined(LIBRESSL_VERSION_NUMBER)) || \ ++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x20900000L) #include <openssl/asn1t.h> #else #include <openssl/asn1_mac.h> Modified: head/security/krb5-devel/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.c ============================================================================== --- head/security/krb5-devel/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.c Tue Mar 12 04:14:54 2019 (r495422) +++ head/security/krb5-devel/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.c Tue Mar 12 04:18:32 2019 (r495423) @@ -1,20 +1,23 @@ ---- plugins/preauth/pkinit/pkinit_crypto_openssl.c.orig 2016-12-01 22:31:25 UTC +--- plugins/preauth/pkinit/pkinit_crypto_openssl.c.orig 2018-11-01 23:51:07 UTC +++ plugins/preauth/pkinit/pkinit_crypto_openssl.c -@@ -191,7 +191,7 @@ pkinit_pkcs11_code_to_text(int err); +@@ -188,7 +188,8 @@ pkinit_pkcs11_code_to_text(int err); (*_x509_pp) = PKCS7_cert_from_signer_info(_p7,_si) #endif -#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if (defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x10100000L) || \ ++ defined(LIBRESSL_VERSION_NUMBER) /* 1.1 standardizes constructor and destructor names, renaming * EVP_MD_CTX_{create,destroy} and deprecating ASN1_STRING_data. */ -@@ -3059,7 +3059,7 @@ cleanup: +@@ -3040,7 +3041,9 @@ cleanup: return retval; } -#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) ++#if ((defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L) && \ ++ !defined(LIBRESSL_VERSION_NUMBER)) || \ ++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x20900000L) /* * We need to decode DomainParameters from RFC 3279 section 2.3.3. We would Modified: head/security/krb5-devel/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.h ============================================================================== --- head/security/krb5-devel/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.h Tue Mar 12 04:14:54 2019 (r495422) +++ head/security/krb5-devel/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.h Tue Mar 12 04:18:32 2019 (r495423) @@ -1,11 +1,13 @@ ---- plugins/preauth/pkinit/pkinit_crypto_openssl.h.orig 2016-12-01 22:31:25 UTC +--- plugins/preauth/pkinit/pkinit_crypto_openssl.h.orig 2018-11-01 23:51:07 UTC +++ plugins/preauth/pkinit/pkinit_crypto_openssl.h -@@ -46,7 +46,7 @@ +@@ -46,7 +46,9 @@ #include <openssl/asn1.h> #include <openssl/pem.h> -#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L ++#if ((defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L) && \ ++ !defined(LIBRESSL_VERSION_NUMBER)) || \ ++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x20900000L) #include <openssl/asn1t.h> #else #include <openssl/asn1_mac.h>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201903120418.x2C4IWsk053622>