Date: Sun, 12 Feb 2017 21:51:34 +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: r433967 - head/security/krb5-115/files Message-ID: <201702122151.v1CLpYUA077143@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cy Date: Sun Feb 12 21:51:34 2017 New Revision: 433967 URL: https://svnweb.freebsd.org/changeset/ports/433967 Log: Add missing patch files. Reported by: sunpoet Pointy hat to: cy (me) Added: 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) Added: head/security/krb5-115/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/krb5-115/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.c Sun Feb 12 21:51:34 2017 (r433967) @@ -0,0 +1,20 @@ +--- plugins/preauth/pkinit/pkinit_crypto_openssl.c.orig 2016-12-01 22:31:25 UTC ++++ plugins/preauth/pkinit/pkinit_crypto_openssl.c +@@ -191,7 +191,7 @@ 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) + + /* 1.1 standardizes constructor and destructor names, renaming + * EVP_MD_CTX_{create,destroy} and deprecating ASN1_STRING_data. */ +@@ -3059,7 +3059,7 @@ cleanup: + return retval; + } + +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) + + /* + * We need to decode DomainParameters from RFC 3279 section 2.3.3. We would Added: head/security/krb5-115/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/krb5-115/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.h Sun Feb 12 21:51:34 2017 (r433967) @@ -0,0 +1,11 @@ +--- plugins/preauth/pkinit/pkinit_crypto_openssl.h.orig 2016-12-01 22:31:25 UTC ++++ plugins/preauth/pkinit/pkinit_crypto_openssl.h +@@ -46,7 +46,7 @@ + #include <openssl/asn1.h> + #include <openssl/pem.h> + +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(OPENSSL_VERSION_NUMBER) + #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?201702122151.v1CLpYUA077143>