PR#4: trousers: Rebase to 0.3.14 release - rpms/trousers

Jerry Snitselaar • 4 years ago

fa2b354

.gitignore

file modified

sources

file modified

+1 -1

		`@@ -1,1 +1,1 @@`
		`- 562bb3d178ca91177aa2f6c2c1a83269 trousers-0.3.13.tar.gz`
		`+ 4a476b4f036dd20a764fb54fc24edbec trousers-0.3.14.tar.gz`

trousers-0.3.14-double-free.patch

file added

+27

		`@@ -0,0 +1,27 @@`
		`+ diff -ur trousers-0.3.14/src/tspi/tsp_auth.c trousers-0.3.14-new/src/tspi/tsp_auth.c`
		`+ --- trousers-0.3.14/src/tspi/tsp_auth.c 2014-07-23 12:42:45.000000000 -0700`
		`+ +++ trousers-0.3.14-new/src/tspi/tsp_auth.c 2019-05-27 13:41:57.316000945 -0700`
		`+ @@ -1221,7 +1221,7 @@`
		`+ }`
		`+`
		`+ *handles = handle;`
		`+ - handles_track = handles;`
		`+ + handles_track = handles;`
		`+`
		`+ // Since the call tree of this function can possibly alloc memory`
		`+ // (check RPC_ExecuteTransport_TP function), its better to keep track of`
		`+ @@ -1229,9 +1229,11 @@`
		`+ result = obj_context_transport_execute(tspContext, TPM_ORD_Terminate_Handle, 0, NULL,`
		`+ NULL, &handlesLen, &handles, NULL, NULL, NULL, NULL);`
		`+`
		`+ - free(handles);`
		`+ - handles = NULL;`
		`+ - free(handles_track);`
		`+ + if (handles != handles_track) {`
		`+ + free(handles);`
		`+ + }`
		`+ +`
		`+ + free(handles_track);`
		`+`
		`+ return result;`
		`+ }`

file added

+12

		`@@ -0,0 +1,12 @@`
		`+ diff -ur trousers-0.3.14/src/tspi/obj_policy.c trousers-0.3.14-new/src/tspi/obj_policy.c`
		`+ --- trousers-0.3.14/src/tspi/obj_policy.c 2014-07-23 12:42:44.000000000 -0700`
		`+ +++ trousers-0.3.14-new/src/tspi/obj_policy.c 2019-05-27 13:29:56.720899059 -0700`
		`+ @@ -984,7 +984,7 @@`
		`+ policy->popupString,`
		`+ policy->Secret)))`
		`+ goto done;`
		`+ - policy->SecretSet = TRUE;`
		`+ + policy->SecretSet = TRUE;`
		`+ }`
		`+ memcpy(secret, policy->Secret, TPM_SHA1_160_HASH_LEN);`
		`+ *mode = policy->SecretMode;`

file added

+18

		`@@ -0,0 +1,18 @@`
		`+ diff -ur trousers-0.3.14/src/tspi/tspi_key.c trousers-0.3.14-new/src/tspi/tspi_key.c`
		`+ --- trousers-0.3.14/src/tspi/tspi_key.c 2014-07-23 12:42:45.000000000 -0700`
		`+ +++ trousers-0.3.14-new/src/tspi/tspi_key.c 2019-05-27 13:44:42.366735438 -0700`
		`+ @@ -370,10 +370,10 @@`
		`+ /* get the key to be wrapped's private key */`
		`+ if ((result = obj_rsakey_get_priv_blob(hKey, &keyPrivBlobLen, &keyPrivBlob)))`
		`+ goto done;`
		`+ - /* verify if its under the maximum size, according to the`
		`+ - * TPM_STORE_ASYMKEY specification */`
		`+ - if (keyPrivBlobLen > TPM_STORE_PRIVKEY_LEN)`
		`+ - return TSPERR(TSS_E_ENC_INVALID_LENGTH);`
		`+ + /* verify if its under the maximum size, according to the`
		`+ + * TPM_STORE_ASYMKEY specification */`
		`+ + if (keyPrivBlobLen > TPM_STORE_PRIVKEY_LEN)`
		`+ + return TSPERR(TSS_E_ENC_INVALID_LENGTH);`
		`+`
		`+ /* get the key to be wrapped's blob */`
		`+ if ((result = obj_rsakey_get_blob(hKey, &keyBlobLen, &keyBlob)))`

trousers-0.3.14-noinline.patch

file added

+14

		`@@ -0,0 +1,14 @@`
		`+ diff -ur a/src/include/tspps.h b/src/include/tspps.h`
		`+ --- a/src/include/tspps.h 2014-07-23 12:42:44.000000000 -0700`
		`+ +++ b/src/include/tspps.h 2018-08-01 19:33:42.454192873 -0700`
		`+ @@ -18,8 +18,8 @@`
		`+`
		`+ TSS_RESULT get_file(int *);`
		`+ int put_file(int);`
		`+ -inline TSS_RESULT read_data(int, void *, UINT32);`
		`+ -inline TSS_RESULT write_data(int, void *, UINT32);`
		`+ +TSS_RESULT read_data(int, void *, UINT32);`
		`+ +TSS_RESULT write_data(int, void *, UINT32);`
		`+ UINT32 psfile_get_num_keys(int);`
		`+ TSS_RESULT psfile_get_parent_uuid_by_uuid(int, TSS_UUID , TSS_UUID );`
		`+ TSS_RESULT psfile_remove_key_by_uuid(int, TSS_UUID *);`

trousers-0.3.14-unlock-in-err-path.patch

file added

+11

		`@@ -0,0 +1,11 @@`
		`+ diff -ur a/src/tspi/obj_context.c b/src/tspi/obj_context.c`
		`+ --- a/src/tspi/obj_context.c 2014-11-03 12:31:55.000000000 -0700`
		`+ +++ b/src/tspi/obj_context.c 2018-08-10 11:02:02.246962638 -0700`
		`+ @@ -276,6 +276,7 @@`
		`+ context->machineName = (BYTE *)calloc(1, len);`
		`+ if (context->machineName == NULL) {`
		`+ LogError("malloc of %u bytes failed.", len);`
		`+ + obj_list_put(&context_list);`
		`+ return TSPERR(TSS_E_OUTOFMEMORY);`
		`+ }`
		`+ memcpy(context->machineName, name, len);`

trousers.spec

file modified

+16 -6

		`@@ -1,14 +1,18 @@`
		`Name: trousers`
		`Summary: TCG's Software Stack v1.2`
		`- Version: 0.3.13`
		`- Release: 13%{?dist}`
		`+ Version: 0.3.14`
		`+ Release: 1%{?dist}`
		`License: BSD`
		`Url: http://trousers.sourceforge.net`

		`Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz`
		`Source1: tcsd.service`
		`- Patch1: trousers-0.3.13-noinline.patch`
		`- Patch2: trousers-openssl1.1.patch`
		`+ Patch1: trousers-0.3.14-noinline.patch`
		`+ # submitted upstream`
		`+ Patch2: trousers-0.3.14-unlock-in-err-path.patch`
		`+ Patch3: trousers-0.3.14-fix-indent-obj_policy.patch`
		`+ Patch4: trousers-0.3.14-double-free.patch`
		`+ Patch5: trousers-0.3.14-fix-indent-tspi_key.patch`

		`BuildRequires: libtool, openssl-devel`
		`BuildRequires: systemd`
		`@@ -52,9 +56,12 @@`
		`applications.`

		`%prep`
		`- %setup -q`
		`+ %setup -cq`
		`%patch1 -p1 -b .noinline`
		`- %patch2 -p1 -b .ssl1.1`
		`+ %patch2 -p1 -b .unlock`
		`+ %patch3 -p1 -b .indent_obj_policy`
		`+ %patch4 -p1 -b .double_free`
		`+ %patch5 -p1 -b .indent_tspi_key`
		`# fix man page paths`
		`sed -i -e 's\|/var/tpm\|/var/lib/tpm\|g' -e 's\|/usr/local/var\|/var\|g' man/man5/tcsd.conf.5.in man/man8/tcsd.8.in`

		`@@ -114,6 +121,9 @@`
		`%{_libdir}/libtddl.a`

		`%changelog`
		`+ * Tue Nov 19 2019 Jerry Snitselaar <jsnitsel@redhat.com> - 0.3.14-1`
		`+ - Rebase to 0.3.14 release`
		`+`
		`* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.13-13`
		`- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild`