From owner-svn-ports-all@freebsd.org Sun Mar 3 21:38:29 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 96C1C151D22B; Sun, 3 Mar 2019 21:38:29 +0000 (UTC) (envelope-from hrs@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 36EB46E905; Sun, 3 Mar 2019 21:38:29 +0000 (UTC) (envelope-from hrs@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 1EB30226BA; Sun, 3 Mar 2019 21:38:29 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x23LcSeZ091552; Sun, 3 Mar 2019 21:38:28 GMT (envelope-from hrs@FreeBSD.org) Received: (from hrs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x23LcSlf091551; Sun, 3 Mar 2019 21:38:28 GMT (envelope-from hrs@FreeBSD.org) Message-Id: <201903032138.x23LcSlf091551@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hrs set sender to hrs@FreeBSD.org using -f From: Hiroki Sato Date: Sun, 3 Mar 2019 21:38:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r494516 - head/security/tpm-tools/files X-SVN-Group: ports-head X-SVN-Commit-Author: hrs X-SVN-Commit-Paths: head/security/tpm-tools/files X-SVN-Commit-Revision: 494516 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 36EB46E905 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.95)[-0.951,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-0.999,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Mar 2019 21:38:29 -0000 Author: hrs Date: Sun Mar 3 21:38:28 2019 New Revision: 494516 URL: https://svnweb.freebsd.org/changeset/ports/494516 Log: Fix build on 11.x. Modified: head/security/tpm-tools/files/patch-src-data_mgmt-data_import.c Modified: head/security/tpm-tools/files/patch-src-data_mgmt-data_import.c ============================================================================== --- head/security/tpm-tools/files/patch-src-data_mgmt-data_import.c Sun Mar 3 21:34:11 2019 (r494515) +++ head/security/tpm-tools/files/patch-src-data_mgmt-data_import.c Sun Mar 3 21:38:28 2019 (r494516) @@ -1,6 +1,23 @@ --- src/data_mgmt/data_import.c.orig 2017-02-21 02:12:00 UTC +++ src/data_mgmt/data_import.c -@@ -372,7 +372,7 @@ readX509Cert( const char *a_pszFile, +@@ -39,6 +39,16 @@ + #include + #include + ++#if OPENSSL_VERSION_NUMBER < 0x1010000fL ++#define RSA_get0_n(x) ((x)->n) ++#define RSA_get0_e(x) ((x)->e) ++#define RSA_get0_d(x) ((x)->d) ++#define RSA_get0_p(x) ((x)->p) ++#define RSA_get0_q(x) ((x)->q) ++#define RSA_get0_dmp1(x) ((x)->dmp1) ++#define RSA_get0_dmq1(x) ((x)->dmq1) ++#define RSA_get0_iqmp(x) ((x)->iqmp) ++#endif + + /* + * Global variables +@@ -372,7 +382,7 @@ readX509Cert( const char *a_pszFile, goto out; } @@ -9,7 +26,7 @@ logError( TOKEN_RSA_KEY_ERROR ); X509_free( pX509 ); -@@ -691,8 +691,8 @@ createRsaPubKeyObject( RSA *a_pRsa, +@@ -691,8 +701,8 @@ createRsaPubKeyObject( RSA *a_pRsa, int rc = -1; @@ -20,7 +37,7 @@ CK_RV rv; -@@ -732,8 +732,8 @@ createRsaPubKeyObject( RSA *a_pRsa, +@@ -732,8 +742,8 @@ createRsaPubKeyObject( RSA *a_pRsa, } // Get binary representations of the RSA key information @@ -31,7 +48,7 @@ // Create the RSA public key object rv = createObject( a_hSession, tAttr, ulAttrCount, a_hObject ); -@@ -760,14 +760,14 @@ createRsaPrivKeyObject( RSA *a_pRsa, +@@ -760,14 +770,14 @@ createRsaPrivKeyObject( RSA *a_pRsa, int rc = -1; @@ -54,7 +71,7 @@ CK_RV rv; -@@ -821,14 +821,14 @@ createRsaPrivKeyObject( RSA *a_pRsa, +@@ -821,14 +831,14 @@ createRsaPrivKeyObject( RSA *a_pRsa, } // Get binary representations of the RSA key information