From 1f81f6ede04cdff0272a0c02680873438f43474ad04f2658b3accb88245491de Mon Sep 17 00:00:00 2001 From: Alberto Planas Dominguez Date: Thu, 16 Feb 2023 14:38:17 +0000 Subject: [PATCH 1/2] Accepting request 1066188 from home:aplanas:branches:security - Update to version 5.5 + Added: * tpm2_createek: SM2 EK Support * misc: SM2 support to internal OSSL format key routines. Fixes --format flags for conversions. + Fixed: * echo_tcti.py: set to use python3 named executable in shebang. - Drop already merged patches + fix_bogus_warning.patch + echo_tcti_call_python3_binary.patch OBS-URL: https://build.opensuse.org/request/show/1066188 OBS-URL: https://build.opensuse.org/package/show/security/tpm2.0-tools?expand=0&rev=101 --- echo_tcti_call_python3_binary.patch | 23 ----------------------- fix_bogus_warning.patch | 13 ------------- tpm2-tools-5.4.tar.gz | 3 --- tpm2-tools-5.4.tar.gz.asc | 16 ---------------- tpm2-tools-5.5.tar.gz | 3 +++ tpm2-tools-5.5.tar.gz.asc | 16 ++++++++++++++++ tpm2.0-tools.changes | 14 ++++++++++++++ tpm2.0-tools.spec | 6 ++---- 8 files changed, 35 insertions(+), 59 deletions(-) delete mode 100644 echo_tcti_call_python3_binary.patch delete mode 100644 fix_bogus_warning.patch delete mode 100644 tpm2-tools-5.4.tar.gz delete mode 100644 tpm2-tools-5.4.tar.gz.asc create mode 100644 tpm2-tools-5.5.tar.gz create mode 100644 tpm2-tools-5.5.tar.gz.asc diff --git a/echo_tcti_call_python3_binary.patch b/echo_tcti_call_python3_binary.patch deleted file mode 100644 index 1cd1595..0000000 --- a/echo_tcti_call_python3_binary.patch +++ /dev/null @@ -1,23 +0,0 @@ -From d191b1f3cd66e9334d000c622bc6cc4bdc63304e Mon Sep 17 00:00:00 2001 -From: Alberto Planas -Date: Thu, 8 Dec 2022 15:23:50 +0100 -Subject: [PATCH] echo_tcti: call python3 binary - -Most distributions are now in Python3. The binary for Python3 is still -called `python3`. - -Signed-off-by: Alberto Planas ---- - test/scripts/echo_tcti.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/test/scripts/echo_tcti.py b/test/scripts/echo_tcti.py -index 3e4c1f462..325e35315 100755 ---- a/test/scripts/echo_tcti.py -+++ b/test/scripts/echo_tcti.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - # - # This TCTI is designed to use with the subprocess TCTI and echo the contents diff --git a/fix_bogus_warning.patch b/fix_bogus_warning.patch deleted file mode 100644 index 568d8b6..0000000 --- a/fix_bogus_warning.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: tpm2-tools-5.0/lib/tpm2_attr_util.c -=================================================================== ---- tpm2-tools-5.0.orig/lib/tpm2_attr_util.c -+++ tpm2-tools-5.0/lib/tpm2_attr_util.c -@@ -202,7 +202,7 @@ static bool lookup_nt_friendly_name(cons - - static bool nt(TPMA_NV *nv, char *arg) { - -- uint16_t value; -+ uint16_t value = 0; - bool result = tpm2_util_string_to_uint16(arg, &value); - if (!result) { - result = lookup_nt_friendly_name(arg, &value); diff --git a/tpm2-tools-5.4.tar.gz b/tpm2-tools-5.4.tar.gz deleted file mode 100644 index 460f6b7..0000000 --- a/tpm2-tools-5.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f63571d23edd96d024a2245326bcb9a36fac2cf89aef5a6c05a3b0852d292c99 -size 1241132 diff --git a/tpm2-tools-5.4.tar.gz.asc b/tpm2-tools-5.4.tar.gz.asc deleted file mode 100644 index 86b9309..0000000 --- a/tpm2-tools-5.4.tar.gz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEEW0grjj4Z2nyXjh0BbeLpB44fUMEFAmOOFpAACgkQbeLpB44f -UMF1NA/+PCDoLvrwPb2nkN/CvF8yCA8Q0AWqK9oKvStctLGRNRV1FI+S7IXwK77W -IADbb8QXgahIGHwE4vLGn2ayy8KSRWjsfAKG7eZ43ZbZFQpc33uG47OG8oKTyqAk -2mLFdzeFz8O+ZZ3/3D4DAZKtJCn8C3UOfHYjl5Tn3dWyaRHs6QHJZgc77GxRqDuk -jypbF6b5gP83nl63iFTBRhQttOMT1auP/zp9Gen2sy8tR0IIgHFkt9JO8riTLer1 -/Cgg71sRTxxjpPPEV1gWAgb7gHBGbFlsZLzFVvczqe2IB+rwxeXSzUS6nuYRangn -/wiYxBCzHySvGYINLVQI0bSyc9pFIPNF16sovyCCtRFDCXvJSyUZGGds0Ckcv5zy -DT6Cgpp3gkAq1kLMd0FHGPZUwdtYVSQuBMp3EP3lQpDJVG0sgITFe83+K06ySo8d -3knJclrpyiDZYMNywLkeFfAeBeVCfDX5FR9RMsdcQNo/WlpIlafgphOnKUE7p6wV -bWH2c0fQwnk3E3Dfuf3hUeBvVInQW4jhFMhRzuFeeTUX8PH1WKdBvCVBS18z8UTU -Jup4Q/Ybqn4aWayjGSRvpi5hfxzEqiF+vqddgbnt13xvKeOzkZP2SQsX+ccjKwSW -k+0Rku48PN3wKlrov8kxOqyBrhEJWLLAgERl9thIoTwu1hkZy5w= -=7O/x ------END PGP SIGNATURE----- diff --git a/tpm2-tools-5.5.tar.gz b/tpm2-tools-5.5.tar.gz new file mode 100644 index 0000000..71008a1 --- /dev/null +++ b/tpm2-tools-5.5.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1fdb49c730537bfdaed088884881a61e3bfd121e957ec0bdceeec0261236c123 +size 1241390 diff --git a/tpm2-tools-5.5.tar.gz.asc b/tpm2-tools-5.5.tar.gz.asc new file mode 100644 index 0000000..b9ca12a --- /dev/null +++ b/tpm2-tools-5.5.tar.gz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEW0grjj4Z2nyXjh0BbeLpB44fUMEFAmPqU7MACgkQbeLpB44f +UMEaug//TgtRx9sfZBdtAQpKw/pc3wBBmUfRNC2FF6XYXC63j/iiiDRGyilw/awu +457DE/bnRpO9LGVRGBh6u34/sJEXXlkAowy4nfCW+PoB4uClC2Cgu9h5znC8t0ZA +FB5x4hGY3PvbGgaZKqUs3ktGrC74dbXOXaHOee1UnD+PPs9GZqLXoQewY/PhXFLR +ap2Ny0omW/TUEjksZEaCMvKiCf6F8UPEFoWVf/z+J9O7Qt+SUXb50Oxus6nh1OFL +ewqJyiFZRwHqFF1BfuTn5nBEt/8bBeW4RVMdc/srSg/Dx0bhZIf7NiUxw/7oD2/x +wmyJHASBZTN3Af0Ji9D5kyGOeEAfSf+Vwl+UGcAjZ5jJh/le31Cz0d71XSkGEeO2 +Fo0t5ArAhS9mpTeyXOIwiF9SpaBhoEjRwEBxvukfhYalUY16X7McUwxOzPsPZetW +Iu+s3qhsRgxx3Lw0n3ayK8CV1El8WEyaiOcc7f2TQIm7MeVxo5CQu5oEeUb1I9py +Pm8MLzm/DUWX0x6ElCeYVUIEpudKxVcM1JA+w+zGmnb1bKnr1IydWneCQmt6L6cq +uqaON66rNFrFpzNtf2kHqUpkb1DIFHWnIgaqJkP9IayKI17mbvqalaqnOc/1z6/G +FQ7CNbbIkAdGzHZHVFuWrlJ008kdg01r7AracSoW/oeQsSyWIOs= +=DW/Z +-----END PGP SIGNATURE----- diff --git a/tpm2.0-tools.changes b/tpm2.0-tools.changes index 87058be..da17ea2 100644 --- a/tpm2.0-tools.changes +++ b/tpm2.0-tools.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Thu Feb 16 14:28:55 UTC 2023 - Alberto Planas Dominguez + +- Update to version 5.5 + + Added: + * tpm2_createek: SM2 EK Support + * misc: SM2 support to internal OSSL format key routines. Fixes + --format flags for conversions. + + Fixed: + * echo_tcti.py: set to use python3 named executable in shebang. +- Drop already merged patches + + fix_bogus_warning.patch + + echo_tcti_call_python3_binary.patch + ------------------------------------------------------------------- Wed Jan 4 12:56:09 UTC 2023 - Alberto Planas Dominguez diff --git a/tpm2.0-tools.spec b/tpm2.0-tools.spec index 8b6c88b..952c259 100644 --- a/tpm2.0-tools.spec +++ b/tpm2.0-tools.spec @@ -28,7 +28,7 @@ %bcond_with test %endif Name: tpm2.0-tools -Version: 5.4 +Version: 5.5 Release: 0 Summary: Trusted Platform Module (TPM) 2.0 administration tools License: BSD-3-Clause @@ -38,9 +38,6 @@ Source0: https://github.com/tpm2-software/tpm2-tools/releases/download/%{ Source1: https://github.com/tpm2-software/tpm2-tools/releases/download/%{version}/tpm2-tools-%{version}.tar.gz.asc # git show william-roberts-pub javier-martinez-pub joshua-lock-pub idesai-pub > tpm2-tools.keyring Source2: tpm2-tools.keyring -Patch0: fix_bogus_warning.patch -# PATCH-FIX-UPSTREAM add_missing_shut_down_call_on_cleanup.patch -- based on PR#3176 -Patch1: echo_tcti_call_python3_binary.patch BuildRequires: gcc-c++ BuildRequires: libcurl-devel BuildRequires: libopenssl-devel @@ -112,6 +109,7 @@ find %{buildroot} -type f -name "*.la" -delete -print # Do the tests sequentially to kill all tpm_server instances # https://github.com/tpm2-software/tpm2-tools/issues/3042 %make_build check +kk %endif %changelog From ea39889ddebb94d6569ab7bd8806b53b66f77ed991dd0dd400ae879a26c26974 Mon Sep 17 00:00:00 2001 From: Alberto Planas Dominguez Date: Thu, 16 Feb 2023 15:25:28 +0000 Subject: [PATCH 2/2] Accepting request 1066201 from home:aplanas:branches:security Drop extra line OBS-URL: https://build.opensuse.org/request/show/1066201 OBS-URL: https://build.opensuse.org/package/show/security/tpm2.0-tools?expand=0&rev=102 --- tpm2.0-tools.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/tpm2.0-tools.spec b/tpm2.0-tools.spec index 952c259..0bcb3d3 100644 --- a/tpm2.0-tools.spec +++ b/tpm2.0-tools.spec @@ -109,7 +109,6 @@ find %{buildroot} -type f -name "*.la" -delete -print # Do the tests sequentially to kill all tpm_server instances # https://github.com/tpm2-software/tpm2-tools/issues/3042 %make_build check -kk %endif %changelog