Accepting request 938273 from home:susnux:branches:security
Update to version 0.9.1 OBS-URL: https://build.opensuse.org/request/show/938273 OBS-URL: https://build.opensuse.org/package/show/security/libtpms?expand=0&rev=29
This commit is contained in:
parent
5e1c966304
commit
3226d3caae
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:5f8b0ed59d52fe22e7245a0d5909e33a72b4d2dac47ee877ea9ff3c307b2ed19
|
||||
size 1255255
|
3
libtpms-0.9.1.tar.gz
Normal file
3
libtpms-0.9.1.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:9a4d1ed07b78142c394faad1a1481771d470048f5859e80593fe42c82e5635a5
|
||||
size 1261528
|
@ -1,49 +0,0 @@
|
||||
diff --git a/src/tpm2/NVMarshal.c b/src/tpm2/NVMarshal.c
|
||||
index 2b2d84a6..430f481f 100644
|
||||
--- a/src/tpm2/NVMarshal.c
|
||||
+++ b/src/tpm2/NVMarshal.c
|
||||
@@ -4103,6 +4103,12 @@ INDEX_ORDERLY_RAM_Marshal(void *array, size_t array_size,
|
||||
datasize, buffer, size);
|
||||
}
|
||||
offset += nrh.size;
|
||||
+ if (offset + sizeof(NV_RAM_HEADER) > array_size) {
|
||||
+ /* nothing will fit anymore and there won't be a 0-sized
|
||||
+ * terminating node (@1).
|
||||
+ */
|
||||
+ break;
|
||||
+ }
|
||||
}
|
||||
|
||||
written += BLOCK_SKIP_WRITE_PUSH(TRUE, buffer, size);
|
||||
@@ -4144,6 +4150,16 @@ INDEX_ORDERLY_RAM_Unmarshal(void *array, size_t array_size,
|
||||
*/
|
||||
nrhp = array + offset;
|
||||
|
||||
+ if (offset + sizeof(NV_RAM_HEADER) > sourceside_size) {
|
||||
+ /* this case can occur with the previous entry filling up the
|
||||
+ * space; in this case there will not be a 0-sized terminating
|
||||
+ * node (see @1 above). We clear the rest of our space.
|
||||
+ */
|
||||
+ if (array_size > offset)
|
||||
+ memset(nrhp, 0, array_size - offset);
|
||||
+ break;
|
||||
+ }
|
||||
+
|
||||
/* write the NVRAM header;
|
||||
nrh->size holds the complete size including data;
|
||||
nrh->size = 0 indicates the end */
|
||||
diff --git a/src/tpm2/Object.c b/src/tpm2/Object.c
|
||||
index ab503487..967105f5 100644
|
||||
--- a/src/tpm2/Object.c
|
||||
+++ b/src/tpm2/Object.c
|
||||
@@ -284,7 +284,8 @@ FindEmptyObjectSlot(
|
||||
if(handle)
|
||||
*handle = i + TRANSIENT_FIRST;
|
||||
// Initialize the object attributes
|
||||
- MemorySet(&object->attributes, 0, sizeof(OBJECT_ATTRIBUTES));
|
||||
+ // MemorySet(&object->attributes, 0, sizeof(OBJECT_ATTRIBUTES));
|
||||
+ MemorySet(object, 0, sizeof(*object)); // libtpms added: Initialize the whole object
|
||||
return object;
|
||||
}
|
||||
}
|
||||
|
@ -1,3 +1,15 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Dec 9 19:57:51 UTC 2021 - Ferdinand Thiessen <rpm@fthiessen.de>
|
||||
|
||||
- Update to version 0.9.1
|
||||
* Downgrade to previous versions is not possible, as the size of
|
||||
the context gap has been adjusted to 0xffff from 0xff.
|
||||
* Enabled Camellia symmetric key encryption algorithm
|
||||
* tpm2: Update to TPM 2 spec rev 164
|
||||
* tpm2: Added a cache for private exponent D and prime Q
|
||||
* tpm2: bug fixes
|
||||
- Drop upstream fixed libtpms-CVE-2021-3746.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Aug 31 16:36:31 UTC 2021 - pgajdos@suse.com
|
||||
|
||||
|
12
libtpms.spec
12
libtpms.spec
@ -18,15 +18,13 @@
|
||||
|
||||
%define lname libtpms0
|
||||
Name: libtpms
|
||||
Version: 0.8.4
|
||||
Version: 0.9.1
|
||||
Release: 0
|
||||
Summary: Library providing Trusted Platform Module (TPM) functionality
|
||||
License: BSD-3-Clause
|
||||
Group: Development/Libraries/C and C++
|
||||
URL: https://github.com/stefanberger/libtpms
|
||||
Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
|
||||
# CVE-2021-3746 [bsc#1189935], out-of-bounds access via specially crafted TPM 2 command packets
|
||||
Patch0: libtpms-CVE-2021-3746.patch
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
BuildRequires: fdupes
|
||||
@ -63,10 +61,10 @@ Libtpms header files and documentation.
|
||||
|
||||
%build
|
||||
autoreconf -fiv
|
||||
%configure \
|
||||
--with-tpm2 \
|
||||
--with-openssl \
|
||||
--disable-static
|
||||
%configure \
|
||||
--with-tpm2 \
|
||||
--with-openssl \
|
||||
--disable-static
|
||||
|
||||
%make_build
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user