Merge ~paelzer/ubuntu/+source/libtpms:0.9.3-JAMMY into ubuntu/+source/libtpms:ubuntu/jammy-devel

[Christian Ehrhardt ]

75bd422... by Christian Ehrhardt  on 2022-03-30

d/p/do_not_inline_makeiv.patch pull ppc64 fix from upstream as identified and added to debian 0.9.2-3

Signed-off-by: Christian Ehrhardt <email address hidden>

[Christian Ehrhardt  (paelzer)]

PPA: https://launchpad.net/~paelzer/+archive/ubuntu/libtpms-jammy-0.9.3/+packages

1b754c7... by Christian Ehrhardt  on 2022-03-30

d/p/no_local_check.patch pull ppc64 fix from upstream as identified and added to debian 0.9.2-3

Signed-off-by: Christian Ehrhardt <email address hidden>

[Christian Ehrhardt  (paelzer)]

Autopkgtest (I skipped the rather busy arm architectures) are still good:

https://autopkgtest.ubuntu.com/results/autopkgtest-jammy-paelzer-libtpms-jammy-0.9.3/jammy/amd64/libt/libtpms/20220330_120730_f1dd2@/log.gz
https://autopkgtest.ubuntu.com/results/autopkgtest-jammy-paelzer-libtpms-jammy-0.9.3/jammy/s390x/libt/libtpms/20220330_120906_7eb14@/log.gz

[Andreas Hasenack (ahasenack)]

Taking a look

[Andreas Hasenack (ahasenack)]

review: Needs Information

[Christian Ehrhardt  (paelzer)]

replied to Andreas (inline)

[Andreas Hasenack (ahasenack)]

+1

- no ffe needed
- changes match upstream 0.9.3
- build is fine

no other concerns

review: Approve

8f2d086... by Christian Ehrhardt  on 2022-03-31

drop d/p/uninitialized-variable.patch: no more needed

Signed-off-by: Christian Ehrhardt <email address hidden>

18776b3... by Christian Ehrhardt  on 2022-03-31

changelog: drop d/p/uninitialized-variable.patch

Signed-off-by: Christian Ehrhardt <email address hidden>

[Christian Ehrhardt  (paelzer)]

After talking with the upstream maintainer we found that some former Delta for gcc issues is no more needed. Dropped that - otherwise the same.

[Andreas Hasenack (ahasenack)]

And d/p/no_local_check.patch. do we still need that for ppc64el, or was that also resolved by the gcc update in jammy that landed eventually?

[Christian Ehrhardt  (paelzer)]

Yes, I tried without, but both:
- d/p/no_local_check.patch
- d/p/do_not_inline_makeiv.patch
are still needed.

[Andreas Hasenack (ahasenack)]

+1

review: Approve

10048b1... by Christian Ehrhardt  on 2022-04-01

d/p/lp-1948748-tpm2-Check-return-code-of-BN_div.patch: fix coverity finding

Signed-off-by: Christian Ehrhardt <email address hidden>

655b6b5... by Christian Ehrhardt  on 2022-04-01

changelog: fix coverity finding

Signed-off-by: Christian Ehrhardt <email address hidden>

[Christian Ehrhardt  (paelzer)]

Rebuilds, Sanity tests and autopkgtests with the new version worked well.
Uploading to get this ready for promotion to main next week.

https://autopkgtest.ubuntu.com/results/autopkgtest-jammy-paelzer-libtpms-jammy-0.9.3/jammy/amd64/s/swtpm/20220401_082349_d55dd@/log.gz
https://autopkgtest.ubuntu.com/results/autopkgtest-jammy-paelzer-libtpms-jammy-0.9.3/jammy/s390x/s/swtpm/20220401_082451_d55dd@/log.gz

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading libtpms_0.9.3-0ubuntu1.dsc: done.
  Uploading libtpms_0.9.3.orig.tar.gz: done.
  Uploading libtpms_0.9.3-0ubuntu1.debian.tar.xz: done.
  Uploading libtpms_0.9.3-0ubuntu1_source.buildinfo: done.
  Uploading libtpms_0.9.3-0ubuntu1_source.changes: done.
Successfully uploaded packages.

diff --git a/CHANGES b/CHANGES
index 3030ad1..cc29036 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,17 @@
 CHANGES - changes for libtpms
 
+version 0.9.3:
+  - build-sys: Add probing for -fstack-protector
+  - tpm2: Do not call EVP_PKEY_CTX_set0_rsa_oaep_label() for label of size
+    (OSSL 3)
+
+version 0.9.2:
+  - tpm2: When writing state initialize s_ContextSlotMask if not set
+
+version 0.9.1:
+  - tpm2: Do not write permanent state if only clock changed
+  - tpm2: Fix "maybe-uninitialized" warning
+
 version 0.9.0:
   - NOTE: Downgrade to previous versions is not possible. See below.
   - The size of the context gap has been adjusted to 0xffff from 0xff.
diff --git a/configure.ac b/configure.ac
index 5f995a8..3fbdf67 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
 #
 # See the LICENSE file for the license associated with this file.
 
-AC_INIT([libtpms],[0.9.0])
+AC_INIT([libtpms],[0.9.3])
 AC_PREREQ([2.69])
 AC_CONFIG_SRCDIR(Makefile.am)
 AC_CONFIG_AUX_DIR([.])
@@ -284,10 +284,12 @@ AC_ARG_ENABLE([hardening],
   AS_HELP_STRING([--disable-hardening], [Disable hardening flags]))
 
 if test "x$enable_hardening" != "xno"; then
-	# Some versions of gcc fail with -Wstack-protector enabled
-	TMP="$($CC -fstack-protector-strong $srcdir/include/libtpms/tpm_error.h 2>&1)"
-	if echo $TMP | $GREP 'unrecognized command line option' >/dev/null; then
-		HARDENING_CFLAGS="-fstack-protector "
+	# Some versions of gcc fail with -Wstack-protector,
+	# some with -Wstack-protector-strong enabled
+	if ! $CC -fstack-protector-strong $srcdir/include/libtpms/tpm_error.h 2>/dev/null; then
+		if $CC -fstack-protector $srcdir/include/libtpms/tpm_error.h 2>/dev/null; then
+			HARDENING_CFLAGS="-fstack-protector "
+		fi
 	else
 		HARDENING_CFLAGS="-fstack-protector-strong "
 	fi
diff --git a/debian/changelog b/debian/changelog
index 171710d..39a3019 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+libtpms (0.9.3-0ubuntu1) jammy; urgency=medium
+
+  * merge 0.9.3 from upstram to stabilize libtpms in jammy; related to
+    but not fixing (LP: 1948748)
+    - d/p/lp-1948748-tpm2-Address-Coverity-Issue-by-casting-1-before-shif.patch:
+      avoid bad shift
+    - drop d/p/fix-openssl3-compat.patch: part of 0.9.3
+    - drop d/p/uninitialized-variable.patch: no more needed
+    - ppc64 fixes from upstream as identified and added to debian 0.9.2-3
+      + d/p/do_not_inline_makeiv.patch
+      + d/p/no_local_check.patch
+    - d/p/lp-1948748-tpm2-Check-return-code-of-BN_div.patch: fix
+      coverity finding
+
+ -- Christian Ehrhardt <[e-mail]>  Wed, 30 Mar 2022 09:04:10 +0200
+
 libtpms (0.9.0-0ubuntu4) jammy; urgency=medium
 
   * d/p/fix-openssl3-compat.patch: Cherry-picked from upstream (LP: #1962601)
diff --git a/debian/patches/do_not_inline_makeiv.patch b/debian/patches/do_not_inline_makeiv.patch
new file mode 100644
index 0000000..06bf2d0
--- /dev/null
+++ b/debian/patches/do_not_inline_makeiv.patch
@@ -0,0 +1,23 @@
+Description: Do not inline MakeIV due toppc64 compiler issue
+ The ppc64 gcc compiler has an issue with MakeIv.
+Forwarded: no
+X-Not-Forwarded-Reason: only needed for a gcc bug in Ubuntu
+Origin: https://github.com/stefanberger/libtpms/issues/297
+Last-Update: 2022-03-30
+
+---
+ src/tpm2/AlgorithmTests.c |    3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/src/tpm2/AlgorithmTests.c
++++ b/src/tpm2/AlgorithmTests.c
+@@ -179,6 +179,9 @@
+ /* 10.2.1.4.1 MakeIv() */
+ /* Internal function to make the appropriate IV depending on the mode. */
+ static UINT32
++#if defined(__powerpc64__)
++__attribute__((noinline))
++#endif
+ MakeIv(
+        TPM_ALG_ID    mode,     // IN: symmetric mode
+        UINT32        size,     // IN: block size of the algorithm
diff --git a/debian/patches/fix-openssl3-compat.patch b/debian/patches/fix-openssl3-compat.patch
deleted file mode 100644
index e318f12..0000000
--- a/debian/patches/fix-openssl3-compat.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From e4261984374556da65c9d46097d5a1200b335c0c Mon Sep 17 00:00:00 2001
-From: Juergen Repp <[e-mail]>
-Date: Sat, 19 Feb 2022 12:59:32 +0100
-Origin: https://github.com/stefanberger/libtpms/pull/294
-Subject: [PATCH] tpm2: Do not call EVP_PKEY_CTX_set0_rsa_oaep_label() for
- label of size 0 (OSSL 3)
-
-Openssl 3.0 did return an error if EVP_PKEY_CTX_set0_rsa_oaep_label was called
-with label size 0. The function should only be called if the size of the label
-is greater 0.
-With this fix TPM2_RSA_Encrypt/Decrypt did work with OpenSSL 1.1 and 3.0
-for encryption without label.
-
-Signed-off-by: Juergen Repp <[e-mail]>
----
- src/tpm2/crypto/openssl/CryptRsa.c | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/src/tpm2/crypto/openssl/CryptRsa.c b/src/tpm2/crypto/openssl/CryptRsa.c
-index 4ed04384f..b5d6b6c3b 100644
---- a/src/tpm2/crypto/openssl/CryptRsa.c
-+++ b/src/tpm2/crypto/openssl/CryptRsa.c
-@@ -1356,10 +1356,9 @@ CryptRsaEncrypt(
-                 if (tmp == NULL)
-                     ERROR_RETURN(TPM_RC_FAILURE);
-                 memcpy(tmp, label->buffer, label->size);
-+                if (EVP_PKEY_CTX_set0_rsa_oaep_label(ctx, tmp, label->size) <= 0)
-+                    ERROR_RETURN(TPM_RC_FAILURE);
-             }
--            // label->size == 0 is supported
--            if (EVP_PKEY_CTX_set0_rsa_oaep_label(ctx, tmp, label->size) <= 0)
--                ERROR_RETURN(TPM_RC_FAILURE);
-             tmp = NULL;
-             break;
-           default:
diff --git a/debian/patches/lp-1948748-tpm2-Address-Coverity-Issue-by-casting-1-before-shif.patch b/debian/patches/lp-1948748-tpm2-Address-Coverity-Issue-by-casting-1-before-shif.patch
new file mode 100644
index 0000000..8d90d3e
--- /dev/null
+++ b/debian/patches/lp-1948748-tpm2-Address-Coverity-Issue-by-casting-1-before-shif.patch
@@ -0,0 +1,37 @@
+From d78a4520ba3157087e1e438b519618f26d85fae3 Mon Sep 17 00:00:00 2001
+From: Stefan Berger <[e-mail]>
+Date: Wed, 16 Feb 2022 11:49:11 -0500
+Subject: [PATCH] tpm2: Address Coverity Issue by casting '1' before shift (CID
+ 1470813)
+
+Cast the '1' to UINT64 before shifting it.
+
+Since the shift value is always below 32 it would have never exceeded
+the 32bit value it was using before the cast.
+
+Signed-off-by: Stefan Berger <[e-mail]>
+
+Origin: upstream, https://github.com/stefanberger/libtpms/commit/d78a4520ba31
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1948748
+Last-Update: 2022-03-30
+
+---
+ src/tpm2/NVMarshal.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/tpm2/NVMarshal.c b/src/tpm2/NVMarshal.c
+index c7cd1e0..cdac3e2 100644
+--- a/src/tpm2/NVMarshal.c
++++ b/src/tpm2/NVMarshal.c
+@@ -806,7 +806,7 @@ pcrbanks_algs_active(const TPML_PCR_SELECTION *pcrAllocated)
+     for(i = 0; i < pcrAllocated->count; i++) {
+         for (j = 0; j < pcrAllocated->pcrSelections[i].sizeofSelect; j++) {
+             if (pcrAllocated->pcrSelections[i].pcrSelect[j]) {
+-                algs_active |= 1 << pcrAllocated->pcrSelections[i].hash;
++                algs_active |= ((UINT64)1 << pcrAllocated->pcrSelections[i].hash);
+                 break;
+             }
+         }
+-- 
+2.35.1
+
diff --git a/debian/patches/lp-1948748-tpm2-Check-return-code-of-BN_div.patch b/debian/patches/lp-1948748-tpm2-Check-return-code-of-BN_div.patch
new file mode 100644
index 0000000..9fb17e6
--- /dev/null
+++ b/debian/patches/lp-1948748-tpm2-Check-return-code-of-BN_div.patch
@@ -0,0 +1,36 @@
+From 897c8f869754d01639741cecf9fee8f0a7b5d740 Mon Sep 17 00:00:00 2001
+From: Stefan Berger <[e-mail]>
+Date: Wed, 30 Mar 2022 10:14:51 -0400
+Subject: [PATCH] tpm2: Check return code of BN_div()
+
+Check the return code of BN_div() when calculating Q and Qr of
+a private key.
+
+Resolves: https://github.com/stefanberger/libtpms/issues/304
+Signed-off-by: Stefan Berger <[e-mail]>
+
+Origin: upstream, https://github.com/stefanberger/libtpms/commit/897c8f869754
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1948748
+Last-Update: 2022-04-01
+
+---
+ src/tpm2/crypto/openssl/Helpers.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/src/tpm2/crypto/openssl/Helpers.c b/src/tpm2/crypto/openssl/Helpers.c
+index f47cdbf..a923436 100644
+--- a/src/tpm2/crypto/openssl/Helpers.c
++++ b/src/tpm2/crypto/openssl/Helpers.c
+@@ -521,8 +521,7 @@ InitOpenSSLRSAPrivateKey(OBJECT     *rsaKey,   // IN
+             ERROR_RETURN(TPM_RC_FAILURE);
+         /* Q = N/P; no remainder */
+         BN_set_flags(P, BN_FLG_CONSTTIME); // P is secret
+-        BN_div(Q, Qr, N, P, ctx);
+-        if(!BN_is_zero(Qr))
++        if (!BN_div(Q, Qr, N, P, ctx) || !BN_is_zero(Qr))
+             ERROR_RETURN(TPM_RC_BINDING);
+         BN_set_flags(Q, BN_FLG_CONSTTIME); // Q is secret
+ 
+-- 
+2.35.1
+
diff --git a/debian/patches/no_local_check.patch b/debian/patches/no_local_check.patch
new file mode 100644
index 0000000..0e6f1da
--- /dev/null
+++ b/debian/patches/no_local_check.patch
@@ -0,0 +1,26 @@
+Description: Do not run check-local due to bug in ppc64 gcc on Jammy
+
+ppc64 gcc has a bug causing issued in check-local.
+Therefore, do not run check-local while ppc64 gcc is broken
+on Ubuntu Jammy.
+
+Forwarded: no
+X-Not-Forwarded-Reason: only needed for a gcc bug in Ubuntu
+Origin: https://github.com/stefanberger/libtpms/issues/298
+Last-Update: 2022-03-30
+
+---
+ src/Makefile.am |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -599,7 +599,7 @@
+ LDFLAGS_ARCH += $(findstring -m64, $(AM_LDFLAGS))
+ 
+ check-local: SHELL?="/usr/bin/env bash"
+-check-local:
++NO-check-local:
+ 	@case $(host_os) in \
+ 	  openbsd*) ADDLIBS="-lc" ;; \
+ 	  darwin*|freebsd*) LDFLAGS_OS="-shared" ;; \
diff --git a/debian/patches/series b/debian/patches/series
index 06acd6e..363903c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,7 @@
 0002-fix-man-page-longline-typo.patch
 0003-set-man-page-date-to-last-changelog.patch
 0004-fix-ftbfs-bug.patch
-uninitialized-variable.patch
-fix-openssl3-compat.patch
+lp-1948748-tpm2-Address-Coverity-Issue-by-casting-1-before-shif.patch
+do_not_inline_makeiv.patch
+no_local_check.patch
+lp-1948748-tpm2-Check-return-code-of-BN_div.patch
diff --git a/debian/patches/uninitialized-variable.patch b/debian/patches/uninitialized-variable.patch
deleted file mode 100644
index 3b17222..0000000
--- a/debian/patches/uninitialized-variable.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Description: fix issues of variables that may be used before initialization
- Detected by gcc on Ubuntu/s390x
-Author: Steve Langasek <[e-mail]>
-Last-Update: 2020-12-09
-
-Index: libtpms-0.8.2-1ubuntu1/src/tpm12/tpm_nvram.c
-===================================================================
---- libtpms-0.8.2-1ubuntu1.orig/src/tpm12/tpm_nvram.c
-+++ libtpms-0.8.2-1ubuntu1/src/tpm12/tpm_nvram.c
-@@ -1290,7 +1290,7 @@
-     TPM_BOOL			physicalPresence;
-     TPM_BOOL			isGPIO = FALSE;
-     BYTE 			*gpioData = NULL;
--    TPM_NV_DATA_SENSITIVE	*d1NvdataSensitive;
-+    TPM_NV_DATA_SENSITIVE	*d1NvdataSensitive = NULL;
-     uint32_t			s1Last;
-     
-     /* output parameters  */
-Index: libtpms-0.8.2-1ubuntu1/src/tpm2/Marshal.c
-===================================================================
---- libtpms-0.8.2-1ubuntu1.orig/src/tpm2/Marshal.c
-+++ libtpms-0.8.2-1ubuntu1/src/tpm2/Marshal.c
-@@ -2193,7 +2193,7 @@
- TPM2B_NV_PUBLIC_Marshal(TPM2B_NV_PUBLIC *source, BYTE **buffer, INT32 *size)
- {
-     UINT16 written = 0;
--    BYTE *sizePtr;
-+    BYTE *sizePtr = NULL;
- 
-     if (buffer != NULL) {
- 	sizePtr = *buffer;
diff --git a/dist/libtpms.spec b/dist/libtpms.spec
index 65a00ad..8635d17 100644
--- a/dist/libtpms.spec
+++ b/dist/libtpms.spec
@@ -1,7 +1,7 @@
 # --- libtpm rpm-spec ---
 
 %define name      libtpms
-%define version   0.9.0
+%define version   0.9.3
 %define release   0~dev1
 
 # Valid crypto subsystems are 'freebl' and 'openssl'
@@ -112,6 +112,15 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libtpms.la
 %postun -p /sbin/ldconfig
 
 %changelog
+* Mon Mar 07 2022 Stefan Berger - 0.9.3-1
+- Release of version 0.9.3
+
+* Thu Jan 06 2022 Stefan Berger - 0.9.2-1
+- Release of version 0.9.2
+
+* Wed Nov 24 2021 Stefan Berger - 0.9.1-1
+- Release of version 0.9.1
+
 * Wed Sep 29 2021 Stefan Berger - 0.9.0-1
 - Release of version 0.9.0 (rev. 164)
 
diff --git a/dist/libtpms.spec.in b/dist/libtpms.spec.in
index 79ac663..78546d6 100644
--- a/dist/libtpms.spec.in
+++ b/dist/libtpms.spec.in
@@ -112,6 +112,15 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libtpms.la
 %postun -p /sbin/ldconfig
 
 %changelog
+* Mon Mar 07 2022 Stefan Berger - 0.9.3-1
+- Release of version 0.9.3
+
+* Thu Jan 06 2022 Stefan Berger - 0.9.2-1
+- Release of version 0.9.2
+
+* Wed Nov 24 2021 Stefan Berger - 0.9.1-1
+- Release of version 0.9.1
+
 * Wed Sep 29 2021 Stefan Berger - 0.9.0-1
 - Release of version 0.9.0 (rev. 164)
 
diff --git a/include/libtpms/tpm_library.h b/include/libtpms/tpm_library.h
index 3c7d23d..181e226 100644
--- a/include/libtpms/tpm_library.h
+++ b/include/libtpms/tpm_library.h
@@ -50,7 +50,7 @@ extern "C" {
 
 #define TPM_LIBRARY_VER_MAJOR 0
 #define TPM_LIBRARY_VER_MINOR 9
-#define TPM_LIBRARY_VER_MICRO 0
+#define TPM_LIBRARY_VER_MICRO 3
 
 #define TPM_LIBRARY_VERSION_GEN(MAJ, MIN, MICRO) \
     (( MAJ << 16 ) | ( MIN << 8 ) | ( MICRO ))
diff --git a/src/tpm2/NVMarshal.c b/src/tpm2/NVMarshal.c
index 2173e41..c7cd1e0 100644
--- a/src/tpm2/NVMarshal.c
+++ b/src/tpm2/NVMarshal.c
@@ -1422,6 +1422,11 @@ STATE_RESET_DATA_Marshal(STATE_RESET_DATA *data, BYTE **buffer, INT32 *size)
     written += UINT16_Marshal(&array_size, buffer, size);
     for (i = 0; i < array_size; i++)
         written += UINT16_Marshal(&data->contextArray[i], buffer, size);
+
+    if (s_ContextSlotMask != 0x00ff && s_ContextSlotMask != 0xffff) {
+        /* TPM wasn't initialized, so s_ContextSlotMask wasn't set */
+        s_ContextSlotMask = 0xffff;
+    }
     written += UINT16_Marshal(&s_ContextSlotMask, buffer, size);
 
     written += UINT64_Marshal(&data->contextCounter, buffer, size);
@@ -3880,7 +3885,7 @@ PACompileConstants_Unmarshal(BYTE **buffer, INT32 *size)
     unsigned i;
     NV_HEADER hdr;
     UINT32 array_size;
-    UINT32 exp_array_size;
+    UINT32 exp_array_size = 0;
 
     if (rc == TPM_RC_SUCCESS) {
         rc = NV_HEADER_Unmarshal(&hdr, buffer, size,
diff --git a/src/tpm2/Time.c b/src/tpm2/Time.c
index d13d744..9ff1bb5 100644
--- a/src/tpm2/Time.c
+++ b/src/tpm2/Time.c
@@ -136,7 +136,16 @@ TimeClockUpdate(
 	    go.clockSafe = YES;
 	    // update the time
 	    go.clock = newTime;
+
+	    /* libtpms: Changing the clock alone does not cause the permanent
+	     *          state to be written to storage, there must be other
+	     *          reasons as well.
+	     */
+	    UPDATE_TYPE old_g_updateNV = g_updateNV;	// libtpms added
+
 	    NvWrite(NV_ORDERLY_DATA, sizeof(go), &go);
+
+	    g_updateNV = old_g_updateNV;		// libtpms added
 	}
     else
 	// No NV update needed so just update
diff --git a/src/tpm2/crypto/openssl/CryptRsa.c b/src/tpm2/crypto/openssl/CryptRsa.c
index 4ed0438..b5d6b6c 100644
--- a/src/tpm2/crypto/openssl/CryptRsa.c
+++ b/src/tpm2/crypto/openssl/CryptRsa.c
@@ -1356,10 +1356,9 @@ CryptRsaEncrypt(
                 if (tmp == NULL)
                     ERROR_RETURN(TPM_RC_FAILURE);
                 memcpy(tmp, label->buffer, label->size);
+                if (EVP_PKEY_CTX_set0_rsa_oaep_label(ctx, tmp, label->size) <= 0)
+                    ERROR_RETURN(TPM_RC_FAILURE);
             }
-            // label->size == 0 is supported
-            if (EVP_PKEY_CTX_set0_rsa_oaep_label(ctx, tmp, label->size) <= 0)
-                ERROR_RETURN(TPM_RC_FAILURE);
             tmp = NULL;
             break;
           default: