FreeBSD Bugzilla – Attachment 199316 Details for
Bug 233295
security/tpm-tools: update to 1.3.9.1. Fix stable/12 build.
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
security/tpm-tools: update to 1.3.9.1: obsolete patches removed.
tpm-tools.patch (text/plain), 19.43 KB, created by
Oleg Sidorkin
on 2018-11-18 15:38:08 UTC
(
hide
)
Description:
security/tpm-tools: update to 1.3.9.1: obsolete patches removed.
Filename:
MIME Type:
Creator:
Oleg Sidorkin
Created:
2018-11-18 15:38:08 UTC
Size:
19.43 KB
patch
obsolete
>Index: security/tpm-tools/Makefile >=================================================================== >--- security/tpm-tools/Makefile (revision 484819) >+++ security/tpm-tools/Makefile (working copy) >@@ -2,7 +2,7 @@ > # $FreeBSD$ > > PORTNAME= tpm-tools >-PORTVERSION= 1.3.8 >+PORTVERSION= 1.3.9.1 > CATEGORIES= security > MASTER_SITES= SF/trousers/${PORTNAME}/${PORTVERSION} > >@@ -19,11 +19,12 @@ > RUN_DEPENDS= ${LOCALBASE}/sbin/tcsd:security/trousers \ > ${LOCALBASE}/lib/pkcs11/libopencryptoki.so:security/opencryptoki > >-USES= gettext gmake iconv libtool >+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/' \ >Index: security/tpm-tools/distinfo >=================================================================== >--- security/tpm-tools/distinfo (revision 484819) >+++ security/tpm-tools/distinfo (working copy) >@@ -1,3 +1,3 @@ >-TIMESTAMP = 1463578786 >-SHA256 (tpm-tools-1.3.8.tar.gz) = 66eb4ff095542403db6b4bd4b574e8a5c08084fe4e9e5aa9a829ee84e20bea83 >-SIZE (tpm-tools-1.3.8.tar.gz) = 473339 >+TIMESTAMP = 1542528622 >+SHA256 (tpm-tools-1.3.9.1.tar.gz) = 9cb714e2650826e2e932f65bc0ba9d61b927dc5fea47f2c2a2b64f0fdfcbfa68 >+SIZE (tpm-tools-1.3.9.1.tar.gz) = 482859 >Index: security/tpm-tools/files/patch-lib-Makefile.am >=================================================================== >--- security/tpm-tools/files/patch-lib-Makefile.am (revision 484819) >+++ security/tpm-tools/files/patch-lib-Makefile.am (working copy) >@@ -1,11 +1,11 @@ >---- lib/Makefile.am.orig 2012-05-17 17:50:39 UTC >-+++ lib/Makefile.am >-@@ -44,7 +44,7 @@ libtpm_utils_la_SOURCES = tpm_utils.c \ >+--- lib/Makefile.am.orig 2017-02-21 05:23:56.000000000 +0300 >++++ lib/Makefile.am 2018-11-18 11:25:29.095120000 +0300 >+@@ -44,7 +44,7 @@ > # > # TSPI interface library > libtpm_tspi_la_SOURCES = tpm_tspi.c >--libtpm_tspi_la_LIBADD = libtpm_utils.la -ldl >-+libtpm_tspi_la_LIBADD = libtpm_utils.la >+-libtpm_tspi_la_LIBADD = libtpm_utils.la -ldl @INTLLIBS@ >++libtpm_tspi_la_LIBADD = libtpm_utils.la @INTLLIBS@ > > # > # PKCS#11 interface library >Index: security/tpm-tools/files/patch-lib-Makefile.in >=================================================================== >--- security/tpm-tools/files/patch-lib-Makefile.in (revision 484819) >+++ security/tpm-tools/files/patch-lib-Makefile.in (working copy) >@@ -1,20 +1,11 @@ >---- lib/Makefile.in.orig 2012-05-17 19:09:27 UTC >-+++ lib/Makefile.in >-@@ -298,7 +298,7 @@ libtpm_utils_la_SOURCES = tpm_utils.c \ >+--- 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 >-+libtpm_tspi_la_LIBADD = libtpm_utils.la >+-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 >+ @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: >Index: security/tpm-tools/files/patch-lib-tpm_utils.c >=================================================================== >--- security/tpm-tools/files/patch-lib-tpm_utils.c (revision 484819) >+++ security/tpm-tools/files/patch-lib-tpm_utils.c (nonexistent) >@@ -1,47 +0,0 @@ >---- 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, > >Property changes on: security/tpm-tools/files/patch-lib-tpm_utils.c >___________________________________________________________________ >Deleted: fbsd:nokeywords >## -1 +0,0 ## >-yes >\ No newline at end of property >Deleted: svn:eol-style >## -1 +0,0 ## >-native >\ No newline at end of property >Deleted: svn:mime-type >## -1 +0,0 ## >-text/plain >\ No newline at end of property >Index: security/tpm-tools/files/patch-src-cmds-Makefile.am >=================================================================== >--- security/tpm-tools/files/patch-src-cmds-Makefile.am (revision 484819) >+++ security/tpm-tools/files/patch-src-cmds-Makefile.am (nonexistent) >@@ -1,11 +0,0 @@ >---- src/cmds/Makefile.am.orig 2011-08-15 17:52:08 UTC >-+++ src/cmds/Makefile.am >-@@ -30,7 +30,7 @@ else >- AM_CPPFLAGS = -I$(top_srcdir)/include -D_LINUX >- endif >- >--LDADD = $(top_builddir)/lib/libtpm_tspi.la -ltspi $(top_builddir)/lib/libtpm_unseal.la -ltpm_unseal -lcrypto >-+LDADD = $(top_builddir)/lib/libtpm_tspi.la -ltspi $(top_builddir)/lib/libtpm_unseal.la -lcrypto >- >- tpm_sealdata_SOURCES = tpm_sealdata.c >- tpm_unsealdata_SOURCES = tpm_unsealdata.c > >Property changes on: security/tpm-tools/files/patch-src-cmds-Makefile.am >___________________________________________________________________ >Deleted: fbsd:nokeywords >## -1 +0,0 ## >-yes >\ No newline at end of property >Deleted: svn:eol-style >## -1 +0,0 ## >-native >\ No newline at end of property >Deleted: svn:mime-type >## -1 +0,0 ## >-text/plain >\ No newline at end of property >Index: security/tpm-tools/files/patch-src-cmds-Makefile.in >=================================================================== >--- security/tpm-tools/files/patch-src-cmds-Makefile.in (revision 484819) >+++ security/tpm-tools/files/patch-src-cmds-Makefile.in (nonexistent) >@@ -1,11 +0,0 @@ >---- src/cmds/Makefile.in.orig 2012-05-17 19:09:27 UTC >-+++ src/cmds/Makefile.in >-@@ -245,7 +245,7 @@ top_builddir = @top_builddir@ >- top_srcdir = @top_srcdir@ >- @TSS_LIB_IS_12_FALSE@AM_CPPFLAGS = -I$(top_srcdir)/include -D_LINUX >- @TSS_LIB_IS_12_TRUE@AM_CPPFLAGS = -I$(top_srcdir)/include -D_LINUX -DTSS_LIB_IS_12 >--LDADD = $(top_builddir)/lib/libtpm_tspi.la -ltspi $(top_builddir)/lib/libtpm_unseal.la -ltpm_unseal -lcrypto >-+LDADD = $(top_builddir)/lib/libtpm_tspi.la -ltspi $(top_builddir)/lib/libtpm_unseal.la -lcrypto >- tpm_sealdata_SOURCES = tpm_sealdata.c >- tpm_unsealdata_SOURCES = tpm_unsealdata.c >- all: all-am > >Property changes on: security/tpm-tools/files/patch-src-cmds-Makefile.in >___________________________________________________________________ >Deleted: fbsd:nokeywords >## -1 +0,0 ## >-yes >\ No newline at end of property >Deleted: svn:eol-style >## -1 +0,0 ## >-native >\ No newline at end of property >Deleted: svn:mime-type >## -1 +0,0 ## >-text/plain >\ No newline at end of property >Index: security/tpm-tools/files/patch-src-data_mgmt-Makefile.am >=================================================================== >--- security/tpm-tools/files/patch-src-data_mgmt-Makefile.am (revision 484819) >+++ security/tpm-tools/files/patch-src-data_mgmt-Makefile.am (working copy) >@@ -1,11 +1,11 @@ >---- src/data_mgmt/Makefile.am.orig 2012-05-17 17:50:29 UTC >-+++ src/data_mgmt/Makefile.am >-@@ -38,7 +38,7 @@ noinst_HEADERS = data_common.h \ >+--- src/data_mgmt/Makefile.am.orig 2017-02-21 04:23:57.000000000 +0300 >++++ src/data_mgmt/Makefile.am 2018-11-18 13:07:05.984702000 +0300 >+@@ -38,7 +38,7 @@ > # Common build flags > AM_CPPFLAGS = -I$(top_srcdir)/include -D_LINUX > >--LDADD = $(top_builddir)/lib/libtpm_pkcs11.la -ltspi -ldl >-+LDADD = $(top_builddir)/lib/libtpm_pkcs11.la -ltspi >+-LDADD = $(top_builddir)/lib/libtpm_pkcs11.la -ltspi -ldl @INTLLIBS@ >++LDADD = $(top_builddir)/lib/libtpm_pkcs11.la -ltspi @INTLLIBS@ > > > # >Index: security/tpm-tools/files/patch-src-data_mgmt-Makefile.in >=================================================================== >--- security/tpm-tools/files/patch-src-data_mgmt-Makefile.in (revision 484819) >+++ security/tpm-tools/files/patch-src-data_mgmt-Makefile.in (working copy) >@@ -1,11 +1,11 @@ >---- src/data_mgmt/Makefile.in.orig 2012-05-17 19:09:27 UTC >-+++ src/data_mgmt/Makefile.in >-@@ -274,7 +274,7 @@ noinst_HEADERS = data_common.h \ >+--- src/data_mgmt/Makefile.in.orig 2017-02-21 05:31:46.000000000 +0300 >++++ src/data_mgmt/Makefile.in 2018-11-18 13:08:15.900591000 +0300 >+@@ -271,7 +271,7 @@ > # > # Common build flags > AM_CPPFLAGS = -I$(top_srcdir)/include -D_LINUX >--LDADD = $(top_builddir)/lib/libtpm_pkcs11.la -ltspi -ldl >-+LDADD = $(top_builddir)/lib/libtpm_pkcs11.la -ltspi >+-LDADD = $(top_builddir)/lib/libtpm_pkcs11.la -ltspi -ldl @INTLLIBS@ >++LDADD = $(top_builddir)/lib/libtpm_pkcs11.la -ltspi @INTLLIBS@ > > # > # TPM Token initialization command >Index: security/tpm-tools/files/patch-src-data_mgmt-data_import.c >=================================================================== >--- security/tpm-tools/files/patch-src-data_mgmt-data_import.c (nonexistent) >+++ security/tpm-tools/files/patch-src-data_mgmt-data_import.c (working copy) >@@ -0,0 +1,106 @@ >+--- 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 ); > >Property changes on: security/tpm-tools/files/patch-src-data_mgmt-data_import.c >___________________________________________________________________ >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property >Index: security/tpm-tools/files/patch-src-data_mgmt-data_protect.c >=================================================================== >--- security/tpm-tools/files/patch-src-data_mgmt-data_protect.c (revision 484819) >+++ security/tpm-tools/files/patch-src-data_mgmt-data_protect.c (working copy) >@@ -1,6 +1,6 @@ >---- src/data_mgmt/data_protect.c.orig 2012-05-17 17:49:58 UTC >-+++ src/data_mgmt/data_protect.c >-@@ -437,6 +437,7 @@ main( int a_iArgc, >+--- src/data_mgmt/data_protect.c.orig 2017-02-21 04:23:57.000000000 +0300 >++++ src/data_mgmt/data_protect.c 2018-11-18 13:21:03.884259000 +0300 >+@@ -437,6 +437,7 @@ > CK_OBJECT_HANDLE hObject; > CK_MECHANISM tMechanism = { CKM_AES_ECB, NULL, 0 }; > >Index: security/tpm-tools/files/patch-src-tpm_mgmt-tpm_nvcommon.c >=================================================================== >--- security/tpm-tools/files/patch-src-tpm_mgmt-tpm_nvcommon.c (revision 484819) >+++ security/tpm-tools/files/patch-src-tpm_mgmt-tpm_nvcommon.c (nonexistent) >@@ -1,24 +0,0 @@ >---- 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); > >Property changes on: security/tpm-tools/files/patch-src-tpm_mgmt-tpm_nvcommon.c >___________________________________________________________________ >Deleted: fbsd:nokeywords >## -1 +0,0 ## >-yes >\ No newline at end of property >Deleted: svn:eol-style >## -1 +0,0 ## >-native >\ No newline at end of property >Deleted: svn:mime-type >## -1 +0,0 ## >-text/plain >\ No newline at end of property >Index: security/tpm-tools/files/patch-src-tpm_mgmt-tpm_nvread.c >=================================================================== >--- security/tpm-tools/files/patch-src-tpm_mgmt-tpm_nvread.c (revision 484819) >+++ security/tpm-tools/files/patch-src-tpm_mgmt-tpm_nvread.c (nonexistent) >@@ -1,10 +0,0 @@ >---- src/tpm_mgmt/tpm_nvread.c.orig 2011-08-17 12:20:35 UTC >-+++ src/tpm_mgmt/tpm_nvread.c >-@@ -19,6 +19,7 @@ >- * http://www.opensource.org/licenses/cpl1.0.php. >- */ >- >-+#include <sys/stat.h> >- #include <limits.h> >- #include <ctype.h> >- #include <fcntl.h> > >Property changes on: security/tpm-tools/files/patch-src-tpm_mgmt-tpm_nvread.c >___________________________________________________________________ >Deleted: fbsd:nokeywords >## -1 +0,0 ## >-yes >\ No newline at end of property >Deleted: svn:eol-style >## -1 +0,0 ## >-native >\ No newline at end of property >Deleted: svn:mime-type >## -1 +0,0 ## >-text/plain >\ No newline at end of property >Index: security/tpm-tools/files/patch-src-tpm_mgmt-tpm_nvwrite.c >=================================================================== >--- security/tpm-tools/files/patch-src-tpm_mgmt-tpm_nvwrite.c (revision 484819) >+++ security/tpm-tools/files/patch-src-tpm_mgmt-tpm_nvwrite.c (nonexistent) >@@ -1,27 +0,0 @@ >---- 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; >- } > >Property changes on: security/tpm-tools/files/patch-src-tpm_mgmt-tpm_nvwrite.c >___________________________________________________________________ >Deleted: fbsd:nokeywords >## -1 +0,0 ## >-yes >\ No newline at end of property >Deleted: svn:eol-style >## -1 +0,0 ## >-native >\ No newline at end of property >Deleted: svn:mime-type >## -1 +0,0 ## >-text/plain >\ No newline at end of property >Index: security/tpm-tools/files/patch-src-tpm_mgmt-tpm_present.c >=================================================================== >--- security/tpm-tools/files/patch-src-tpm_mgmt-tpm_present.c (revision 484819) >+++ security/tpm-tools/files/patch-src-tpm_mgmt-tpm_present.c (working copy) >@@ -1,6 +1,6 @@ >---- src/tpm_mgmt/tpm_present.c.orig 2012-05-17 17:49:58 UTC >-+++ src/tpm_mgmt/tpm_present.c >-@@ -168,9 +168,10 @@ static BOOL confirmLifeLock(TSS_HCONTEXT >+--- src/tpm_mgmt/tpm_present.c.orig 2017-02-21 04:23:57.000000000 +0300 >++++ src/tpm_mgmt/tpm_present.c 2018-11-18 13:21:03.884938000 +0300 >+@@ -168,9 +168,10 @@ > TSS_HPOLICY hTpmPolicy; > char *pwd = NULL; > int pswd_len; >Index: security/tpm-tools/files/patch-src-tpm_mgmt-tpm_takeownership.c >=================================================================== >--- security/tpm-tools/files/patch-src-tpm_mgmt-tpm_takeownership.c (revision 484819) >+++ security/tpm-tools/files/patch-src-tpm_mgmt-tpm_takeownership.c (working copy) >@@ -1,6 +1,6 @@ >---- src/tpm_mgmt/tpm_takeownership.c.orig 2010-09-30 17:28:09 UTC >-+++ src/tpm_mgmt/tpm_takeownership.c >-@@ -77,6 +77,7 @@ int main(int argc, char **argv) >+--- src/tpm_mgmt/tpm_takeownership.c.orig 2017-02-21 04:23:57.000000000 +0300 >++++ src/tpm_mgmt/tpm_takeownership.c 2018-11-18 13:21:03.885587000 +0300 >+@@ -77,6 +77,7 @@ > {"srk-well-known", no_argument, NULL, 'z'}, > }; >
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=199316">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 233295
: 199316