Attachment #199316 for bug #233295

View | Details | Raw Unified | Return to bug 233295
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	tpm-tools
PORTVERSION=	1.3.9.1
CATEGORIES=	security
MASTER_SITES=	SF/trousers/${PORTNAME}/${PORTVERSION}


RUN_DEPENDS=	${LOCALBASE}/sbin/tcsd:security/trousers \
		${LOCALBASE}/lib/pkcs11/libopencryptoki.so:security/opencryptoki

USES=		gettext gmake iconv libtool perl5
USE_LDCONFIG=	YES
GNU_CONFIGURE=	YES
LIBS+=		-L${LOCALBASE}/lib -lintl
INSTALL_TARGET=	install-strip
WRKSRC=		${WRKDIR}

post-patch:
	@${REINPLACE_CMD} '/^libtpm_unseal_la_LIBADD =/s/$$/ -lcrypto/' \

Lines 1-3 Link Here

(-)security/tpm-tools/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1463578786	1	TIMESTAMP = 1542528622
2	SHA256 (tpm-tools-1.3.8.tar.gz) = 66eb4ff095542403db6b4bd4b574e8a5c08084fe4e9e5aa9a829ee84e20bea83	2	SHA256 (tpm-tools-1.3.9.1.tar.gz) = 9cb714e2650826e2e932f65bc0ba9d61b927dc5fea47f2c2a2b64f0fdfcbfa68
3	SIZE (tpm-tools-1.3.8.tar.gz) = 473339	3	SIZE (tpm-tools-1.3.9.1.tar.gz) = 482859

Lines 1-11 Link Here

(-)security/tpm-tools/files/patch-lib-Makefile.am (-5 / +5 lines)
1	--- lib/Makefile.am.orig 2012-05-17 17:50:39 UTC	1	--- lib/Makefile.am.orig 2017-02-21 05:23:56.000000000 +0300
2	+++ lib/Makefile.am	2	+++ lib/Makefile.am 2018-11-18 11:25:29.095120000 +0300
3	@@ -44,7 +44,7 @@ libtpm_utils_la_SOURCES = tpm_utils.c \	3	@@ -44,7 +44,7 @@
4	#	4	#
5	# TSPI interface library	5	# TSPI interface library
6	libtpm_tspi_la_SOURCES = tpm_tspi.c	6	libtpm_tspi_la_SOURCES = tpm_tspi.c
7	-libtpm_tspi_la_LIBADD = libtpm_utils.la -ldl	7	-libtpm_tspi_la_LIBADD = libtpm_utils.la -ldl @INTLLIBS@
8	+libtpm_tspi_la_LIBADD = libtpm_utils.la	8	+libtpm_tspi_la_LIBADD = libtpm_utils.la @INTLLIBS@
9		9
10	#	10	#
11	# PKCS#11 interface library	11	# PKCS#11 interface library




--- lib/Makefile.in.orig	2017-02-21 05:31:45.000000000 +0300
+++ lib/Makefile.in	2018-11-18 11:31:34.387191000 +0300
@@ -295,7 +295,7 @@
 #
 # TSPI interface library
 libtpm_tspi_la_SOURCES = tpm_tspi.c
-libtpm_tspi_la_LIBADD = libtpm_utils.la -ldl @INTLLIBS@
+libtpm_tspi_la_LIBADD = libtpm_utils.la @INTLLIBS@
 @P11_SUPPORT_TRUE@libtpm_pkcs11_la_SOURCES = tpm_pkcs11.c
 @P11_SUPPORT_TRUE@libtpm_pkcs11_la_LIBADD = libtpm_utils.la @INTLLIBS@
 
@@ -327,7 +327,7 @@ libtpm_tspi_la_LIBADD = libtpm_utils.la 
 # Unseal library - for addition to existing apps, counter part of seal cmd
 libtpm_unseal_la_SOURCES = tpm_unseal.c
 libtpm_unseal_la_LDFLAGS = -shared -version-info 1:0:0
-libtpm_unseal_la_LIBADD = -ltspi  libtpm_tspi.la
+libtpm_unseal_la_LIBADD = -ltspi  libtpm_tspi.la -lcrypto
 all: all-am
 
 .SUFFIXES:




--- lib/tpm_utils.c.orig	2010-09-30 17:28:09 UTC
+++ lib/tpm_utils.c
@@ -55,6 +55,7 @@ genericOptHandler( int a_iNumArgs, char 
 	CmdHelpFunction  tCmdHelp = ( a_tCmdHelpFunction ) ? a_tCmdHelpFunction
 							   : logCmdHelp;
 
+#ifdef __GCC
 	char  szShortOpts[strlen( pszGenShortOpts )
 			  + ( ( a_pszShortOpts == NULL ) ? 0 : strlen( a_pszShortOpts ) )
 			  + 1];
@@ -64,12 +65,36 @@ genericOptHandler( int a_iNumArgs, char 
 
 	int  iOpt;
 	int  rc;
+#else
+	int  iOpt;
+	int  rc;
+
+	char *szShortOpts;
+	int  iNumShortOpts, iNumGenLongOpts;
+	struct option *sLongOpts;
+
+	iNumShortOpts = strlen( pszGenShortOpts ) +
+		( ( a_pszShortOpts == NULL ) ? 0 : strlen( a_pszShortOpts ) );
+	iNumGenLongOpts = sizeof( sGenLongOpts ) / sizeof( struct option );
+
+	szShortOpts = malloc(iNumShortOpts + 1);
+	sLongOpts = malloc((iNumGenLongOpts + a_iNumOpts + 1) 
+                           * sizeof(struct option));
+	if( (szShortOpts == NULL) || (sLongOpts == NULL) ) {
+		perror("malloc");
+		return -1;
+	}
+#endif
 
 	strcpy( szShortOpts, pszGenShortOpts);
 	if ( a_pszShortOpts )
 		strcat( szShortOpts, a_pszShortOpts );
 
+#ifdef __GCC
 	memset( sLongOpts, 0, sizeof( sLongOpts ) );
+#else
+	memset( sLongOpts, 0, (iNumGenLongOpts + a_iNumOpts + 1) * sizeof(struct option));
+#endif
 	memcpy( sLongOpts, sGenLongOpts, sizeof( sGenLongOpts ) );
 	if ( a_sLongOpts ) {
 		memcpy( sLongOpts + iNumGenLongOpts,

Lines 1-11 Link Here

(-)security/tpm-tools/files/patch-src-cmds-Makefile.am (-11 lines)
1	--- src/cmds/Makefile.am.orig 2011-08-15 17:52:08 UTC
2	+++ src/cmds/Makefile.am
3	@@ -30,7 +30,7 @@ else
4	AM_CPPFLAGS = -I$(top_srcdir)/include -D_LINUX
5	endif
6
7	-LDADD = $(top_builddir)/lib/libtpm_tspi.la -ltspi $(top_builddir)/lib/libtpm_unseal.la -ltpm_unseal -lcrypto
8	+LDADD = $(top_builddir)/lib/libtpm_tspi.la -ltspi $(top_builddir)/lib/libtpm_unseal.la -lcrypto
9
10	tpm_sealdata_SOURCES = tpm_sealdata.c
11	tpm_unsealdata_SOURCES = tpm_unsealdata.c

Lines 1-11 Link Here

(-)security/tpm-tools/files/patch-src-cmds-Makefile.in (-11 lines)
1	--- src/cmds/Makefile.in.orig 2012-05-17 19:09:27 UTC
2	+++ src/cmds/Makefile.in
3	@@ -245,7 +245,7 @@ top_builddir = @top_builddir@
4	top_srcdir = @top_srcdir@
5	@TSS_LIB_IS_12_FALSE@AM_CPPFLAGS = -I$(top_srcdir)/include -D_LINUX
6	@TSS_LIB_IS_12_TRUE@AM_CPPFLAGS = -I$(top_srcdir)/include -D_LINUX -DTSS_LIB_IS_12
7	-LDADD = $(top_builddir)/lib/libtpm_tspi.la -ltspi $(top_builddir)/lib/libtpm_unseal.la -ltpm_unseal -lcrypto
8	+LDADD = $(top_builddir)/lib/libtpm_tspi.la -ltspi $(top_builddir)/lib/libtpm_unseal.la -lcrypto
9	tpm_sealdata_SOURCES = tpm_sealdata.c
10	tpm_unsealdata_SOURCES = tpm_unsealdata.c
11	all: all-am

Lines 1-11 Link Here

(-)security/tpm-tools/files/patch-src-data_mgmt-Makefile.am (-5 / +5 lines)
1	--- src/data_mgmt/Makefile.am.orig 2012-05-17 17:50:29 UTC	1	--- src/data_mgmt/Makefile.am.orig 2017-02-21 04:23:57.000000000 +0300
2	+++ src/data_mgmt/Makefile.am	2	+++ src/data_mgmt/Makefile.am 2018-11-18 13:07:05.984702000 +0300
3	@@ -38,7 +38,7 @@ noinst_HEADERS = data_common.h \	3	@@ -38,7 +38,7 @@
4	# Common build flags	4	# Common build flags
5	AM_CPPFLAGS = -I$(top_srcdir)/include -D_LINUX	5	AM_CPPFLAGS = -I$(top_srcdir)/include -D_LINUX
6		6
7	-LDADD = $(top_builddir)/lib/libtpm_pkcs11.la -ltspi -ldl	7	-LDADD = $(top_builddir)/lib/libtpm_pkcs11.la -ltspi -ldl @INTLLIBS@
8	+LDADD = $(top_builddir)/lib/libtpm_pkcs11.la -ltspi	8	+LDADD = $(top_builddir)/lib/libtpm_pkcs11.la -ltspi @INTLLIBS@
9		9
10		10
11	#	11	#

Lines 1-11 Link Here

(-)security/tpm-tools/files/patch-src-data_mgmt-Makefile.in (-5 / +5 lines)
1	--- src/data_mgmt/Makefile.in.orig 2012-05-17 19:09:27 UTC	1	--- src/data_mgmt/Makefile.in.orig 2017-02-21 05:31:46.000000000 +0300
2	+++ src/data_mgmt/Makefile.in	2	+++ src/data_mgmt/Makefile.in 2018-11-18 13:08:15.900591000 +0300
3	@@ -274,7 +274,7 @@ noinst_HEADERS = data_common.h \	3	@@ -271,7 +271,7 @@
4	#	4	#
5	# Common build flags	5	# Common build flags
6	AM_CPPFLAGS = -I$(top_srcdir)/include -D_LINUX	6	AM_CPPFLAGS = -I$(top_srcdir)/include -D_LINUX
7	-LDADD = $(top_builddir)/lib/libtpm_pkcs11.la -ltspi -ldl	7	-LDADD = $(top_builddir)/lib/libtpm_pkcs11.la -ltspi -ldl @INTLLIBS@
8	+LDADD = $(top_builddir)/lib/libtpm_pkcs11.la -ltspi	8	+LDADD = $(top_builddir)/lib/libtpm_pkcs11.la -ltspi @INTLLIBS@
9		9
10	#	10	#
11	# TPM Token initialization command	11	# TPM Token initialization command




--- src/data_mgmt/data_import.c.orig	2017-02-21 05:12:00.000000000 +0300
+++ src/data_mgmt/data_import.c	2018-11-18 17:45:45.425118000 +0300
@@ -372,7 +372,7 @@
 		goto out;
 	}
 
-	if ( EVP_PKEY_type( pKey->type ) != EVP_PKEY_RSA ) {
+	if ( EVP_PKEY_base_id( pKey ) != EVP_PKEY_RSA ) {
 		logError( TOKEN_RSA_KEY_ERROR );
 
 		X509_free( pX509 );
@@ -691,8 +691,16 @@
 
 	int  rc = -1;
 
-	int  nLen = BN_num_bytes( a_pRsa->n );
-	int  eLen = BN_num_bytes( a_pRsa->e );
+	const BIGNUM *rsa_n, *rsa_e;
+	
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+	rsa_n = a_pRsa->n;
+	rsa_e = a_pRsa->e;
+#else
+	RSA_get0_key(a_pRsa, &rsa_n, &rsa_e, NULL);
+#endif
+	int  nLen = BN_num_bytes( rsa_n );
+	int  eLen = BN_num_bytes( rsa_e );
 
 	CK_RV  rv;
 
@@ -732,8 +740,8 @@
 	}
 
 	// Get binary representations of the RSA key information
-	BN_bn2bin( a_pRsa->n, n );
-	BN_bn2bin( a_pRsa->e, e );
+	BN_bn2bin( rsa_n, n );
+	BN_bn2bin( rsa_e, e );
 
 	// Create the RSA public key object
 	rv = createObject( a_hSession, tAttr, ulAttrCount, a_hObject );
@@ -760,15 +768,33 @@
 
 	int  rc = -1;
 
-	int  nLen = BN_num_bytes( a_pRsa->n );
-	int  eLen = BN_num_bytes( a_pRsa->e );
-	int  dLen = BN_num_bytes( a_pRsa->d );
-	int  pLen = BN_num_bytes( a_pRsa->p );
-	int  qLen = BN_num_bytes( a_pRsa->q );
-	int  dmp1Len = BN_num_bytes( a_pRsa->dmp1 );
-	int  dmq1Len = BN_num_bytes( a_pRsa->dmq1 );
-	int  iqmpLen = BN_num_bytes( a_pRsa->iqmp );
+	const BIGNUM *rsa_n, *rsa_e, *rsa_d;
+	const BIGNUM *rsa_p, *rsa_q;
+	const BIGNUM *rsa_dmp1, *rsa_dmq1, *rsa_iqmp;
 
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+	rsa_n = a_pRsa->n;
+	rsa_e = a_pRsa->e;
+	rsa_d = a_pRsa->d;
+	rsa_p = a_pRsa->p;
+	rsa_q = a_pRsa->q;
+	rsa_dmp1 = a_pRsa->dmp1;
+	rsa_dmq1 = a_pRsa->dmq1;
+	rsa_iqmp = a_pRsa->iqmp;
+#else
+	RSA_get0_key(a_pRsa, &rsa_n, &rsa_e, &rsa_d);
+	RSA_get0_factors(a_pRsa, &rsa_p, &rsa_q);
+	RSA_get0_crt_params(a_pRsa, &rsa_dmp1, &rsa_dmq1, &rsa_iqmp);
+#endif
+	int  nLen = BN_num_bytes( rsa_n );
+	int  eLen = BN_num_bytes( rsa_e );
+	int  dLen = BN_num_bytes( rsa_d );
+	int  pLen = BN_num_bytes( rsa_p );
+	int  qLen = BN_num_bytes( rsa_q );
+	int  dmp1Len = BN_num_bytes( rsa_dmp1 );
+	int  dmq1Len = BN_num_bytes( rsa_dmq1 );
+	int  iqmpLen = BN_num_bytes( rsa_iqmp );
+
 	CK_RV  rv;
 
 	CK_BBOOL  bTrue  = TRUE;
@@ -821,14 +847,14 @@
 	}
 
 	// Get binary representations of the RSA key information
-	BN_bn2bin( a_pRsa->n, n );
-	BN_bn2bin( a_pRsa->e, e );
-	BN_bn2bin( a_pRsa->d, d );
-	BN_bn2bin( a_pRsa->p, p );
-	BN_bn2bin( a_pRsa->q, q );
-	BN_bn2bin( a_pRsa->dmp1, dmp1 );
-	BN_bn2bin( a_pRsa->dmq1, dmq1 );
-	BN_bn2bin( a_pRsa->iqmp, iqmp );
+	BN_bn2bin( rsa_n, n );
+	BN_bn2bin( rsa_e, e );
+	BN_bn2bin( rsa_d, d );
+	BN_bn2bin( rsa_p, p );
+	BN_bn2bin( rsa_q, q );
+	BN_bn2bin( rsa_dmp1, dmp1 );
+	BN_bn2bin( rsa_dmq1, dmq1 );
+	BN_bn2bin( rsa_iqmp, iqmp );
 
 	// Create the RSA private key object
 	rv = createObject( a_hSession, tAttr, ulAttrCount, a_hObject );

Lines 1-6 Link Here

(-)security/tpm-tools/files/patch-src-data_mgmt-data_protect.c (-3 / +3 lines)
1	--- src/data_mgmt/data_protect.c.orig 2012-05-17 17:49:58 UTC	1	--- src/data_mgmt/data_protect.c.orig 2017-02-21 04:23:57.000000000 +0300
2	+++ src/data_mgmt/data_protect.c	2	+++ src/data_mgmt/data_protect.c 2018-11-18 13:21:03.884259000 +0300
3	@@ -437,6 +437,7 @@ main( int a_iArgc,	3	@@ -437,6 +437,7 @@
4	CK_OBJECT_HANDLE hObject;	4	CK_OBJECT_HANDLE hObject;
5	CK_MECHANISM tMechanism = { CKM_AES_ECB, NULL, 0 };	5	CK_MECHANISM tMechanism = { CKM_AES_ECB, NULL, 0 };
6		6




--- src/tpm_mgmt/tpm_nvcommon.c.orig	2011-08-17 12:20:35 UTC
+++ src/tpm_mgmt/tpm_nvcommon.c
@@ -140,8 +140,8 @@ int parseStringWithValues(const char *aA
 						 aArg);
 					return -1;
 				}
-				if (!aArg[offset+numbytes] == '|' &&
-				    !aArg[offset+numbytes] == 0) {
+				if (aArg[offset+numbytes] != '|' &&
+				    aArg[offset+numbytes] != 0) {
 					logError(_("Illegal character following "
                                                    "hexadecimal number in %s\n"),
 						 aArg + offset);
@@ -164,8 +164,8 @@ int parseStringWithValues(const char *aA
 				return -1;
 			}
 
-			if (!aArg[offset+numbytes] == '|' &&
-			    !aArg[offset+numbytes] == 0) {
+			if (aArg[offset+numbytes] != '|' &&
+			    aArg[offset+numbytes] != 0) {
 				logError(_("Illegal character following decimal "
 				           "number in %s\n"),
 					 aArg + offset);

Lines 1-10 Link Here

(-)security/tpm-tools/files/patch-src-tpm_mgmt-tpm_nvread.c (-10 lines)
1	--- src/tpm_mgmt/tpm_nvread.c.orig 2011-08-17 12:20:35 UTC
2	+++ src/tpm_mgmt/tpm_nvread.c
3	@@ -19,6 +19,7 @@
4	* http://www.opensource.org/licenses/cpl1.0.php.
5	*/
6
7	+#include <sys/stat.h>
8	#include <limits.h>
9	#include <ctype.h>
10	#include <fcntl.h>




--- src/tpm_mgmt/tpm_nvwrite.c.orig	2011-08-17 12:20:35 UTC
+++ src/tpm_mgmt/tpm_nvwrite.c
@@ -33,6 +33,7 @@ static BOOL nvindex_set;
 static unsigned int nvindex;
 static unsigned int offset;
 static unsigned int length;
+static int lengthp;
 static int fillvalue = -1;
 static const char *filename;
 static BOOL passWellKnown;
@@ -60,6 +61,7 @@ static int parse(const int aOpt, const c
 		if (parseHexOrDecimal(aArg, &length, 0, UINT_MAX,
 				      "length of data") != 0)
 			return -1;
+		lengthp = 1;
 		break;
 
 	case 'n':
@@ -220,7 +222,7 @@ int main(int argc, char **argv)
 		close(fd);
 		fd = -1;
 	} else if (fillvalue >= 0) {
-		if (length < 0) {
+		if (lengthp == 0) {
 			logError(_("Requiring size parameter.\n"));
 			return -1;
 		}

Lines 1-6 Link Here

(-)security/tpm-tools/files/patch-src-tpm_mgmt-tpm_present.c (-3 / +3 lines)
1	--- src/tpm_mgmt/tpm_present.c.orig 2012-05-17 17:49:58 UTC	1	--- src/tpm_mgmt/tpm_present.c.orig 2017-02-21 04:23:57.000000000 +0300
2	+++ src/tpm_mgmt/tpm_present.c	2	+++ src/tpm_mgmt/tpm_present.c 2018-11-18 13:21:03.884938000 +0300
3	@@ -168,9 +168,10 @@ static BOOL confirmLifeLock(TSS_HCONTEXT	3	@@ -168,9 +168,10 @@
4	TSS_HPOLICY hTpmPolicy;	4	TSS_HPOLICY hTpmPolicy;
5	char *pwd = NULL;	5	char *pwd = NULL;
6	int pswd_len;	6	int pswd_len;

Lines 1-6 Link Here

(-)security/tpm-tools/files/patch-src-tpm_mgmt-tpm_takeownership.c (-3 / +3 lines)
1	--- src/tpm_mgmt/tpm_takeownership.c.orig 2010-09-30 17:28:09 UTC	1	--- src/tpm_mgmt/tpm_takeownership.c.orig 2017-02-21 04:23:57.000000000 +0300
2	+++ src/tpm_mgmt/tpm_takeownership.c	2	+++ src/tpm_mgmt/tpm_takeownership.c 2018-11-18 13:21:03.885587000 +0300
3	@@ -77,6 +77,7 @@ int main(int argc, char **argv)	3	@@ -77,6 +77,7 @@
4	{"srk-well-known", no_argument, NULL, 'z'},	4	{"srk-well-known", no_argument, NULL, 'z'},
5	};	5	};
6		6

Return to bug 233295

Lines 2-8 Link Here

(-)security/tpm-tools/Makefile (-2 / +3 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= tpm-tools	4	PORTNAME= tpm-tools
5	PORTVERSION= 1.3.8	5	PORTVERSION= 1.3.9.1
6	CATEGORIES= security	6	CATEGORIES= security
7	MASTER_SITES= SF/trousers/${PORTNAME}/${PORTVERSION}	7	MASTER_SITES= SF/trousers/${PORTNAME}/${PORTVERSION}
8		8
Lines 19-29 Link Here
19	RUN_DEPENDS= ${LOCALBASE}/sbin/tcsd:security/trousers \	19	RUN_DEPENDS= ${LOCALBASE}/sbin/tcsd:security/trousers \
20	${LOCALBASE}/lib/pkcs11/libopencryptoki.so:security/opencryptoki	20	${LOCALBASE}/lib/pkcs11/libopencryptoki.so:security/opencryptoki
21		21
22	USES= gettext gmake iconv libtool	22	USES= gettext gmake iconv libtool perl5
23	USE_LDCONFIG= YES	23	USE_LDCONFIG= YES
24	GNU_CONFIGURE= YES	24	GNU_CONFIGURE= YES
25	LIBS+= -L${LOCALBASE}/lib -lintl	25	LIBS+= -L${LOCALBASE}/lib -lintl
26	INSTALL_TARGET= install-strip	26	INSTALL_TARGET= install-strip
		27	WRKSRC= ${WRKDIR}
27		28
28	post-patch:	29	post-patch:
29	@${REINPLACE_CMD} '/^libtpm_unseal_la_LIBADD =/s/$$/ -lcrypto/' \	30	@${REINPLACE_CMD} '/^libtpm_unseal_la_LIBADD =/s/$$/ -lcrypto/' \

Lines 1-20 Link Here

(-)security/tpm-tools/files/patch-lib-Makefile.in (-15 / +6 lines)
1	--- lib/Makefile.in.orig 2012-05-17 19:09:27 UTC	1	--- lib/Makefile.in.orig 2017-02-21 05:31:45.000000000 +0300
2	+++ lib/Makefile.in	2	+++ lib/Makefile.in 2018-11-18 11:31:34.387191000 +0300
3	@@ -298,7 +298,7 @@ libtpm_utils_la_SOURCES = tpm_utils.c \	3	@@ -295,7 +295,7 @@
4	#	4	#
5	# TSPI interface library	5	# TSPI interface library
6	libtpm_tspi_la_SOURCES = tpm_tspi.c	6	libtpm_tspi_la_SOURCES = tpm_tspi.c
7	-libtpm_tspi_la_LIBADD = libtpm_utils.la -ldl	7	-libtpm_tspi_la_LIBADD = libtpm_utils.la -ldl @INTLLIBS@
8	+libtpm_tspi_la_LIBADD = libtpm_utils.la	8	+libtpm_tspi_la_LIBADD = libtpm_utils.la @INTLLIBS@
9	@P11_SUPPORT_TRUE@libtpm_pkcs11_la_SOURCES = tpm_pkcs11.c	9	@P11_SUPPORT_TRUE@libtpm_pkcs11_la_SOURCES = tpm_pkcs11.c
10	@P11_SUPPORT_TRUE@libtpm_pkcs11_la_LIBADD = libtpm_utils.la	10	@P11_SUPPORT_TRUE@libtpm_pkcs11_la_LIBADD = libtpm_utils.la @INTLLIBS@
11		11
12	@@ -327,7 +327,7 @@ libtpm_tspi_la_LIBADD = libtpm_utils.la
13	# Unseal library - for addition to existing apps, counter part of seal cmd
14	libtpm_unseal_la_SOURCES = tpm_unseal.c
15	libtpm_unseal_la_LDFLAGS = -shared -version-info 1:0:0
16	-libtpm_unseal_la_LIBADD = -ltspi libtpm_tspi.la
17	+libtpm_unseal_la_LIBADD = -ltspi libtpm_tspi.la -lcrypto
18	all: all-am
19
20	.SUFFIXES:

Lines 1-47 Link Here

(-)security/tpm-tools/files/patch-lib-tpm_utils.c (-47 lines)
1	--- lib/tpm_utils.c.orig 2010-09-30 17:28:09 UTC
2	+++ lib/tpm_utils.c
3	@@ -55,6 +55,7 @@ genericOptHandler( int a_iNumArgs, char
4	CmdHelpFunction tCmdHelp = ( a_tCmdHelpFunction ) ? a_tCmdHelpFunction
5	: logCmdHelp;
6
7	+#ifdef __GCC
8	char szShortOpts[strlen( pszGenShortOpts )
9	+ ( ( a_pszShortOpts == NULL ) ? 0 : strlen( a_pszShortOpts ) )
10	+ 1];
11	@@ -64,12 +65,36 @@ genericOptHandler( int a_iNumArgs, char
12
13	int iOpt;
14	int rc;
15	+#else
16	+ int iOpt;
17	+ int rc;
18	+
19	+ char *szShortOpts;
20	+ int iNumShortOpts, iNumGenLongOpts;
21	+ struct option *sLongOpts;
22	+
23	+ iNumShortOpts = strlen( pszGenShortOpts ) +
24	+ ( ( a_pszShortOpts == NULL ) ? 0 : strlen( a_pszShortOpts ) );
25	+ iNumGenLongOpts = sizeof( sGenLongOpts ) / sizeof( struct option );
26	+
27	+ szShortOpts = malloc(iNumShortOpts + 1);
28	+ sLongOpts = malloc((iNumGenLongOpts + a_iNumOpts + 1)
29	+ * sizeof(struct option));
30	+ if( (szShortOpts == NULL) \|\| (sLongOpts == NULL) ) {
31	+ perror("malloc");
32	+ return -1;
33	+ }
34	+#endif
35
36	strcpy( szShortOpts, pszGenShortOpts);
37	if ( a_pszShortOpts )
38	strcat( szShortOpts, a_pszShortOpts );
39
40	+#ifdef __GCC
41	memset( sLongOpts, 0, sizeof( sLongOpts ) );
42	+#else
43	+ memset( sLongOpts, 0, (iNumGenLongOpts + a_iNumOpts + 1) * sizeof(struct option));
44	+#endif
45	memcpy( sLongOpts, sGenLongOpts, sizeof( sGenLongOpts ) );
46	if ( a_sLongOpts ) {
47	memcpy( sLongOpts + iNumGenLongOpts,

Line 0 Link Here

(-)security/tpm-tools/files/patch-src-data_mgmt-data_import.c (+106 lines)
		1	--- src/data_mgmt/data_import.c.orig 2017-02-21 05:12:00.000000000 +0300
		2	+++ src/data_mgmt/data_import.c 2018-11-18 17:45:45.425118000 +0300
		3	@@ -372,7 +372,7 @@
		4	goto out;
		5	}
		6
		7	- if ( EVP_PKEY_type( pKey->type ) != EVP_PKEY_RSA ) {
		8	+ if ( EVP_PKEY_base_id( pKey ) != EVP_PKEY_RSA ) {
		9	logError( TOKEN_RSA_KEY_ERROR );
		10
		11	X509_free( pX509 );
		12	@@ -691,8 +691,16 @@
		13
		14	int rc = -1;
		15
		16	- int nLen = BN_num_bytes( a_pRsa->n );
		17	- int eLen = BN_num_bytes( a_pRsa->e );
		18	+ const BIGNUM rsa_n, rsa_e;
		19	+
		20	+#if OPENSSL_VERSION_NUMBER < 0x10100000L
		21	+ rsa_n = a_pRsa->n;
		22	+ rsa_e = a_pRsa->e;
		23	+#else
		24	+ RSA_get0_key(a_pRsa, &rsa_n, &rsa_e, NULL);
		25	+#endif
		26	+ int nLen = BN_num_bytes( rsa_n );
		27	+ int eLen = BN_num_bytes( rsa_e );
		28
		29	CK_RV rv;
		30
		31	@@ -732,8 +740,8 @@
		32	}
		33
		34	// Get binary representations of the RSA key information
		35	- BN_bn2bin( a_pRsa->n, n );
		36	- BN_bn2bin( a_pRsa->e, e );
		37	+ BN_bn2bin( rsa_n, n );
		38	+ BN_bn2bin( rsa_e, e );
		39
		40	// Create the RSA public key object
		41	rv = createObject( a_hSession, tAttr, ulAttrCount, a_hObject );
		42	@@ -760,15 +768,33 @@
		43
		44	int rc = -1;
		45
		46	- int nLen = BN_num_bytes( a_pRsa->n );
		47	- int eLen = BN_num_bytes( a_pRsa->e );
		48	- int dLen = BN_num_bytes( a_pRsa->d );
		49	- int pLen = BN_num_bytes( a_pRsa->p );
		50	- int qLen = BN_num_bytes( a_pRsa->q );
		51	- int dmp1Len = BN_num_bytes( a_pRsa->dmp1 );
		52	- int dmq1Len = BN_num_bytes( a_pRsa->dmq1 );
		53	- int iqmpLen = BN_num_bytes( a_pRsa->iqmp );
		54	+ const BIGNUM rsa_n, rsa_e, *rsa_d;
		55	+ const BIGNUM rsa_p, rsa_q;
		56	+ const BIGNUM rsa_dmp1, rsa_dmq1, *rsa_iqmp;
		57
		58	+#if OPENSSL_VERSION_NUMBER < 0x10100000L
		59	+ rsa_n = a_pRsa->n;
		60	+ rsa_e = a_pRsa->e;
		61	+ rsa_d = a_pRsa->d;
		62	+ rsa_p = a_pRsa->p;
		63	+ rsa_q = a_pRsa->q;
		64	+ rsa_dmp1 = a_pRsa->dmp1;
65	+ rsa_dmq1 = a_pRsa->dmq1;
66	+ rsa_iqmp = a_pRsa->iqmp;
67	+#else
68	+ RSA_get0_key(a_pRsa, &rsa_n, &rsa_e, &rsa_d);
69	+ RSA_get0_factors(a_pRsa, &rsa_p, &rsa_q);
70	+ RSA_get0_crt_params(a_pRsa, &rsa_dmp1, &rsa_dmq1, &rsa_iqmp);
71	+#endif
72	+ int nLen = BN_num_bytes( rsa_n );
73	+ int eLen = BN_num_bytes( rsa_e );
74	+ int dLen = BN_num_bytes( rsa_d );
75	+ int pLen = BN_num_bytes( rsa_p );
76	+ int qLen = BN_num_bytes( rsa_q );
77	+ int dmp1Len = BN_num_bytes( rsa_dmp1 );
78	+ int dmq1Len = BN_num_bytes( rsa_dmq1 );
79	+ int iqmpLen = BN_num_bytes( rsa_iqmp );
80	+
81	CK_RV rv;
82
83	CK_BBOOL bTrue = TRUE;
84	@@ -821,14 +847,14 @@
85	}
86
87	// Get binary representations of the RSA key information
88	- BN_bn2bin( a_pRsa->n, n );
89	- BN_bn2bin( a_pRsa->e, e );
90	- BN_bn2bin( a_pRsa->d, d );
91	- BN_bn2bin( a_pRsa->p, p );
92	- BN_bn2bin( a_pRsa->q, q );
93	- BN_bn2bin( a_pRsa->dmp1, dmp1 );
94	- BN_bn2bin( a_pRsa->dmq1, dmq1 );
95	- BN_bn2bin( a_pRsa->iqmp, iqmp );
96	+ BN_bn2bin( rsa_n, n );
97	+ BN_bn2bin( rsa_e, e );
98	+ BN_bn2bin( rsa_d, d );
99	+ BN_bn2bin( rsa_p, p );
100	+ BN_bn2bin( rsa_q, q );
101	+ BN_bn2bin( rsa_dmp1, dmp1 );
102	+ BN_bn2bin( rsa_dmq1, dmq1 );
103	+ BN_bn2bin( rsa_iqmp, iqmp );
104
105	// Create the RSA private key object
106	rv = createObject( a_hSession, tAttr, ulAttrCount, a_hObject );

Lines 1-24 Link Here

(-)security/tpm-tools/files/patch-src-tpm_mgmt-tpm_nvcommon.c (-24 lines)
1	--- src/tpm_mgmt/tpm_nvcommon.c.orig 2011-08-17 12:20:35 UTC
2	+++ src/tpm_mgmt/tpm_nvcommon.c
3	@@ -140,8 +140,8 @@ int parseStringWithValues(const char *aA
4	aArg);
5	return -1;
6	}
7	- if (!aArg[offset+numbytes] == '\|' &&
8	- !aArg[offset+numbytes] == 0) {
9	+ if (aArg[offset+numbytes] != '\|' &&
10	+ aArg[offset+numbytes] != 0) {
11	logError(_("Illegal character following "
12	"hexadecimal number in %s\n"),
13	aArg + offset);
14	@@ -164,8 +164,8 @@ int parseStringWithValues(const char *aA
15	return -1;
16	}
17
18	- if (!aArg[offset+numbytes] == '\|' &&
19	- !aArg[offset+numbytes] == 0) {
20	+ if (aArg[offset+numbytes] != '\|' &&
21	+ aArg[offset+numbytes] != 0) {
22	logError(_("Illegal character following decimal "
23	"number in %s\n"),
24	aArg + offset);

Lines 1-27 Link Here

(-)security/tpm-tools/files/patch-src-tpm_mgmt-tpm_nvwrite.c (-27 lines)
1	--- src/tpm_mgmt/tpm_nvwrite.c.orig 2011-08-17 12:20:35 UTC
2	+++ src/tpm_mgmt/tpm_nvwrite.c
3	@@ -33,6 +33,7 @@ static BOOL nvindex_set;
4	static unsigned int nvindex;
5	static unsigned int offset;
6	static unsigned int length;
7	+static int lengthp;
8	static int fillvalue = -1;
9	static const char *filename;
10	static BOOL passWellKnown;
11	@@ -60,6 +61,7 @@ static int parse(const int aOpt, const c
12	if (parseHexOrDecimal(aArg, &length, 0, UINT_MAX,
13	"length of data") != 0)
14	return -1;
15	+ lengthp = 1;
16	break;
17
18	case 'n':
19	@@ -220,7 +222,7 @@ int main(int argc, char **argv)
20	close(fd);
21	fd = -1;
22	} else if (fillvalue >= 0) {
23	- if (length < 0) {
24	+ if (lengthp == 0) {
25	logError(_("Requiring size parameter.\n"));
26	return -1;
27	}