From owner-svn-src-projects@freebsd.org Sun May 3 02:23:41 2020 Return-Path: Delivered-To: svn-src-projects@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1D8812CF567 for ; Sun, 3 May 2020 02:23:41 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49F8tN73R3z43h6; Sun, 3 May 2020 02:23:40 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D4B543CA2; Sun, 3 May 2020 02:23:40 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0432NeGd079149; Sun, 3 May 2020 02:23:40 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0432NeCO079148; Sun, 3 May 2020 02:23:40 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <202005030223.0432NeCO079148@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Sun, 3 May 2020 02:23:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r360589 - projects/nfs-over-tls X-SVN-Group: projects X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: projects/nfs-over-tls X-SVN-Commit-Revision: 360589 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 May 2020 02:23:41 -0000 Author: rmacklem Date: Sun May 3 02:23:40 2020 New Revision: 360589 URL: https://svnweb.freebsd.org/changeset/base/360589 Log: Add the patch file for /usr/ktls/include/openssl. Added: projects/nfs-over-tls/openssl3.patch Added: projects/nfs-over-tls/openssl3.patch ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/nfs-over-tls/openssl3.patch Sun May 3 02:23:40 2020 (r360589) @@ -0,0 +1,95 @@ +--- conf.h.sav 2020-05-02 08:36:38.880690000 -0700 ++++ conf.h 2020-05-02 08:37:15.173793000 -0700 +@@ -34,6 +34,7 @@ typedef struct { + } CONF_VALUE; + + DEFINE_OR_DECLARE_STACK_OF(CONF_VALUE) ++typedef struct conf_module_st CONF_MODULE; + DEFINE_OR_DECLARE_STACK_OF(CONF_MODULE) + + DEFINE_LHASH_OF(CONF_VALUE); +@@ -58,7 +59,6 @@ struct conf_method_st { + /* Module definitions */ + + typedef struct conf_imodule_st CONF_IMODULE; +-typedef struct conf_module_st CONF_MODULE; + + STACK_OF(CONF_IMODULE); + +--- ssl.h.sav 2020-05-02 08:36:44.543950000 -0700 ++++ ssl.h 2020-05-02 08:37:15.179047000 -0700 +@@ -230,16 +230,15 @@ typedef struct tls_sigalgs_st TLS_SIGALGS; + typedef struct ssl_conf_ctx_st SSL_CONF_CTX; + typedef struct ssl_comp_st SSL_COMP; + +-DEFINE_OR_DECLARE_STACK_OF(SSL_CIPHER) +-DEFINE_OR_DECLARE_STACK_OF(SSL_COMP) +-DEFINE_OR_DECLARE_STACK_OF(SRTP_PROTECTION_PROFILE) +-DEFINE_OR_DECLARE_STACK_OF(SSL_COMP) +- + /* SRTP protection profiles for use with the use_srtp extension (RFC 5764)*/ + typedef struct srtp_protection_profile_st { + const char *name; + unsigned long id; + } SRTP_PROTECTION_PROFILE; ++ ++DEFINE_OR_DECLARE_STACK_OF(SSL_CIPHER) ++DEFINE_OR_DECLARE_STACK_OF(SSL_COMP) ++DEFINE_OR_DECLARE_STACK_OF(SRTP_PROTECTION_PROFILE) + + + typedef int (*tls_session_ticket_ext_cb_fn)(SSL *s, const unsigned char *data, +--- x509v3.h.sav 2020-05-02 08:36:55.891210000 -0700 ++++ x509v3.h 2020-05-02 08:37:15.179843000 -0700 +@@ -25,25 +25,6 @@ + extern "C" { + #endif + +-DEFINE_OR_DECLARE_STACK_OF(GENERAL_NAME) +-DEFINE_OR_DECLARE_STACK_OF(X509V3_EXT_METHOD) +-DEFINE_OR_DECLARE_STACK_OF(GENERAL_NAMES) +-DEFINE_OR_DECLARE_STACK_OF(ACCESS_DESCRIPTION) +-DEFINE_OR_DECLARE_STACK_OF(DIST_POINT) +-DEFINE_OR_DECLARE_STACK_OF(SXNETID) +-DEFINE_OR_DECLARE_STACK_OF(POLICYQUALINFO) +-DEFINE_OR_DECLARE_STACK_OF(POLICYINFO) +-DEFINE_OR_DECLARE_STACK_OF(POLICY_MAPPING) +-DEFINE_OR_DECLARE_STACK_OF(GENERAL_SUBTREE) +-DEFINE_OR_DECLARE_STACK_OF(X509_PURPOSE) +-DEFINE_OR_DECLARE_STACK_OF(X509_POLICY_NODE) +-DEFINE_OR_DECLARE_STACK_OF(ASIdOrRange) +-DEFINE_OR_DECLARE_STACK_OF(IPAddressOrRange) +-DEFINE_OR_DECLARE_STACK_OF(IPAddressFamily) +-DEFINE_OR_DECLARE_STACK_OF(ASN1_STRING) +-DEFINE_OR_DECLARE_STACK_OF(ADMISSIONS) +-DEFINE_OR_DECLARE_STACK_OF(PROFESSION_INFO) +- + /* Forward reference */ + struct v3_ext_method; + struct v3_ext_ctx; +@@ -892,6 +873,25 @@ DECLARE_ASN1_FUNCTIONS(PROFESSION_INFO) + DECLARE_ASN1_FUNCTIONS(ADMISSIONS) + DECLARE_ASN1_FUNCTIONS(ADMISSION_SYNTAX) + typedef STACK_OF(PROFESSION_INFO) PROFESSION_INFOS; ++ ++DEFINE_OR_DECLARE_STACK_OF(GENERAL_NAME) ++DEFINE_OR_DECLARE_STACK_OF(X509V3_EXT_METHOD) ++DEFINE_OR_DECLARE_STACK_OF(GENERAL_NAMES) ++DEFINE_OR_DECLARE_STACK_OF(ACCESS_DESCRIPTION) ++DEFINE_OR_DECLARE_STACK_OF(DIST_POINT) ++DEFINE_OR_DECLARE_STACK_OF(SXNETID) ++DEFINE_OR_DECLARE_STACK_OF(POLICYQUALINFO) ++DEFINE_OR_DECLARE_STACK_OF(POLICYINFO) ++DEFINE_OR_DECLARE_STACK_OF(POLICY_MAPPING) ++DEFINE_OR_DECLARE_STACK_OF(GENERAL_SUBTREE) ++DEFINE_OR_DECLARE_STACK_OF(X509_PURPOSE) ++DEFINE_OR_DECLARE_STACK_OF(X509_POLICY_NODE) ++DEFINE_OR_DECLARE_STACK_OF(ASIdOrRange) ++DEFINE_OR_DECLARE_STACK_OF(IPAddressOrRange) ++DEFINE_OR_DECLARE_STACK_OF(IPAddressFamily) ++DEFINE_OR_DECLARE_STACK_OF(ASN1_STRING) ++DEFINE_OR_DECLARE_STACK_OF(ADMISSIONS) ++DEFINE_OR_DECLARE_STACK_OF(PROFESSION_INFO) + + const ASN1_OBJECT *NAMING_AUTHORITY_get0_authorityId( + const NAMING_AUTHORITY *n);