From a2347328e1019039434669f661c2a596a1eaba39 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Dec 07 2021 19:05:39 +0000 Subject: import tpm2-tss-3.0.3-6.el9 --- diff --git a/SOURCES/0001-FAPI-Fix-reading-of-the-root-certificate-for-provisi.patch b/SOURCES/0001-FAPI-Fix-reading-of-the-root-certificate-for-provisi.patch new file mode 100644 index 0000000..7bc8738 --- /dev/null +++ b/SOURCES/0001-FAPI-Fix-reading-of-the-root-certificate-for-provisi.patch @@ -0,0 +1,61 @@ +From c14bd543879f2336e57aa2dff0b437407d858272 Mon Sep 17 00:00:00 2001 +From: Juergen Repp +Date: Fri, 19 Feb 2021 14:32:45 +0100 +Subject: FAPI: Fix reading of the root certificate for + provisioning. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +* The root certificate defined by the environment variable FAPI_TEST_ROOT_CERT will + only be used if it's allowed to use self generated root certificate with + ./configure --enable-self-generated-certificate + +* This option is added to all integration tests which are using the TPM simulator. + + - Compared to the upstream commit 199b4edc the changes to CI config files + are omitted. + +Signed-off-by: Juergen Repp +--- + configure.ac | 8 ++++++++ + src/tss2-fapi/api/Fapi_Provision.c | 4 ++++ + 2 files changed, 12 insertions(+) + +diff --git a/configure.ac b/configure.ac +index f4df879c..d3bbb93d 100755 +--- a/configure.ac ++++ b/configure.ac +@@ -440,6 +440,14 @@ AC_ARG_ENABLE([weakcrypto], + AS_IF([test "x$enable_weakcrypto" = "xyes"], + AC_DEFINE([DISABLE_WEAK_CRYPTO],[1],[DISABLE WEAK CRYPTO ALGORITHMS])) + ++AC_ARG_ENABLE([self-generated-certificate], ++ [AS_HELP_STRING([--enable-self-generated-certificate], ++ [Alllow usage of self generated root certifcate])],, ++ [enable_self_generated_certificate=no]) ++AS_IF([test "x$enable_self_generated_certificate" == xyes], ++ [AC_DEFINE([SELF_GENERATED_CERTIFICATE],[1], [Allow usage of self generated root certifcate])]) ++ ++ + AC_SUBST([PATH]) + + dnl --------- Doxy Gen ----------------------- +diff --git a/src/tss2-fapi/api/Fapi_Provision.c b/src/tss2-fapi/api/Fapi_Provision.c +index 00534a2e..9cf804ad 100644 +--- a/src/tss2-fapi/api/Fapi_Provision.c ++++ b/src/tss2-fapi/api/Fapi_Provision.c +@@ -797,7 +797,11 @@ Fapi_Provision_Finish(FAPI_CONTEXT *context) + + statecase(context->state, PROVISION_PREPARE_READ_ROOT_CERT); + /* Prepare reading of root certificate. */ ++ root_ca_file = NULL; ++#ifdef SELF_GENERATED_CERTIFICATE ++#pragma message ( "*** Allow self generated certifcate ***" ) + root_ca_file = getenv("FAPI_TEST_ROOT_CERT"); ++#endif + if (!root_ca_file) { + context->state = PROVISION_EK_CHECK_CERT; + return TSS2_FAPI_RC_TRY_AGAIN; +-- +2.26.3 diff --git a/SOURCES/0002-FAPI-use-FAPI_TEST_EK_CERT_LESS-with-disable-self-ge.patch b/SOURCES/0002-FAPI-use-FAPI_TEST_EK_CERT_LESS-with-disable-self-ge.patch new file mode 100644 index 0000000..af47f2d --- /dev/null +++ b/SOURCES/0002-FAPI-use-FAPI_TEST_EK_CERT_LESS-with-disable-self-ge.patch @@ -0,0 +1,42 @@ +From d680ea548b3ab066f6bea625af5d4000ca32cfee Mon Sep 17 00:00:00 2001 +From: Jonas Witschel +Date: Mon, 1 Mar 2021 20:00:17 +0100 +Subject: FAPI: use FAPI_TEST_EK_CERT_LESS with + --disable-self-generated-certificate +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Since commit 199b4edc265b2f4758aa22ebf4ed6472a34b9a7a ("FAPI: Fix reading of +the root certificate for provisioning.") it is required to specify +--enable-self-generated-certificate in order to make the FAPI integration tests +pass. This is an option that should usually not be enabled in production builds +for security reasons, but still some form of integration testing might be +desirable in this case to verify whether the compiled library works as +expected. Use FAPI_TEST_EK_CERT_LESS in this case to run the tests without EK +certificate validation. + +Signed-off-by: Jonas Witschel +--- + configure.ac | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index d3bbb93d..d4324c9a 100755 +--- a/configure.ac ++++ b/configure.ac +@@ -444,8 +444,9 @@ AC_ARG_ENABLE([self-generated-certificate], + [AS_HELP_STRING([--enable-self-generated-certificate], + [Alllow usage of self generated root certifcate])],, + [enable_self_generated_certificate=no]) +-AS_IF([test "x$enable_self_generated_certificate" == xyes], +- [AC_DEFINE([SELF_GENERATED_CERTIFICATE],[1], [Allow usage of self generated root certifcate])]) ++AS_IF([test "x$enable_self_generated_certificate" = xyes], ++ [AC_DEFINE([SELF_GENERATED_CERTIFICATE], [1], [Allow usage of self generated root certificate])], ++ [AS_IF([test "x$integration_tcti" != "xdevice"], [AC_DEFINE([FAPI_TEST_EK_CERT_LESS], [1], [Perform integration tests without EK certificate verification])])]) + + + AC_SUBST([PATH]) +-- +2.26.3 + diff --git a/SOURCES/0003-Makefile.am-Use-LIBCRYPTO_CFLAGS-when-building-FAPI.patch b/SOURCES/0003-Makefile.am-Use-LIBCRYPTO_CFLAGS-when-building-FAPI.patch new file mode 100644 index 0000000..3da7764 --- /dev/null +++ b/SOURCES/0003-Makefile.am-Use-LIBCRYPTO_CFLAGS-when-building-FAPI.patch @@ -0,0 +1,29 @@ +From c5933320e1bd557cc52f2d56baec4ea52edfbc47 Mon Sep 17 00:00:00 2001 +From: Petr Gotthard +Date: Sat, 17 Jul 2021 20:15:51 +0200 +Subject: Makefile.am: Use LIBCRYPTO_CFLAGS when building FAPI +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Petr Gotthard +--- + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index f2fa515a..0f759adb 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -521,7 +521,7 @@ src_tss2_fapi_libtss2_fapi_la_LIBADD = $(libtss2_sys) $(libtss2_mu) $(libtss2_e + $(libutil) $(libtss2_tctildr) + + src_tss2_fapi_libtss2_fapi_la_SOURCES = $(TSS2_FAPI_SRC) +-src_tss2_fapi_libtss2_fapi_la_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/src/tss2-fapi ++src_tss2_fapi_libtss2_fapi_la_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/src/tss2-fapi $(LIBCRYPTO_CFLAGS) + src_tss2_fapi_libtss2_fapi_la_LDFLAGS = $(AM_LDFLAGS) $(LIBCRYPTO_LIBS) $(JSONC_LIBS) $(CURL_LIBS) + if HAVE_LD_VERSION_SCRIPT + src_tss2_fapi_libtss2_fapi_la_LDFLAGS += -Wl,--version-script=$(srcdir)/lib/tss2-fapi.map +-- +2.26.3 + diff --git a/SOURCES/0004-Test-Remove-duplicate-openssl-req-new.patch b/SOURCES/0004-Test-Remove-duplicate-openssl-req-new.patch new file mode 100644 index 0000000..a8c4d23 --- /dev/null +++ b/SOURCES/0004-Test-Remove-duplicate-openssl-req-new.patch @@ -0,0 +1,35 @@ +From 738f6f045e740c3fc21579297990d60b7c2e83ed Mon Sep 17 00:00:00 2001 +From: Petr Gotthard +Date: Sat, 17 Jul 2021 20:23:32 +0200 +Subject: Test: Remove duplicate openssl req -new +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The command is called twice, which is superfluous. Both the key +and the certificate are created already by the first command. + +Signed-off-by: Petr Gotthard +--- + script/ekca/create_ca.sh | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/script/ekca/create_ca.sh b/script/ekca/create_ca.sh +index 90a5c791..61d976a3 100755 +--- a/script/ekca/create_ca.sh ++++ b/script/ekca/create_ca.sh +@@ -94,11 +94,6 @@ ${SED_CMD} "s|ROOTCRT|$ROOT_URL|g" $OPENSSL_CONF + + openssl req -new -out intermed-ca.req.pem -passout file:pass.txt + +-openssl req -new \ +- -key private/intermed-ca.key.pem \ +- -out intermed-ca.req.pem \ +- -passin file:pass.txt +- + openssl rsa -inform PEM -in private/intermed-ca.key.pem \ + -outform DER -out private/intermed-ca.key.der -passin file:pass.txt + +-- +2.26.3 + diff --git a/SOURCES/0005-FAPI-Test-Call-EVP_DigestSignInit-in-the-correct-ord.patch b/SOURCES/0005-FAPI-Test-Call-EVP_DigestSignInit-in-the-correct-ord.patch new file mode 100644 index 0000000..206f5de --- /dev/null +++ b/SOURCES/0005-FAPI-Test-Call-EVP_DigestSignInit-in-the-correct-ord.patch @@ -0,0 +1,76 @@ +From 563f9c951d9b050378b9d3659a932c98ab587b21 Mon Sep 17 00:00:00 2001 +From: Petr Gotthard +Date: Sat, 17 Jul 2021 21:22:28 +0200 +Subject: FAPI Test: Call EVP_DigestSignInit in the correct order +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The EVP_DigestSignInit should be called only once and before calling +EVP_PKEY_CTX_set_rsa_padding. See a corresponding example +[here](https://www.openssl.org/docs/man1.0.2/man3/EVP_PKEY_sign_init.html) + +Current code works with OpenSSL 1.x, but fails with OpenSSL 3.0. +This PR makes the code compatible with OpenSSL 1.0 through 3.0. + +Signed-off-by: Petr Gotthard +--- + test/integration/fapi-data-crypt.int.c | 8 ++------ + test/integration/fapi-key-create-policy-signed.int.c | 8 ++------ + 2 files changed, 4 insertions(+), 12 deletions(-) + +diff --git a/test/integration/fapi-data-crypt.int.c b/test/integration/fapi-data-crypt.int.c +index b2d20b28..d42466db 100644 +--- a/test/integration/fapi-data-crypt.int.c ++++ b/test/integration/fapi-data-crypt.int.c +@@ -129,8 +129,8 @@ signatureCallback( + mdctx = EVP_MD_CTX_create(); + chknull(mdctx); + +- if (1 != EVP_DigestSignInit(mdctx, &pctx, NULL, NULL, priv_key)) { +- goto_error(r, TSS2_FAPI_RC_GENERAL_FAILURE, "OSSL digest sign init.", ++ if (1 != EVP_DigestSignInit(mdctx, &pctx, ossl_hash, NULL, priv_key)) { ++ goto_error(r, TSS2_FAPI_RC_GENERAL_FAILURE, "OSSL sign init.", + error_cleanup); + } + if (EVP_PKEY_type(EVP_PKEY_id(priv_key)) == EVP_PKEY_RSA) { +@@ -140,10 +140,6 @@ signatureCallback( + error_cleanup); + } + } +- if (1 != EVP_DigestSignInit(mdctx, &pctx, ossl_hash, NULL, priv_key)) { +- goto_error(r, TSS2_FAPI_RC_GENERAL_FAILURE, "OSSL sign init.", +- error_cleanup); +- } + if (1 != EVP_DigestSignUpdate(mdctx, dataToSign, dataToSignSize)) { + goto_error(r, TSS2_FAPI_RC_GENERAL_FAILURE, "OSSL sign update.", + error_cleanup); +diff --git a/test/integration/fapi-key-create-policy-signed.int.c b/test/integration/fapi-key-create-policy-signed.int.c +index e51289a6..b903dec0 100644 +--- a/test/integration/fapi-key-create-policy-signed.int.c ++++ b/test/integration/fapi-key-create-policy-signed.int.c +@@ -144,8 +144,8 @@ signatureCallback( + mdctx = EVP_MD_CTX_create(); + chknull(mdctx); + +- if (1 != EVP_DigestSignInit(mdctx, &pctx, NULL, NULL, priv_key)) { +- goto_error(r, TSS2_FAPI_RC_GENERAL_FAILURE, "OSSL digest sign init.", ++ if (1 != EVP_DigestSignInit(mdctx, &pctx, ossl_hash, NULL, priv_key)) { ++ goto_error(r, TSS2_FAPI_RC_GENERAL_FAILURE, "OSSL sign init.", + error_cleanup); + } + if (EVP_PKEY_type(EVP_PKEY_id(priv_key)) == EVP_PKEY_RSA) { +@@ -155,10 +155,6 @@ signatureCallback( + error_cleanup); + } + } +- if (1 != EVP_DigestSignInit(mdctx, &pctx, ossl_hash, NULL, priv_key)) { +- goto_error(r, TSS2_FAPI_RC_GENERAL_FAILURE, "OSSL sign init.", +- error_cleanup); +- } + if (1 != EVP_DigestSignUpdate(mdctx, dataToSign, dataToSignSize)) { + goto_error(r, TSS2_FAPI_RC_GENERAL_FAILURE, "OSSL sign update.", + error_cleanup); +-- +2.26.3 + diff --git a/SOURCES/0006-FAPI-Test-Use-EVP_PKEY_base_id-to-detect-key-type.patch b/SOURCES/0006-FAPI-Test-Use-EVP_PKEY_base_id-to-detect-key-type.patch new file mode 100644 index 0000000..9d51715 --- /dev/null +++ b/SOURCES/0006-FAPI-Test-Use-EVP_PKEY_base_id-to-detect-key-type.patch @@ -0,0 +1,47 @@ +From 6e9c46f8c3bf91aac51b668fa78c3173c885760c Mon Sep 17 00:00:00 2001 +From: Petr Gotthard +Date: Sat, 17 Jul 2021 21:29:25 +0200 +Subject: FAPI Test: Use EVP_PKEY_base_id to detect key type +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The EVP_PKEY_base_id is the right way to detect key type, used also +by OpenSSL itself. +This function is available since OpenSSL 1.0.0. + +Signed-off-by: Petr Gotthard +--- + test/integration/fapi-data-crypt.int.c | 2 +- + test/integration/fapi-key-create-policy-signed.int.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/test/integration/fapi-data-crypt.int.c b/test/integration/fapi-data-crypt.int.c +index d42466db..a95cc9ef 100644 +--- a/test/integration/fapi-data-crypt.int.c ++++ b/test/integration/fapi-data-crypt.int.c +@@ -133,7 +133,7 @@ signatureCallback( + goto_error(r, TSS2_FAPI_RC_GENERAL_FAILURE, "OSSL sign init.", + error_cleanup); + } +- if (EVP_PKEY_type(EVP_PKEY_id(priv_key)) == EVP_PKEY_RSA) { ++ if (EVP_PKEY_base_id(priv_key) == EVP_PKEY_RSA) { + int signing_scheme = RSA_SIG_SCHEME; + if (1 != EVP_PKEY_CTX_set_rsa_padding(pctx, signing_scheme)) { + goto_error(r, TSS2_FAPI_RC_GENERAL_FAILURE, "OSSL set RSA padding.", +diff --git a/test/integration/fapi-key-create-policy-signed.int.c b/test/integration/fapi-key-create-policy-signed.int.c +index b903dec0..8f917d35 100644 +--- a/test/integration/fapi-key-create-policy-signed.int.c ++++ b/test/integration/fapi-key-create-policy-signed.int.c +@@ -148,7 +148,7 @@ signatureCallback( + goto_error(r, TSS2_FAPI_RC_GENERAL_FAILURE, "OSSL sign init.", + error_cleanup); + } +- if (EVP_PKEY_type(EVP_PKEY_id(priv_key)) == EVP_PKEY_RSA) { ++ if (EVP_PKEY_base_id(priv_key) == EVP_PKEY_RSA) { + int signing_scheme = RSA_SIG_SCHEME; + if (1 != EVP_PKEY_CTX_set_rsa_padding(pctx, signing_scheme)) { + goto_error(r, TSS2_FAPI_RC_GENERAL_FAILURE, "OSSL set RSA padding.", +-- +2.26.3 + diff --git a/SOURCES/0007-FAPI-Test-Change-RSA_sign-to-EVP_PKEY_sign.patch b/SOURCES/0007-FAPI-Test-Change-RSA_sign-to-EVP_PKEY_sign.patch new file mode 100644 index 0000000..350fdc7 --- /dev/null +++ b/SOURCES/0007-FAPI-Test-Change-RSA_sign-to-EVP_PKEY_sign.patch @@ -0,0 +1,100 @@ +From 9ca735ab8f71a6b64f31867e55d43f3f5a51bfec Mon Sep 17 00:00:00 2001 +From: Petr Gotthard +Date: Sun, 18 Jul 2021 11:54:50 +0200 +Subject: FAPI Test: Change RSA_sign to EVP_PKEY_sign +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The EVP_PKEY_sign functions are available since OpenSSL 1.0.0. +The RSA_sign function is deprecated in OpenSSL 3.0.0. + +This PR should work with OpenSSL 1.0.0 through 3.0.0. + +Signed-off-by: Petr Gotthard +--- + test/integration/fapi-ext-public-key.int.c | 38 +++++++++++----------- + 1 file changed, 19 insertions(+), 19 deletions(-) + +diff --git a/test/integration/fapi-ext-public-key.int.c b/test/integration/fapi-ext-public-key.int.c +index 363c58b7..971d7897 100644 +--- a/test/integration/fapi-ext-public-key.int.c ++++ b/test/integration/fapi-ext-public-key.int.c +@@ -49,7 +49,7 @@ test_fapi_ext_public_key(FAPI_CONTEXT *context) + BIO *bufio = NULL; + + EVP_PKEY *evp_key = NULL; +- RSA *rsa_key = NULL; ++ EVP_PKEY_CTX *ctx = NULL; + + /* Key will be used for non TPM signature verfication. */ + char *pubkey_pem = +@@ -186,10 +186,8 @@ test_fapi_ext_public_key(FAPI_CONTEXT *context) + + bufio = BIO_new_mem_buf((void *)priv_pem, strlen(priv_pem)); + evp_key = PEM_read_bio_PrivateKey(bufio, NULL, NULL, NULL); +- rsa_key = EVP_PKEY_get1_RSA(evp_key); + +- +- if (!bufio || !evp_key || !rsa_key) { ++ if (!bufio || !evp_key) { + LOG_ERROR("Generation of test key failed."); + goto error; + } +@@ -199,10 +197,20 @@ test_fapi_ext_public_key(FAPI_CONTEXT *context) + 0x25, 0x71, 0x78, 0x50, 0xc2, 0x6c, 0x9c, 0xd0, 0xd8, 0x9d + }; + uint8_t signature[256]; +- unsigned int signatureLength = 256; ++ size_t signatureLength = 256; + +- if (!RSA_sign(NID_sha1, digest, 20, signature, &signatureLength, rsa_key)) { +- LOG_ERROR("Test RSA_sign failed."); ++ if ((ctx = EVP_PKEY_CTX_new(evp_key, NULL)) == NULL) { ++ LOG_ERROR("Test EVP_PKEY_CTX_new failed."); ++ goto error; ++ } ++ if (EVP_PKEY_sign_init(ctx) <= 0 ++ || EVP_PKEY_CTX_set_rsa_padding(ctx, RSA_PKCS1_PADDING) <= 0 ++ || EVP_PKEY_CTX_set_signature_md(ctx, EVP_sha1()) <= 0) { ++ LOG_ERROR("Test EVP_PKEY_sign_init failed."); ++ goto error; ++ } ++ if (EVP_PKEY_sign(ctx, signature, &signatureLength, digest, 20) <= 0) { ++ LOG_ERROR("Test EVP_PKEY_sign failed."); + goto error; + } + +@@ -243,12 +251,8 @@ test_fapi_ext_public_key(FAPI_CONTEXT *context) + if (bufio) { + BIO_free(bufio); + } +- if (evp_key) { +- EVP_PKEY_free(evp_key); +- } +- if (rsa_key) { +- RSA_free(rsa_key); +- } ++ EVP_PKEY_CTX_free(ctx); ++ EVP_PKEY_free(evp_key); + SAFE_FREE(path_list); + SAFE_FREE(cert2); + return EXIT_SUCCESS; +@@ -258,12 +262,8 @@ error: + if (bufio) { + BIO_free(bufio); + } +- if (evp_key) { +- EVP_PKEY_free(evp_key); +- } +- if (rsa_key) { +- RSA_free(rsa_key); +- } ++ EVP_PKEY_CTX_free(ctx); ++ EVP_PKEY_free(evp_key); + SAFE_FREE(path_list); + SAFE_FREE(cert2); + return EXIT_FAILURE; +-- +2.26.3 + diff --git a/SOURCES/0008-Require-OpenSSL-1.1.0.patch b/SOURCES/0008-Require-OpenSSL-1.1.0.patch new file mode 100644 index 0000000..4742055 --- /dev/null +++ b/SOURCES/0008-Require-OpenSSL-1.1.0.patch @@ -0,0 +1,65 @@ +From 090a10a69340dc0825f611eceac60bf3f904a5ec Mon Sep 17 00:00:00 2001 +From: Petr Gotthard +Date: Sat, 17 Jul 2021 22:43:00 +0200 +Subject: Require OpenSSL >= 1.1.0 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +To reduce the amount of version-specific code we drop support for +OpenSSL prior 1.1.0, including all forks such as LibreSSL, which are +not API compatible with OpenSSL >= 1.1.0. + +Python 3.10 will even require OpenSSL >= 1.1.1. The corresponding +PEP 644 contains a detailed impact analysis which is also relevant +here. + +Signed-off-by: Petr Gotthard +--- + INSTALL.md | 3 +-- + configure.ac | 6 +++++- + 2 files changed, 6 insertions(+), 3 deletions(-) + +diff --git a/INSTALL.md b/INSTALL.md +index eec94c45..658e1f28 100644 +--- a/INSTALL.md ++++ b/INSTALL.md +@@ -14,7 +14,7 @@ following sections describe them for the supported platforms. + * C library development libraries and header files + * pkg-config + * doxygen +-* OpenSSL development libraries and header files ++* OpenSSL development libraries and header files, version >= 1.1.0 + * libcurl development libraries + + The following are dependencies only required when building test suites. +@@ -71,7 +71,6 @@ C Runtime (UCRT) version 10.0.16299.0. Building the type marshaling library + (tss2-mu.dll) and the system API (tss2-sapi.dll) should be as simple as + loading the tpm2-tss solution (tpm2-tss.sln) with a compatible and properly + configured version of Visual Studio 2017 and pressing the 'build' button. +-Windows build setup requires OpenSSL >= v1.0.2 crypto library. + + ### References + Visual Studio 2017 with "Clang for Windows": https://blogs.msdn.microsoft.com/vcblog/2017/03/07/use-any-c-compiler-with-visual-studio/ +diff --git a/configure.ac b/configure.ac +index d4324c9a..12baa257 100755 +--- a/configure.ac ++++ b/configure.ac +@@ -132,9 +132,13 @@ AC_ARG_WITH([crypto], + AM_CONDITIONAL(ESYS_OSSL, test "x$with_crypto" = "xossl") + AM_CONDITIONAL(ESYS_MBED, test "x$with_crypto" = "xmbed") + ++m4_define([ossl_min_version], [1.1.0]) ++m4_define([ossl_err], [OpenSSL libcrypto is missing or version requirements not met. OpenSSL version must be >= ossl_min_version]) + AS_IF([test "x$enable_esys" = xyes], + [AS_IF([test "x$with_crypto" = xossl], [ +- PKG_CHECK_MODULES([LIBCRYPTO], [libcrypto]) ++ PKG_CHECK_MODULES([LIBCRYPTO], ++ [libcrypto >= ossl_min_version],, ++ [AC_MSG_ERROR([ossl_err])]) + AC_DEFINE([OSSL], [1], [OpenSSL cryptographic backend]) + TSS2_ESYS_CFLAGS_CRYPTO="$LIBCRYPTO_CFLAGS" + TSS2_ESYS_LDFLAGS_CRYPTO="$LIBCRYPTO_LIBS" +-- +2.26.3 + diff --git a/SOURCES/0009-FAPI-Change-SHA256_Update-to-EVP_DigestUpdate.patch b/SOURCES/0009-FAPI-Change-SHA256_Update-to-EVP_DigestUpdate.patch new file mode 100644 index 0000000..7aba1f6 --- /dev/null +++ b/SOURCES/0009-FAPI-Change-SHA256_Update-to-EVP_DigestUpdate.patch @@ -0,0 +1,124 @@ +From 75da8bd937e6bca14832240321a679634159f75b Mon Sep 17 00:00:00 2001 +From: Petr Gotthard +Date: Sun, 18 Jul 2021 13:12:56 +0200 +Subject: FAPI: Change SHA256_Update to EVP_DigestUpdate +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Although the EVP_DigestUpdate functions are available in all OpenSSL +versions and the EVP_DigestFinal_ex was added in OpenSSL 0.9.7, the +EVP_MD_CTX_new was introduced in OpenSSL 1.1.0. +The SHA256_Update function is deprecated in OpenSSL 3.0.0. + +This PR should work with OpenSSL 1.1.0 through 3.0.0. + + - Compared to the upstream commit f4f528ff the changes related to the + unit test are omitted. + +Signed-off-by: Petr Gotthard +--- + src/tss2-fapi/ifapi_get_intl_cert.c | 43 +++++++++++++++++------------ + 1 file changed, 25 insertions(+), 18 deletions(-) + +diff --git a/src/tss2-fapi/ifapi_get_intl_cert.c b/src/tss2-fapi/ifapi_get_intl_cert.c +index 2fb17fd0..9290a17e 100644 +--- a/src/tss2-fapi/ifapi_get_intl_cert.c ++++ b/src/tss2-fapi/ifapi_get_intl_cert.c +@@ -52,21 +52,26 @@ static unsigned char *hash_ek_public(TPM2B_PUBLIC *ek_public) { + return NULL; + } + +- SHA256_CTX sha256; +- int is_success = SHA256_Init(&sha256); ++ EVP_MD_CTX *sha256ctx = EVP_MD_CTX_new(); ++ if (!sha256ctx) { ++ LOG_ERROR("EVP_MD_CTX_new failed"); ++ goto err; ++ } ++ ++ int is_success = EVP_DigestInit(sha256ctx, EVP_sha256()); + if (!is_success) { +- LOG_ERROR("SHA256_Init failed"); ++ LOG_ERROR("EVP_DigestInit failed"); + goto err; + } + + switch (ek_public->publicArea.type) { + case TPM2_ALG_RSA: + /* Add public key to the hash. */ +- is_success = SHA256_Update(&sha256, +- ek_public->publicArea.unique.rsa.buffer, +- ek_public->publicArea.unique.rsa.size); ++ is_success = EVP_DigestUpdate(sha256ctx, ++ ek_public->publicArea.unique.rsa.buffer, ++ ek_public->publicArea.unique.rsa.size); + if (!is_success) { +- LOG_ERROR("SHA256_Update failed"); ++ LOG_ERROR("EVP_DigestUpdate failed"); + goto err; + } + +@@ -77,28 +82,28 @@ static unsigned char *hash_ek_public(TPM2B_PUBLIC *ek_public) { + } + /* Exponent 65537 will be added. */ + BYTE buf[3] = { 0x1, 0x00, 0x01 }; +- is_success = SHA256_Update(&sha256, buf, sizeof(buf)); ++ is_success = EVP_DigestUpdate(sha256ctx, buf, sizeof(buf)); + if (!is_success) { +- LOG_ERROR("SHA256_Update failed"); ++ LOG_ERROR("EVP_DigestUpdate failed"); + goto err; + } + break; + + case TPM2_ALG_ECC: +- is_success = SHA256_Update(&sha256, +- ek_public->publicArea.unique.ecc.x.buffer, +- ek_public->publicArea.unique.ecc.x.size); ++ is_success = EVP_DigestUpdate(sha256ctx, ++ ek_public->publicArea.unique.ecc.x.buffer, ++ ek_public->publicArea.unique.ecc.x.size); + if (!is_success) { +- LOG_ERROR("SHA256_Update failed"); ++ LOG_ERROR("EVP_DigestUpdate failed"); + goto err; + } + + /* Add public key to the hash. */ +- is_success = SHA256_Update(&sha256, +- ek_public->publicArea.unique.ecc.y.buffer, +- ek_public->publicArea.unique.ecc.y.size); ++ is_success = EVP_DigestUpdate(sha256ctx, ++ ek_public->publicArea.unique.ecc.y.buffer, ++ ek_public->publicArea.unique.ecc.y.size); + if (!is_success) { +- LOG_ERROR("SHA256_Update failed"); ++ LOG_ERROR("EVP_DigestUpdate failed"); + goto err; + } + break; +@@ -108,17 +113,19 @@ static unsigned char *hash_ek_public(TPM2B_PUBLIC *ek_public) { + goto err; + } + +- is_success = SHA256_Final(hash, &sha256); ++ is_success = EVP_DigestFinal_ex(sha256ctx, hash, NULL); + if (!is_success) { + LOG_ERROR("SHA256_Final failed"); + goto err; + } + ++ EVP_MD_CTX_free(sha256ctx); + LOG_TRACE("public-key-hash:"); + LOG_TRACE(" sha256: "); + LOGBLOB_TRACE(&hash[0], SHA256_DIGEST_LENGTH, "Hash"); + return hash; + err: ++ EVP_MD_CTX_free(sha256ctx); + free(hash); + return NULL; + } +-- +2.26.3 + diff --git a/SOURCES/0010-Test-Use-EVP_MAC_xxx-with-OpenSSL-3.0.patch b/SOURCES/0010-Test-Use-EVP_MAC_xxx-with-OpenSSL-3.0.patch new file mode 100644 index 0000000..c0e4b49 --- /dev/null +++ b/SOURCES/0010-Test-Use-EVP_MAC_xxx-with-OpenSSL-3.0.patch @@ -0,0 +1,124 @@ +From 89b2bd01f6fa1e267f57b2ceeb2ffaafb9cdb7c0 Mon Sep 17 00:00:00 2001 +From: Petr Gotthard +Date: Sun, 18 Jul 2021 14:56:18 +0200 +Subject: Test: Use EVP_MAC_xxx with OpenSSL 3.0 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Drop support for OpenSSL < 1.1.0 and add support for OpenSSL >= 3.0.0. + +The HMAC_Update is deprecated in OpenSSL 3.0, but the replacement +EVP_MAC_update was added in OpenSSL 3.0, so version specific code is +needed. + +Signed-off-by: Petr Gotthard +--- + test/integration/sys-util.c | 50 +++++++++++++++++++++++-------------- + 1 file changed, 31 insertions(+), 19 deletions(-) + +diff --git a/test/integration/sys-util.c b/test/integration/sys-util.c +index af83cf55..5865f002 100644 +--- a/test/integration/sys-util.c ++++ b/test/integration/sys-util.c +@@ -13,10 +13,13 @@ + #include + #include + ++#include + #include ++#if OPENSSL_VERSION_NUMBER < 0x30000000L + #include +-#include +-#include ++#else ++#include ++#endif + + #define LOGMODULE testintegration + #include "util/log.h" +@@ -489,22 +492,18 @@ hmac( + TPM2B_DIGEST **buffer_list, + TPM2B_DIGEST *out) + { +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L +- HMAC_CTX *ctx; +-#else +- HMAC_CTX _ctx; +- HMAC_CTX *ctx = &_ctx; +-#endif +- EVP_MD *evp; + int rc = 1, i; +- unsigned int *buf = NULL, size; ++ unsigned int *buf = NULL; + uint8_t *buf_ptr; ++ EVP_MD *evp; + +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L +- /* HMAC_CTX_new and HMAC_CTX_free are new in openSSL 1.1.0 */ +- ctx = HMAC_CTX_new(); ++#if OPENSSL_VERSION_NUMBER < 0x30000000L ++ unsigned int size; ++ HMAC_CTX *ctx = HMAC_CTX_new(); + #else +- HMAC_CTX_init(ctx); ++ size_t size; ++ EVP_MAC *hmac = EVP_MAC_fetch(NULL, "HMAC", NULL); ++ EVP_MAC_CTX *ctx = EVP_MAC_CTX_new(hmac); + #endif + + if (!ctx) +@@ -538,21 +537,33 @@ hmac( + + buf_ptr = (uint8_t *)buf; + +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x30000000L + rc = HMAC_Init_ex(ctx, key, key_len, evp, NULL); + #else +- rc = HMAC_Init(ctx, key, key_len, evp); +-#endif ++ OSSL_PARAM params[2]; + ++ params[0] = OSSL_PARAM_construct_utf8_string(OSSL_ALG_PARAM_DIGEST, ++ (char *)EVP_MD_get0_name(evp), 0); ++ params[1] = OSSL_PARAM_construct_end(); ++ rc = EVP_MAC_init(ctx, key, key_len, params); ++#endif + if (rc != 1) + goto out; + for (i = 0; buffer_list[i] != 0; i++) { ++#if OPENSSL_VERSION_NUMBER < 0x30000000L + rc = HMAC_Update(ctx, buffer_list[i]->buffer, buffer_list[i]->size); ++#else ++ rc = EVP_MAC_update(ctx, buffer_list[i]->buffer, buffer_list[i]->size); ++#endif + if (rc != 1) + goto out; + } + /* buf_ptr has to be 4 bytes alligned for whatever reason */ ++#if OPENSSL_VERSION_NUMBER < 0x30000000L + rc = HMAC_Final(ctx, buf_ptr, &size); ++#else ++ rc = EVP_MAC_final(ctx, buf_ptr, &size, out->size); ++#endif + if (rc != 1) + goto out; + +@@ -561,10 +572,11 @@ hmac( + memcpy(out->buffer, buf, out->size); + + out: +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x30000000L + HMAC_CTX_free(ctx); + #else +- HMAC_CTX_cleanup(ctx); ++ EVP_MAC_CTX_free(ctx); ++ EVP_MAC_free(hmac); + #endif + + if (buf) +-- +2.26.3 + diff --git a/SOURCES/0011-Drop-support-for-OpenSSL-1.1.0.patch b/SOURCES/0011-Drop-support-for-OpenSSL-1.1.0.patch new file mode 100644 index 0000000..3c77e9d --- /dev/null +++ b/SOURCES/0011-Drop-support-for-OpenSSL-1.1.0.patch @@ -0,0 +1,313 @@ +From df8495b73df96f55425970e76c613b8a0950bf0c Mon Sep 17 00:00:00 2001 +From: Petr Gotthard +Date: Sun, 18 Jul 2021 20:21:01 +0200 +Subject: Drop support for OpenSSL < 1.1.0 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Delete code written to support OpenSSL < 1.1.0 + +Delete functions that have no effect in OpenSSL >= 1.1.0 + - ENGINE_load_builtin_engines() + - OpenSSL_add_all_algorithms() + - ERR_load_crypto_strings() + - EC_KEY_set_asn1_flag(ecKey, OPENSSL_EC_NAMED_CURVE) + +Switch AppVeyor to use pre-built OpenSSL 1.1.0 + +Signed-off-by: Petr Gotthard +--- + src/tss2-esys/esys_crypto_ossl.c | 19 ---------------- + src/tss2-esys/tss2-esys.vcxproj | 16 +++++++------- + src/tss2-fapi/fapi_crypto.c | 37 -------------------------------- + test/helper/tpm_getek.c | 11 ---------- + test/helper/tpm_getek_ecc.c | 9 -------- + 5 files changed, 8 insertions(+), 84 deletions(-) + +diff --git a/src/tss2-esys/esys_crypto_ossl.c b/src/tss2-esys/esys_crypto_ossl.c +index 2eb0dfcb..a6259346 100644 +--- a/src/tss2-esys/esys_crypto_ossl.c ++++ b/src/tss2-esys/esys_crypto_ossl.c +@@ -525,11 +525,7 @@ iesys_cryptossl_random2b(TPM2B_NONCE * nonce, size_t num_bytes) + nonce->size = num_bytes; + } + +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L + RAND_set_rand_method(RAND_OpenSSL()); +-#else +- RAND_set_rand_method(RAND_SSLeay()); +-#endif + if (1 != RAND_bytes(&nonce->buffer[0], nonce->size)) { + RAND_set_rand_method(rand_save); + return_error(TSS2_ESYS_RC_GENERAL_FAILURE, +@@ -563,11 +559,7 @@ iesys_cryptossl_pk_encrypt(TPM2B_PUBLIC * pub_tpm_key, + size_t * out_size, const char *label) + { + const RAND_METHOD *rand_save = RAND_get_rand_method(); +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L + RAND_set_rand_method(RAND_OpenSSL()); +-#else +- RAND_set_rand_method(RAND_SSLeay()); +-#endif + + TSS2_RC r = TSS2_RC_SUCCESS; + const EVP_MD * hashAlg = NULL; +@@ -630,14 +622,6 @@ iesys_cryptossl_pk_encrypt(TPM2B_PUBLIC * pub_tpm_key, + goto_error(r, TSS2_ESYS_RC_GENERAL_FAILURE, + "Could not create evp key.", cleanup); + } +-#if OPENSSL_VERSION_NUMBER < 0x10100000L +- if (!BN_bin2bn(pub_tpm_key->publicArea.unique.rsa.buffer, +- pub_tpm_key->publicArea.unique.rsa.size, +- rsa_key->n)) { +- goto_error(r, TSS2_ESYS_RC_GENERAL_FAILURE, +- "Could not create rsa n.", cleanup); +- } +-#else + BIGNUM *n = NULL; + if (!(n = BN_bin2bn(pub_tpm_key->publicArea.unique.rsa.buffer, + pub_tpm_key->publicArea.unique.rsa.size, +@@ -650,7 +634,6 @@ iesys_cryptossl_pk_encrypt(TPM2B_PUBLIC * pub_tpm_key, + goto_error(r, TSS2_ESYS_RC_GENERAL_FAILURE, + "Could not set rsa n.", cleanup); + } +-#endif + + if (1 != EVP_PKEY_set1_RSA(evp_rsa_key, rsa_key)) { + goto_error(r, TSS2_ESYS_RC_GENERAL_FAILURE, +@@ -1129,7 +1112,5 @@ iesys_cryptossl_sym_aes_decrypt(uint8_t * key, + */ + TSS2_RC + iesys_cryptossl_init() { +- ENGINE_load_builtin_engines(); +- OpenSSL_add_all_algorithms(); + return TSS2_RC_SUCCESS; + } +diff --git a/src/tss2-esys/tss2-esys.vcxproj b/src/tss2-esys/tss2-esys.vcxproj +index b75424aa..b2aa67ce 100644 +--- a/src/tss2-esys/tss2-esys.vcxproj ++++ b/src/tss2-esys/tss2-esys.vcxproj +@@ -69,13 +69,13 @@ + MultiThreadedDebugDLL + Level3 + Disabled +- $(SolutionDir);$(SolutionDir)\src;$(SolutionDir)\include\tss2;$(SolutionDir)\src\tss2-mu;$(SolutionDir)\src\tss2-sys;$(SolutionDir)\src\tss2-esys;C:\OpenSSL-Win32\include;%(AdditionalIncludeDirectories) ++ $(SolutionDir);$(SolutionDir)\src;$(SolutionDir)\include\tss2;$(SolutionDir)\src\tss2-mu;$(SolutionDir)\src\tss2-sys;$(SolutionDir)\src\tss2-esys;C:\OpenSSL-v11-Win32\include;%(AdditionalIncludeDirectories) + + + MachineX86 + true + Windows +- $(OutDir)\tss2-mu.lib;$(OutDir)\tss2-sys.lib;$(OutDir)\tss2-tctildr.lib;C:\OpenSSL-Win32\lib\libeay32.lib;C:\OpenSSL-Win32\lib\libeay32.lib;%(AdditionalDependencies) ++ $(OutDir)\tss2-mu.lib;$(OutDir)\tss2-sys.lib;$(OutDir)\tss2-tctildr.lib;C:\OpenSSL-v11-Win32\lib\libcrypto.lib;C:\OpenSSL-v11-Win32\lib\libcrypto.lib;%(AdditionalDependencies) + $(SolutionDir)\lib\tss2-esys.def + + +@@ -84,7 +84,7 @@ + WIN32;NDEBUG;_WINDOWS;_USRDLL;TSS2ESYS_EXPORTS;MAXLOGLEVEL=6;strtok_r=strtok_s;OSSL;%(PreprocessorDefinitions) + MultiThreadedDLL + Level3 +- $(SolutionDir);$(SolutionDir)\src;$(SolutionDir)\include\tss2;$(SolutionDir)\src\tss2-mu;$(SolutionDir)\src\tss2-sys;$(SolutionDir)\src\tss2-esys;C:\OpenSSL-Win32\include;%(AdditionalIncludeDirectories) ++ $(SolutionDir);$(SolutionDir)\src;$(SolutionDir)\include\tss2;$(SolutionDir)\src\tss2-mu;$(SolutionDir)\src\tss2-sys;$(SolutionDir)\src\tss2-esys;C:\OpenSSL-v11-Win32\include;%(AdditionalIncludeDirectories) + + + MachineX86 +@@ -92,27 +92,27 @@ + Windows + true + true +- $(OutDir)\tss2-mu.lib;$(OutDir)\tss2-sys.lib;$(OutDir)\tss2-tctildr.lib;C:\OpenSSL-Win32\lib\libeay32.lib;%(AdditionalDependencies) ++ $(OutDir)\tss2-mu.lib;$(OutDir)\tss2-sys.lib;$(OutDir)\tss2-tctildr.lib;C:\OpenSSL-v11-Win32\lib\libcrypto.lib;%(AdditionalDependencies) + $(SolutionDir)\lib\tss2-esys.def + + + + +- $(SolutionDir);$(SolutionDir)\src;$(SolutionDir)\include\tss2;$(SolutionDir)\src\tss2-mu;$(SolutionDir)\src\tss2-sys;$(SolutionDir)\src\tss2-esys;C:\OpenSSL-Win64\include;%(AdditionalIncludeDirectories) ++ $(SolutionDir);$(SolutionDir)\src;$(SolutionDir)\include\tss2;$(SolutionDir)\src\tss2-mu;$(SolutionDir)\src\tss2-sys;$(SolutionDir)\src\tss2-esys;C:\OpenSSL-v11-Win64\include;%(AdditionalIncludeDirectories) + _DEBUG;_WINDOWS;_USRDLL;TSS2ESYS_EXPORTS;MAXLOGLEVEL=6;strtok_r=strtok_s;OSSL;%(PreprocessorDefinitions) + + +- $(OutDir)\tss2-mu.lib;$(OutDir)\tss2-sys.lib;$(OutDir)\tss2-tctildr.lib;C:\OpenSSL-Win64\lib\libeay32.lib;%(AdditionalDependencies) ++ $(OutDir)\tss2-mu.lib;$(OutDir)\tss2-sys.lib;$(OutDir)\tss2-tctildr.lib;C:\OpenSSL-v11-Win64\lib\libcrypto.lib;%(AdditionalDependencies) + $(SolutionDir)\lib\tss2-esys.def + + + + +- $(SolutionDir);$(SolutionDir)\src;$(SolutionDir)\include\tss2;$(SolutionDir)\src\tss2-mu;$(SolutionDir)\src\tss2-sys;$(SolutionDir)\src\tss2-esys;C:\OpenSSL-Win64\include;%(AdditionalIncludeDirectories) ++ $(SolutionDir);$(SolutionDir)\src;$(SolutionDir)\include\tss2;$(SolutionDir)\src\tss2-mu;$(SolutionDir)\src\tss2-sys;$(SolutionDir)\src\tss2-esys;C:\OpenSSL-v11-Win64\include;%(AdditionalIncludeDirectories) + NDEBUG;_WINDOWS;_USRDLL;TSS2ESYS_EXPORTS;MAXLOGLEVEL=6;strtok_r=strtok_s;OSSL;%(PreprocessorDefinitions) + + +- $(OutDir)\tss2-mu.lib;$(OutDir)\tss2-sys.lib;$(OutDir)\tss2-tctildr.lib;C:\OpenSSL-Win64\lib\libeay32.lib;%(AdditionalDependencies) ++ $(OutDir)\tss2-mu.lib;$(OutDir)\tss2-sys.lib;$(OutDir)\tss2-tctildr.lib;C:\OpenSSL-v11-Win64\lib\libcrypto.lib;%(AdditionalDependencies) + $(SolutionDir)\lib\tss2-esys.def + + +diff --git a/src/tss2-fapi/fapi_crypto.c b/src/tss2-fapi/fapi_crypto.c +index f5b3d272..c97b0a1d 100644 +--- a/src/tss2-fapi/fapi_crypto.c ++++ b/src/tss2-fapi/fapi_crypto.c +@@ -333,12 +333,7 @@ ifapi_tpm_ecc_sig_to_der( + tpmSignature->signature.ecdsa.signatureR.size, NULL); + goto_if_null(bnr, "Out of memory", TSS2_FAPI_RC_MEMORY, cleanup); + +-#if OPENSSL_VERSION_NUMBER < 0x10100000 +- ecdsaSignature->s = bns; +- ecdsaSignature->r = bnr; +-#else /* OPENSSL_VERSION_NUMBER < 0x10100000 */ + ECDSA_SIG_set0(ecdsaSignature, bnr, bns); +-#endif /* OPENSSL_VERSION_NUMBER < 0x10100000 */ + + osslRC = i2d_ECDSA_SIG(ecdsaSignature, NULL); + if (osslRC == -1) { +@@ -424,20 +419,9 @@ ossl_rsa_pub_from_tpm(const TPM2B_PUBLIC *tpmPublicKey, EVP_PKEY *evpPublicKey) + "Could not set exponent.", error_cleanup); + } + +-#if OPENSSL_VERSION_NUMBER < 0x10100000 +- rsa->e = e; +- rsa->n = n; +- rsa->d = d; +- rsa->p = p; +- rsa->q = q; +- rsa->dmp1 = dmp1; +- rsa->dmq1 = dmq1; +- rsa->iqmp = iqmp; +-#else /* OPENSSL_VERSION_NUMBER < 0x10100000 */ + RSA_set0_key(rsa, n, e, d); + RSA_set0_factors(rsa, p, q); + RSA_set0_crt_params(rsa, dmp1, dmq1, iqmp); +-#endif /* OPENSSL_VERSION_NUMBER < 0x10100000 */ + + /* Assign the parameters to the key */ + if (!EVP_PKEY_assign_RSA(evpPublicKey, rsa)) { +@@ -541,8 +525,6 @@ ossl_ecc_pub_from_tpm(const TPM2B_PUBLIC *tpmPublicKey, EVP_PKEY *evpPublicKey) + goto_error(r, TSS2_FAPI_RC_GENERAL_FAILURE, "Assign ecc key", + error_cleanup); + } +- /* Needed for older OSSL versions. */ +- EC_KEY_set_asn1_flag(ecKey, OPENSSL_EC_NAMED_CURVE); + OSSL_FREE(y, BN); + OSSL_FREE(x, BN); + return TSS2_RC_SUCCESS; +@@ -654,24 +636,14 @@ ifapi_ecc_der_sig_to_tpm( + + /* Initialize the ECDSA signature components */ + ECDSA_SIG *ecdsaSignature = NULL; +-#if OPENSSL_VERSION_NUMBER < 0x10100000 +- BIGNUM *bnr; +- BIGNUM *bns; +-#else /* OPENSSL_VERSION_NUMBER < 0x10100000 */ + const BIGNUM *bnr; + const BIGNUM *bns; +-#endif /* OPENSSL_VERSION_NUMBER < 0x10100000 */ + + d2i_ECDSA_SIG(&ecdsaSignature, &signature, signatureSize); + return_if_null(ecdsaSignature, "Invalid DER signature", + TSS2_FAPI_RC_GENERAL_FAILURE); + +-#if OPENSSL_VERSION_NUMBER < 0x10100000 +- bns = ecdsaSignature->s; +- bnr = ecdsaSignature->r; +-#else /* OPENSSL_VERSION_NUMBER < 0x10100000 */ + ECDSA_SIG_get0(ecdsaSignature, &bnr, &bns); +-#endif /* OPENSSL_VERSION_NUMBER < 0x10100000 */ + + /* Writing them to the TPM format signature */ + tpmSignature->signature.ecdsa.hash = hashAlgorithm; +@@ -933,12 +905,7 @@ get_rsa_tpm2b_public_from_evp( + const BIGNUM *e = NULL, *n = NULL; + int rsaKeySize = RSA_size(rsaKey); + +-#if OPENSSL_VERSION_NUMBER < 0x10100000 +- e = rsaKey->e; +- n = rsaKey->n; +-#else /* OPENSSL_VERSION_NUMBER < 0x10100000 */ + RSA_get0_key(rsaKey, &n, &e, NULL); +-#endif /* OPENSSL_VERSION_NUMBER < 0x10100000 */ + tpmPublic->publicArea.unique.rsa.size = rsaKeySize; + if (1 != ifapi_bn2binpad(n, &tpmPublic->publicArea.unique.rsa.buffer[0], + rsaKeySize)) { +@@ -1650,8 +1617,6 @@ get_crl_from_cert(X509 *cert, X509_CRL **crl) + goto_error(r, TSS2_FAPI_RC_NO_CERT, "Get crl.", cleanup); + } + +- OpenSSL_add_all_algorithms(); +- + unsigned const char* tmp_ptr1 = crl_buffer; + unsigned const char** tmp_ptr2 = &tmp_ptr1; + +@@ -1935,7 +1900,6 @@ ifapi_verify_ek_cert( + r, TSS2_FAPI_RC_BAD_VALUE, cleanup); + } else { + /* Get uri for ek intermediate certificate. */ +- OpenSSL_add_all_algorithms(); + info = X509_get_ext_d2i(ek_cert, NID_info_access, NULL, NULL); + + for (i = 0; i < sk_ACCESS_DESCRIPTION_num(info); i++) { +@@ -1955,7 +1919,6 @@ ifapi_verify_ek_cert( + goto_if_null2(cert_buffer, "No certificate downloaded", r, + TSS2_FAPI_RC_NO_CERT, cleanup); + +- OpenSSL_add_all_algorithms(); + intermed_cert = get_cert_from_buffer(cert_buffer, cert_buffer_size); + + SAFE_FREE(cert_buffer); +diff --git a/test/helper/tpm_getek.c b/test/helper/tpm_getek.c +index 21be0f46..c6a8e906 100644 +--- a/test/helper/tpm_getek.c ++++ b/test/helper/tpm_getek.c +@@ -147,20 +147,9 @@ main (int argc, char *argv[]) + exp = out_public.publicArea.parameters.rsaDetail.exponent; + BN_set_word(e, exp); + +-#if OPENSSL_VERSION_NUMBER < 0x10100000 +- rsa->e = e; +- rsa->n = n; +- rsa->d = d; +- rsa->p = p; +- rsa->q = q; +- rsa->dmp1 = dmp1; +- rsa->dmq1 = dmq1; +- rsa->iqmp = iqmp; +-#else /* OPENSSL_VERSION_NUMBER < 0x10100000 */ + RSA_set0_key(rsa, n, e, d); + RSA_set0_factors(rsa, p, q); + RSA_set0_crt_params(rsa, dmp1, dmq1, iqmp); +-#endif /* OPENSSL_VERSION_NUMBER < 0x10100000 */ + + EVP_PKEY_assign_RSA(evp, rsa); + +diff --git a/test/helper/tpm_getek_ecc.c b/test/helper/tpm_getek_ecc.c +index 0419f47a..75165fdd 100644 +--- a/test/helper/tpm_getek_ecc.c ++++ b/test/helper/tpm_getek_ecc.c +@@ -128,14 +128,6 @@ main (int argc, char *argv[]) + /* Convert the key from out_public to PEM */ + + EVP_PKEY *evp = EVP_PKEY_new(); +- +- OpenSSL_add_all_algorithms(); +- +- OpenSSL_add_all_algorithms(); +- +- ERR_load_crypto_strings(); +- +- + EC_KEY *ecc_key = EC_KEY_new(); + BIGNUM *x = NULL, *y = NULL; + BIO *bio; +@@ -159,7 +151,6 @@ main (int argc, char *argv[]) + if (!EC_KEY_set_group(ecc_key, ecgroup)) + exit(1); + +- EC_KEY_set_asn1_flag(ecc_key, OPENSSL_EC_NAMED_CURVE); + EC_GROUP_free(ecgroup); + + /* Set the ECC parameters in the OpenSSL key */ +-- +2.26.3 + diff --git a/SOURCES/0012-Implement-EVP_PKEY-export-import-for-OpenSSL-3.0.patch b/SOURCES/0012-Implement-EVP_PKEY-export-import-for-OpenSSL-3.0.patch new file mode 100644 index 0000000..d98ec63 --- /dev/null +++ b/SOURCES/0012-Implement-EVP_PKEY-export-import-for-OpenSSL-3.0.patch @@ -0,0 +1,1005 @@ +From f328c68cba9d5511b7d2d2615b3a28987edbdfac Mon Sep 17 00:00:00 2001 +From: Petr Gotthard +Date: Sun, 18 Jul 2021 21:30:59 +0200 +Subject: Implement EVP_PKEY export/import for OpenSSL 3.0 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The `RSA_KEY` and `EC_KEY` are not publicly available in OpenSSL 3.0 and +the generic `EVP_PKEY` must be used instead. +Since export/import of raw keys still requires access to the internal structures +the OpenSSL 3.0 introduced a completely new approach to access key internals. + +This PR: + - preserves the current export/import impementation for OpenSSL 1.1.x + - implements key export/import for OpenSSL 3.0.0 + +Signed-off-by: Petr Gotthard +--- + src/tss2-esys/esys_crypto_ossl.c | 154 ++++++++++++----- + src/tss2-fapi/fapi_crypto.c | 275 +++++++++++++++++++++---------- + test/helper/tpm_getek.c | 53 +++--- + test/helper/tpm_getek_ecc.c | 61 +++++-- + 4 files changed, 386 insertions(+), 157 deletions(-) + +diff --git a/src/tss2-esys/esys_crypto_ossl.c b/src/tss2-esys/esys_crypto_ossl.c +index a6259346..392f97ae 100644 +--- a/src/tss2-esys/esys_crypto_ossl.c ++++ b/src/tss2-esys/esys_crypto_ossl.c +@@ -8,9 +8,17 @@ + #include + #endif + ++#include + #include +-#include + #include ++#include ++#if OPENSSL_VERSION_NUMBER < 0x30000000L ++#include ++#else ++#include ++#include ++#include ++#endif + #include + #include + +@@ -324,9 +332,14 @@ iesys_cryptossl_hmac_start(IESYS_CRYPTO_CONTEXT_BLOB ** context, + "Error EVP_MD_CTX_create", cleanup); + } + ++#if OPENSSL_VERSION_NUMBER < 0x10101000L + if (!(hkey = EVP_PKEY_new_mac_key(EVP_PKEY_HMAC, NULL, key, size))) { ++#else ++ /* this is preferred, but available since OpenSSL 1.1.1 only */ ++ if (!(hkey = EVP_PKEY_new_raw_private_key(EVP_PKEY_HMAC, NULL, key, size))) { ++#endif + goto_error(r, TSS2_ESYS_RC_GENERAL_FAILURE, +- "EVP_PKEY_new_mac_key", cleanup); ++ "Failed to create HMAC key", cleanup); + } + + if(1 != EVP_DigestSignInit(mycontext->hmac.ossl_context, NULL, +@@ -517,7 +530,10 @@ iesys_cryptossl_hmac_abort(IESYS_CRYPTO_CONTEXT_BLOB ** context) + TSS2_RC + iesys_cryptossl_random2b(TPM2B_NONCE * nonce, size_t num_bytes) + { ++#if OPENSSL_VERSION_NUMBER < 0x30000000L + const RAND_METHOD *rand_save = RAND_get_rand_method(); ++ RAND_set_rand_method(RAND_OpenSSL()); ++#endif + + if (num_bytes == 0) { + nonce->size = sizeof(TPMU_HA); +@@ -525,13 +541,16 @@ iesys_cryptossl_random2b(TPM2B_NONCE * nonce, size_t num_bytes) + nonce->size = num_bytes; + } + +- RAND_set_rand_method(RAND_OpenSSL()); + if (1 != RAND_bytes(&nonce->buffer[0], nonce->size)) { ++#if OPENSSL_VERSION_NUMBER < 0x30000000L + RAND_set_rand_method(rand_save); ++#endif + return_error(TSS2_ESYS_RC_GENERAL_FAILURE, + "Failure in random number generator."); + } ++#if OPENSSL_VERSION_NUMBER < 0x30000000L + RAND_set_rand_method(rand_save); ++#endif + return TSS2_RC_SUCCESS; + } + +@@ -558,30 +577,33 @@ iesys_cryptossl_pk_encrypt(TPM2B_PUBLIC * pub_tpm_key, + BYTE * out_buffer, + size_t * out_size, const char *label) + { ++#if OPENSSL_VERSION_NUMBER < 0x30000000L ++ RSA *rsa_key = NULL; + const RAND_METHOD *rand_save = RAND_get_rand_method(); ++ + RAND_set_rand_method(RAND_OpenSSL()); ++#else ++ OSSL_PARAM *params = NULL; ++ OSSL_PARAM_BLD *build = NULL; ++#endif + + TSS2_RC r = TSS2_RC_SUCCESS; + const EVP_MD * hashAlg = NULL; +- RSA * rsa_key = NULL; + EVP_PKEY *evp_rsa_key = NULL; +- EVP_PKEY_CTX *ctx = NULL; +- BIGNUM* bne = NULL; ++ EVP_PKEY_CTX *genctx = NULL, *ctx = NULL; ++ BIGNUM *bne = NULL, *n = NULL; + int padding; + char *label_copy = NULL; + + if (!(hashAlg = get_ossl_hash_md(pub_tpm_key->publicArea.nameAlg))) { + LOG_ERROR("Unsupported hash algorithm (%"PRIu16")", + pub_tpm_key->publicArea.nameAlg); ++#if OPENSSL_VERSION_NUMBER < 0x30000000L + RAND_set_rand_method(rand_save); ++#endif + return TSS2_ESYS_RC_NOT_IMPLEMENTED; + } + +- if (!(bne = BN_new())) { +- goto_error(r, TSS2_ESYS_RC_MEMORY, +- "Could not allocate Big Number", cleanup); +- } +- + switch (pub_tpm_key->publicArea.parameters.rsaDetail.scheme.scheme) { + case TPM2_ALG_NULL: + padding = RSA_NO_PADDING; +@@ -601,44 +623,64 @@ iesys_cryptossl_pk_encrypt(TPM2B_PUBLIC * pub_tpm_key, + exp = 65537; + else + exp = pub_tpm_key->publicArea.parameters.rsaDetail.exponent; +- if (1 != BN_set_word(bne, exp)) { ++ ++ if (!(n = BN_bin2bn(pub_tpm_key->publicArea.unique.rsa.buffer, ++ pub_tpm_key->publicArea.unique.rsa.size, ++ NULL))) { + goto_error(r, TSS2_ESYS_RC_GENERAL_FAILURE, +- "Could not set exponent.", cleanup); ++ "Could not create rsa n.", cleanup); + } + ++#if OPENSSL_VERSION_NUMBER < 0x30000000L + if (!(rsa_key = RSA_new())) { + goto_error(r, TSS2_ESYS_RC_MEMORY, + "Could not allocate RSA key", cleanup); + } + +- if (1 != RSA_generate_key_ex(rsa_key, +- pub_tpm_key->publicArea.parameters.rsaDetail.keyBits, +- bne, NULL)) { +- goto_error(r, TSS2_ESYS_RC_GENERAL_FAILURE, "Could not generate RSA key", +- cleanup); ++ if (!(bne = BN_new())) { ++ goto_error(r, TSS2_ESYS_RC_MEMORY, ++ "Could not allocate Big Number", cleanup); + } +- +- if (!(evp_rsa_key = EVP_PKEY_new())) { ++ if (1 != BN_set_word(bne, exp)) { + goto_error(r, TSS2_ESYS_RC_GENERAL_FAILURE, +- "Could not create evp key.", cleanup); ++ "Could not set exponent.", cleanup); + } +- BIGNUM *n = NULL; +- if (!(n = BN_bin2bn(pub_tpm_key->publicArea.unique.rsa.buffer, +- pub_tpm_key->publicArea.unique.rsa.size, +- NULL))) { ++ ++ if (1 != RSA_set0_key(rsa_key, n, bne, NULL)) { + goto_error(r, TSS2_ESYS_RC_GENERAL_FAILURE, +- "Could not create rsa n.", cleanup); ++ "Could not set rsa n.", cleanup); + } ++ /* ownership got transferred */ ++ n = NULL; ++ bne = NULL; + +- if (1 != RSA_set0_key(rsa_key, n, NULL, NULL)) { ++ if (!(evp_rsa_key = EVP_PKEY_new())) { + goto_error(r, TSS2_ESYS_RC_GENERAL_FAILURE, +- "Could not set rsa n.", cleanup); ++ "Could not create evp key.", cleanup); + } + +- if (1 != EVP_PKEY_set1_RSA(evp_rsa_key, rsa_key)) { ++ if (1 != EVP_PKEY_assign_RSA(evp_rsa_key, rsa_key)) { + goto_error(r, TSS2_ESYS_RC_GENERAL_FAILURE, + "Could not set rsa key.", cleanup); + } ++ /* ownership got transferred */ ++ rsa_key = NULL; ++#else /* OPENSSL_VERSION_NUMBER < 0x30000000L */ ++ if ((build = OSSL_PARAM_BLD_new()) == NULL ++ || !OSSL_PARAM_BLD_push_BN(build, OSSL_PKEY_PARAM_RSA_N, n) ++ || !OSSL_PARAM_BLD_push_uint32(build, OSSL_PKEY_PARAM_RSA_E, exp) ++ || (params = OSSL_PARAM_BLD_to_param(build)) == NULL) { ++ goto_error(r, TSS2_ESYS_RC_GENERAL_FAILURE, "Could not create rsa parameters.", ++ cleanup); ++ } ++ ++ if ((genctx = EVP_PKEY_CTX_new_from_name(NULL, "RSA", NULL)) == NULL ++ || EVP_PKEY_fromdata_init(genctx) <= 0 ++ || EVP_PKEY_fromdata(genctx, &evp_rsa_key, EVP_PKEY_PUBLIC_KEY, params) <= 0) { ++ goto_error(r, TSS2_ESYS_RC_GENERAL_FAILURE, "Could not create rsa key.", ++ cleanup); ++ } ++#endif /* OPENSSL_VERSION_NUMBER < 0x30000000L */ + + if (!(ctx = EVP_PKEY_CTX_new(evp_rsa_key, NULL))) { + goto_error(r, TSS2_ESYS_RC_GENERAL_FAILURE, +@@ -692,11 +734,18 @@ iesys_cryptossl_pk_encrypt(TPM2B_PUBLIC * pub_tpm_key, + r = TSS2_RC_SUCCESS; + + cleanup: ++ OSSL_FREE(genctx, EVP_PKEY_CTX); + OSSL_FREE(ctx, EVP_PKEY_CTX); + OSSL_FREE(evp_rsa_key, EVP_PKEY); +- OSSL_FREE(rsa_key, RSA); + OSSL_FREE(bne, BN); ++ OSSL_FREE(n, BN); ++#if OPENSSL_VERSION_NUMBER < 0x30000000L ++ OSSL_FREE(rsa_key, RSA); + RAND_set_rand_method(rand_save); ++#else ++ OSSL_FREE(params, OSSL_PARAM); ++ OSSL_FREE(build, OSSL_PARAM_BLD); ++#endif + return r; + } + +@@ -784,8 +833,14 @@ iesys_cryptossl_get_ecdh_point(TPM2B_PUBLIC *key, + { + TSS2_RC r = TSS2_RC_SUCCESS; + EC_GROUP *group = NULL; /* Group defines the used curve */ +- EC_KEY *eph_ec_key = NULL; /* Ephemeral ec key of application */ ++ EVP_PKEY_CTX *ctx = NULL; ++ EVP_PKEY *eph_pkey = NULL; ++#if OPENSSL_VERSION_NUMBER < 0x30000000L + const EC_POINT *eph_pub_key = NULL; /* Public part of ephemeral key */ ++ const BIGNUM *eph_priv_key = NULL; ++#else ++ BIGNUM *eph_priv_key = NULL; ++#endif + EC_POINT *tpm_pub_key = NULL; /* Public part of TPM key */ + EC_POINT *mul_eph_tpm = NULL; + BIGNUM *bn_x = NULL; +@@ -827,23 +882,25 @@ iesys_cryptossl_get_ecdh_point(TPM2B_PUBLIC *key, + } + + /* Create ephemeral key */ +- if (!(eph_ec_key = EC_KEY_new())) { ++ if ((ctx = EVP_PKEY_CTX_new_id(EVP_PKEY_EC, NULL)) == NULL ++ || EVP_PKEY_keygen_init(ctx) <= 0) { + goto_error(r, TSS2_ESYS_RC_GENERAL_FAILURE, +- "Create ec key", cleanup); ++ "Initialize ec key generation", cleanup); + } +- if (1 != EC_KEY_set_group(eph_ec_key , group)) { + +- goto_error(r, TSS2_ESYS_RC_GENERAL_FAILURE, "Set group", cleanup); +- } +- +- if (1 != EC_KEY_generate_key(eph_ec_key)) { ++ if (EVP_PKEY_CTX_set_ec_paramgen_curve_nid(ctx, curveId) <= 0 ++ || EVP_PKEY_keygen(ctx, &eph_pkey) <= 0) { + goto_error(r, TSS2_ESYS_RC_GENERAL_FAILURE, "Generate ec key", cleanup); + } + ++#if OPENSSL_VERSION_NUMBER < 0x30000000L ++ EC_KEY *eph_ec_key = EVP_PKEY_get0_EC_KEY(eph_pkey); ++ + if (!(eph_pub_key = EC_KEY_get0_public_key(eph_ec_key))) { + goto_error(r, TSS2_ESYS_RC_GENERAL_FAILURE, "Get public key", cleanup); + } + ++ eph_priv_key = EC_KEY_get0_private_key(eph_ec_key); + if (1 != EC_POINT_is_on_curve(group, eph_pub_key, NULL)) { + goto_error(r, TSS2_ESYS_RC_GENERAL_FAILURE, + "Ephemeral public key is on curve",cleanup); +@@ -861,8 +918,16 @@ iesys_cryptossl_get_ecdh_point(TPM2B_PUBLIC *key, + if (1 != EC_POINT_get_affine_coordinates_tss(group, eph_pub_key, bn_x, + bn_y, NULL)) { + goto_error(r, TSS2_ESYS_RC_GENERAL_FAILURE, +- "Get affine x coordinate", cleanup); ++ "Get affine coordinates", cleanup); ++ } ++#else ++ if (!EVP_PKEY_get_bn_param(eph_pkey, OSSL_PKEY_PARAM_PRIV_KEY, &eph_priv_key) ++ || !EVP_PKEY_get_bn_param(eph_pkey, OSSL_PKEY_PARAM_EC_PUB_X, &bn_x) ++ || !EVP_PKEY_get_bn_param(eph_pkey, OSSL_PKEY_PARAM_EC_PUB_Y, &bn_y)) { ++ goto_error(r, TSS2_ESYS_RC_GENERAL_FAILURE, ++ "Get ephemeral key", cleanup); + } ++#endif + + if (1 != iesys_bn2binpad(bn_x, &Q->x.buffer[0], key_size)) { + goto_error(r, TSS2_ESYS_RC_GENERAL_FAILURE, +@@ -881,13 +946,11 @@ iesys_cryptossl_get_ecdh_point(TPM2B_PUBLIC *key, + r = tpm_pub_to_ossl_pub(group, key, &tpm_pub_key); + goto_if_error(r, "Convert TPM pub point to ossl pub point", cleanup); + +- /* Multiply the ephemeral private key with TPM public key */ +- const BIGNUM * eph_priv_key = EC_KEY_get0_private_key(eph_ec_key); +- + if (!(mul_eph_tpm = EC_POINT_new(group))) { + goto_error(r, TSS2_ESYS_RC_GENERAL_FAILURE, "Create point.", cleanup); + } + ++ /* Multiply the ephemeral private key with TPM public key */ + if (1 != EC_POINT_mul(group, mul_eph_tpm, NULL, + tpm_pub_key, eph_priv_key, NULL)) { + goto_error(r, TSS2_ESYS_RC_GENERAL_FAILURE, +@@ -918,8 +981,13 @@ iesys_cryptossl_get_ecdh_point(TPM2B_PUBLIC *key, + OSSL_FREE(mul_eph_tpm, EC_POINT); + OSSL_FREE(tpm_pub_key, EC_POINT); + OSSL_FREE(group,EC_GROUP); +- OSSL_FREE(eph_ec_key, EC_KEY); ++ OSSL_FREE(ctx, EVP_PKEY_CTX); ++ OSSL_FREE(eph_pkey, EVP_PKEY); ++#if OPENSSL_VERSION_NUMBER < 0x30000000L + /* Note: free of eph_pub_key already done by free of eph_ec_key */ ++#else ++ OSSL_FREE(eph_priv_key, BN); ++#endif + OSSL_FREE(bn_x, BN); + OSSL_FREE(bn_y, BN); + return r; +diff --git a/src/tss2-fapi/fapi_crypto.c b/src/tss2-fapi/fapi_crypto.c +index c97b0a1d..c50b5f0a 100644 +--- a/src/tss2-fapi/fapi_crypto.c ++++ b/src/tss2-fapi/fapi_crypto.c +@@ -11,10 +11,15 @@ + #include + + #include +-#include + #include +-#include + #include ++#if OPENSSL_VERSION_NUMBER < 0x30000000L ++#include ++#else ++#include ++#include ++#include ++#endif + #include + #include + #include +@@ -380,66 +385,89 @@ cleanup: + * @retval TSS2_FAPI_RC_MEMORY if not enough memory can be allocated. + */ + static TSS2_RC +-ossl_rsa_pub_from_tpm(const TPM2B_PUBLIC *tpmPublicKey, EVP_PKEY *evpPublicKey) ++ossl_rsa_pub_from_tpm(const TPM2B_PUBLIC *tpmPublicKey, EVP_PKEY **evpPublicKey) + { ++#if OPENSSL_VERSION_NUMBER < 0x30000000L ++ RSA *rsa = NULL; ++#else ++ OSSL_PARAM_BLD *build = NULL; ++ OSSL_PARAM *params = NULL; ++ EVP_PKEY_CTX *ctx = NULL; ++#endif ++ + /* Check for NULL parameters */ + return_if_null(tpmPublicKey, "tpmPublicKey is NULL", TSS2_FAPI_RC_BAD_REFERENCE); + return_if_null(evpPublicKey, "evpPublicKey is NULL", TSS2_FAPI_RC_BAD_REFERENCE); + ++ TSS2_RC r = TSS2_RC_SUCCESS; + /* Initialize the RSA parameters */ +- TSS2_RC r; +- RSA *rsa = RSA_new(); +- BIGNUM *e = BN_new(); +- BIGNUM *d = BN_new(); +- BIGNUM *p = BN_new(); +- BIGNUM *q = BN_new(); +- BIGNUM *dmp1 = BN_new(); +- BIGNUM *dmq1 = BN_new(); +- BIGNUM *iqmp = BN_new(); ++ BIGNUM *e = NULL; + BIGNUM *n = BN_bin2bn(tpmPublicKey->publicArea.unique.rsa.buffer, + tpmPublicKey->publicArea.unique.rsa.size, NULL); +- +- if (!n || !e || !d || !p || !q || !dmp1 || !dmq1 || !iqmp || !rsa) { ++ if (!n) { + goto_error(r, TSS2_FAPI_RC_MEMORY, "Out of memory", error_cleanup); + } + +- BN_set_word(d, 0); +- BN_set_word(p, 0); +- BN_set_word(q, 0); +- BN_set_word(dmp1, 0); +- BN_set_word(dmq1, 0); +- BN_set_word(iqmp, 0); + uint32_t exp; + if (tpmPublicKey->publicArea.parameters.rsaDetail.exponent == 0) + exp = 65537; + else + exp = tpmPublicKey->publicArea.parameters.rsaDetail.exponent; ++ ++#if OPENSSL_VERSION_NUMBER < 0x30000000L ++ if ((rsa = RSA_new()) == NULL) { ++ goto_error(r, TSS2_FAPI_RC_MEMORY, "Out of memory", error_cleanup); ++ } ++ ++ if ((e = BN_new()) == NULL) { ++ goto_error(r, TSS2_FAPI_RC_MEMORY, "Out of memory", error_cleanup); ++ } + if (1 != BN_set_word(e, exp)) { + goto_error(r, TSS2_FAPI_RC_GENERAL_FAILURE, + "Could not set exponent.", error_cleanup); + } + +- RSA_set0_key(rsa, n, e, d); +- RSA_set0_factors(rsa, p, q); +- RSA_set0_crt_params(rsa, dmp1, dmq1, iqmp); ++ if (!RSA_set0_key(rsa, n, e, NULL)) { ++ goto_error(r, TSS2_FAPI_RC_GENERAL_FAILURE, ++ "Could not set public key.", error_cleanup); ++ } ++ n = NULL; /* ownership transferred */ ++ e = NULL; ++ ++ *evpPublicKey = EVP_PKEY_new(); ++ goto_if_null2(*evpPublicKey, "Out of memory.", r, TSS2_FAPI_RC_MEMORY, error_cleanup); + + /* Assign the parameters to the key */ +- if (!EVP_PKEY_assign_RSA(evpPublicKey, rsa)) { ++ if (!EVP_PKEY_assign_RSA(*evpPublicKey, rsa)) { ++ EVP_PKEY_free(*evpPublicKey); + goto_error(r, TSS2_FAPI_RC_GENERAL_FAILURE, "Assign rsa key", + error_cleanup); + } +- return TSS2_RC_SUCCESS; +- ++ rsa = NULL; /* ownership transferred */ + error_cleanup: + OSSL_FREE(rsa, RSA); ++#else /* OPENSSL_VERSION_NUMBER < 0x30000000L */ ++ if ((build = OSSL_PARAM_BLD_new()) == NULL ++ || !OSSL_PARAM_BLD_push_BN(build, OSSL_PKEY_PARAM_RSA_N, n) ++ || !OSSL_PARAM_BLD_push_uint32(build, OSSL_PKEY_PARAM_RSA_E, exp) ++ || (params = OSSL_PARAM_BLD_to_param(build)) == NULL) { ++ goto_error(r, TSS2_FAPI_RC_GENERAL_FAILURE, "Create rsa key parameters", ++ error_cleanup); ++ } ++ ++ if ((ctx = EVP_PKEY_CTX_new_from_name(NULL, "RSA", NULL)) == NULL ++ || EVP_PKEY_fromdata_init(ctx) <= 0 ++ || EVP_PKEY_fromdata(ctx, evpPublicKey, EVP_PKEY_PUBLIC_KEY, params) <= 0) { ++ goto_error(r, TSS2_FAPI_RC_GENERAL_FAILURE, "Create rsa key", ++ error_cleanup); ++ } ++error_cleanup: ++ OSSL_FREE(ctx, EVP_PKEY_CTX); ++ OSSL_FREE(params, OSSL_PARAM); ++ OSSL_FREE(build, OSSL_PARAM_BLD); ++#endif /* OPENSSL_VERSION_NUMBER < 0x30000000L */ + OSSL_FREE(e, BN); + OSSL_FREE(n, BN); +- OSSL_FREE(d, BN); +- OSSL_FREE(p, BN); +- OSSL_FREE(q, BN); +- OSSL_FREE(dmp1, BN); +- OSSL_FREE(dmq1, BN); +- OSSL_FREE(iqmp, BN); + return r; + } + +@@ -459,18 +487,26 @@ error_cleanup: + * the function. + */ + static TSS2_RC +-ossl_ecc_pub_from_tpm(const TPM2B_PUBLIC *tpmPublicKey, EVP_PKEY *evpPublicKey) ++ossl_ecc_pub_from_tpm(const TPM2B_PUBLIC *tpmPublicKey, EVP_PKEY **evpPublicKey) + { + /* Check for NULL parameters */ + return_if_null(tpmPublicKey, "tpmPublicKey is NULL", TSS2_FAPI_RC_BAD_REFERENCE); + return_if_null(evpPublicKey, "evpPublicKey is NULL", TSS2_FAPI_RC_BAD_REFERENCE); + +- TSS2_RC r; ++ TSS2_RC r = TSS2_RC_SUCCESS; + EC_GROUP *ecgroup = NULL; + int curveId; + BIGNUM *x = NULL, *y = NULL; +- EC_KEY *ecKey = EC_KEY_new(); +- return_if_null(ecKey, "Out of memory.", TSS2_FAPI_RC_MEMORY); ++ EC_POINT *ecPoint = NULL; ++#if OPENSSL_VERSION_NUMBER < 0x30000000L ++ EC_KEY *ecKey = NULL; ++#else ++ OSSL_PARAM_BLD *build = NULL; ++ OSSL_PARAM *params = NULL; ++ EVP_PKEY_CTX *ctx = NULL; ++ unsigned char *puboct = NULL; ++ size_t bsize; ++#endif + + /* Find the curve of the ECC key */ + switch (tpmPublicKey->publicArea.parameters.eccDetail.curveID) { +@@ -499,12 +535,6 @@ ossl_ecc_pub_from_tpm(const TPM2B_PUBLIC *tpmPublicKey, EVP_PKEY *evpPublicKey) + goto_if_null(ecgroup, "new EC group.", TSS2_FAPI_RC_GENERAL_FAILURE, + error_cleanup); + +- if (!EC_KEY_set_group(ecKey, ecgroup)) { +- goto_error(r, TSS2_FAPI_RC_GENERAL_FAILURE, "EC_KEY_set_group", +- error_cleanup); +- } +- EC_GROUP_free(ecgroup); +- + /* Set the ECC parameters in the OpenSSL key */ + x = BN_bin2bn(tpmPublicKey->publicArea.unique.ecc.x.buffer, + tpmPublicKey->publicArea.unique.ecc.x.size, NULL); +@@ -516,23 +546,67 @@ ossl_ecc_pub_from_tpm(const TPM2B_PUBLIC *tpmPublicKey, EVP_PKEY *evpPublicKey) + goto_error(r, TSS2_FAPI_RC_MEMORY, "Out of memory", error_cleanup); + } + +- if (!EC_KEY_set_public_key_affine_coordinates(ecKey, x, y)) { ++ if ((ecPoint = EC_POINT_new(ecgroup)) == NULL ++ || !EC_POINT_set_affine_coordinates_tss(ecgroup, ecPoint, x, y, NULL)) { ++ goto_error(r, TSS2_FAPI_RC_GENERAL_FAILURE, "EC_POINT_set_affine_coordinates", ++ error_cleanup); ++ } ++ ++#if OPENSSL_VERSION_NUMBER < 0x30000000 ++ ecKey = EC_KEY_new(); ++ return_if_null(ecKey, "Out of memory.", TSS2_FAPI_RC_MEMORY); ++ ++ if (!EC_KEY_set_group(ecKey, ecgroup)) { ++ goto_error(r, TSS2_FAPI_RC_GENERAL_FAILURE, "EC_KEY_set_group", ++ error_cleanup); ++ } ++ ++ if (!EC_KEY_set_public_key(ecKey, ecPoint)) { + goto_error(r, TSS2_FAPI_RC_GENERAL_FAILURE, +- "EC_KEY_set_public_key_affine_coordinates", error_cleanup); ++ "EC_KEY_set_public_key", error_cleanup); + } + +- if (!EVP_PKEY_assign_EC_KEY(evpPublicKey, ecKey)) { ++ *evpPublicKey = EVP_PKEY_new(); ++ goto_if_null2(*evpPublicKey, "Out of memory.", r, TSS2_FAPI_RC_MEMORY, error_cleanup); ++ ++ if (!EVP_PKEY_assign_EC_KEY(*evpPublicKey, ecKey)) { ++ EVP_PKEY_free(*evpPublicKey); + goto_error(r, TSS2_FAPI_RC_GENERAL_FAILURE, "Assign ecc key", + error_cleanup); + } +- OSSL_FREE(y, BN); +- OSSL_FREE(x, BN); +- return TSS2_RC_SUCCESS; ++ ecKey = NULL; /* ownership transferred */ ++error_cleanup: ++ OSSL_FREE(ecKey, EC_KEY); ++#else ++ if ((build = OSSL_PARAM_BLD_new()) == NULL ++ || !OSSL_PARAM_BLD_push_utf8_string(build, OSSL_PKEY_PARAM_GROUP_NAME, ++ (char *)OBJ_nid2sn(curveId), 0) ++ || (bsize = EC_POINT_point2buf(ecgroup, ecPoint, ++ POINT_CONVERSION_COMPRESSED, ++ &puboct, NULL)) == 0 ++ || !OSSL_PARAM_BLD_push_octet_string(build, OSSL_PKEY_PARAM_PUB_KEY, ++ puboct, bsize) ++ || (params = OSSL_PARAM_BLD_to_param(build)) == NULL) { ++ goto_error(r, TSS2_FAPI_RC_GENERAL_FAILURE, "Create ecc key parameters", ++ error_cleanup); ++ } + ++ if ((ctx = EVP_PKEY_CTX_new_from_name(NULL, "EC", NULL)) == NULL ++ || EVP_PKEY_fromdata_init(ctx) <= 0 ++ || EVP_PKEY_fromdata(ctx, evpPublicKey, EVP_PKEY_PUBLIC_KEY, params) <= 0) { ++ goto_error(r, TSS2_FAPI_RC_GENERAL_FAILURE, "Create ecc key", ++ error_cleanup); ++ } + error_cleanup: ++ EVP_PKEY_CTX_free(ctx); ++ OSSL_PARAM_free(params); ++ OSSL_PARAM_BLD_free(build); ++ OPENSSL_free(puboct); ++#endif ++ OSSL_FREE(ecPoint, EC_POINT); ++ OSSL_FREE(ecgroup, EC_GROUP); + OSSL_FREE(y, BN); + OSSL_FREE(x, BN); +- OSSL_FREE(ecKey, EC_KEY); + return r; + } + +@@ -567,18 +641,15 @@ ifapi_pub_pem_key_from_tpm( + BIO *bio = NULL; + TSS2_RC r = TPM2_RC_SUCCESS; + +- evpPublicKey = EVP_PKEY_new(); +- goto_if_null2(evpPublicKey, "Out of memory.", r, TSS2_FAPI_RC_MEMORY, cleanup); +- + /* Memory IO will be used for OSSL key conversion */ + bio = BIO_new(BIO_s_mem()); +- goto_if_null2(evpPublicKey, "Out of memory.", r, TSS2_FAPI_RC_MEMORY, cleanup); ++ goto_if_null2(bio, "Out of memory.", r, TSS2_FAPI_RC_MEMORY, cleanup); + + if (tpmPublicKey->publicArea.type == TPM2_ALG_RSA) { +- r = ossl_rsa_pub_from_tpm(tpmPublicKey, evpPublicKey); +- } else if (tpmPublicKey->publicArea.type == TPM2_ALG_ECC) +- r = ossl_ecc_pub_from_tpm(tpmPublicKey, evpPublicKey); +- else { ++ r = ossl_rsa_pub_from_tpm(tpmPublicKey, &evpPublicKey); ++ } else if (tpmPublicKey->publicArea.type == TPM2_ALG_ECC) { ++ r = ossl_ecc_pub_from_tpm(tpmPublicKey, &evpPublicKey); ++ } else { + goto_error(r, TSS2_FAPI_RC_BAD_VALUE, "Invalid alg id.", cleanup); + } + goto_if_error(r, "Get ossl public key.", cleanup); +@@ -708,7 +779,6 @@ ifapi_der_sig_to_tpm( + signatureSize); + } else { + return_error(TSS2_FAPI_RC_BAD_VALUE, "Invalid RSA scheme."); +- + } + } else if (tpmPublic->type == TPM2_ALG_ECC) { + return ifapi_ecc_der_sig_to_tpm(signature, signatureSize, +@@ -856,12 +926,16 @@ ecdsa_verify_signature( + return_if_null(digest, "digest is NULL", TSS2_FAPI_RC_BAD_REFERENCE); + + TSS2_RC r = TSS2_RC_SUCCESS; +- EC_KEY *eccKey = NULL; ++ EVP_PKEY_CTX *ctx = NULL; + +- eccKey = EVP_PKEY_get1_EC_KEY(publicKey); ++ if ((ctx = EVP_PKEY_CTX_new(publicKey, NULL)) == NULL ++ || !EVP_PKEY_verify_init(ctx)) { ++ goto_error(r, TSS2_FAPI_RC_GENERAL_FAILURE, ++ "Cannot initialize signature verification.", error_cleanup); ++ } + + /* Try to verify the signature using ECDSA, note that param 0 is unused */ +- int rc = ECDSA_verify(0, digest, digestSize, signature, signatureSize, eccKey); ++ int rc = EVP_PKEY_verify(ctx, signature, signatureSize, digest, digestSize); + if (rc == 0) { + goto_error(r, TSS2_FAPI_RC_SIGNATURE_VERIFICATION_FAILED, + "ECDSA signature verification failed.", error_cleanup); +@@ -871,7 +945,7 @@ ecdsa_verify_signature( + } + + error_cleanup: +- OSSL_FREE(eccKey, EC_KEY); ++ OSSL_FREE(ctx, EVP_PKEY_CTX); + return r; + } + +@@ -900,23 +974,43 @@ get_rsa_tpm2b_public_from_evp( + + /* Extract the public information */ + TSS2_RC r = TSS2_RC_SUCCESS; ++ int keyBits, keySize; ++ ++#if OPENSSL_VERSION_NUMBER < 0x30000000L ++ const BIGNUM *e = NULL, *n = NULL; + RSA *rsaKey = EVP_PKEY_get1_RSA(publicKey); + return_if_null(rsaKey, "Out of memory.", TSS2_FAPI_RC_MEMORY); +- const BIGNUM *e = NULL, *n = NULL; +- int rsaKeySize = RSA_size(rsaKey); + ++ keySize = RSA_size(rsaKey); ++ keyBits = keySize * 8; + RSA_get0_key(rsaKey, &n, &e, NULL); +- tpmPublic->publicArea.unique.rsa.size = rsaKeySize; ++#else ++ BIGNUM *e = NULL, *n = NULL; ++ ++ keyBits = EVP_PKEY_get_bits(publicKey); ++ keySize = (keyBits + 7) / 8; ++ if (!EVP_PKEY_get_bn_param(publicKey, OSSL_PKEY_PARAM_RSA_N, &n) ++ || !EVP_PKEY_get_bn_param(publicKey, OSSL_PKEY_PARAM_RSA_E, &e)) { ++ goto_error(r, TSS2_FAPI_RC_GENERAL_FAILURE, ++ "Retrieve pubkey", cleanup); ++ } ++#endif ++ tpmPublic->publicArea.unique.rsa.size = keySize; + if (1 != ifapi_bn2binpad(n, &tpmPublic->publicArea.unique.rsa.buffer[0], +- rsaKeySize)) { ++ keySize)) { + goto_error(r, TSS2_FAPI_RC_GENERAL_FAILURE, + "Write big num byte buffer", cleanup); + } +- tpmPublic->publicArea.parameters.rsaDetail.keyBits = rsaKeySize * 8; ++ tpmPublic->publicArea.parameters.rsaDetail.keyBits = keyBits; + tpmPublic->publicArea.parameters.rsaDetail.exponent = BN_get_word(e); + + cleanup: ++#if OPENSSL_VERSION_NUMBER < 0x30000000L + OSSL_FREE(rsaKey, RSA); ++#else ++ BN_free(e); ++ BN_free(n); ++#endif + return r; + } + +@@ -947,27 +1041,22 @@ get_ecc_tpm2b_public_from_evp( + + /* Initialize variables that will contain the relevant information */ + TSS2_RC r = TSS2_RC_SUCCESS; +- EC_KEY *ecKey = EVP_PKEY_get1_EC_KEY(publicKey); +- return_if_null(ecKey, "Out of memory.", TSS2_FAPI_RC_MEMORY); +- const EC_GROUP *ecGroup; +- const EC_POINT *publicPoint; + int curveId; + size_t ecKeySize; + BIGNUM *bnX = NULL; + BIGNUM *bnY = NULL; + TPMI_ECC_CURVE tpmCurveId; +- +- if (!ecKey) { +- return_error(TSS2_FAPI_RC_GENERAL_FAILURE, "No ECC key!"); +- } ++#if OPENSSL_VERSION_NUMBER < 0x30000000 ++ const EC_GROUP *ecGroup; ++ const EC_POINT *publicPoint; ++ EC_KEY *ecKey = EVP_PKEY_get1_EC_KEY(publicKey); ++ return_if_null(ecKey, "Out of memory.", TSS2_FAPI_RC_MEMORY); + + /* Retrieve the relevant information and write it to tpmPublic */ + ecGroup = EC_KEY_get0_group(ecKey); + publicPoint = EC_KEY_get0_public_key(ecKey); + curveId = EC_GROUP_get_curve_name(ecGroup); +- ecKeySize = EC_GROUP_get_degree(ecGroup) / 8; +- tpmPublic->publicArea.unique.ecc.x.size = ecKeySize; +- tpmPublic->publicArea.unique.ecc.y.size = ecKeySize; ++ ecKeySize = (EC_GROUP_get_degree(ecGroup) + 7) / 8; + + if (!(bnX = BN_new())) { + goto_error(r, TSS2_FAPI_RC_GENERAL_FAILURE, "Create bignum", cleanup); +@@ -982,6 +1071,23 @@ get_ecc_tpm2b_public_from_evp( + goto_error(r, TSS2_FAPI_RC_GENERAL_FAILURE, + "Get affine coordinates", cleanup); + } ++#else ++ char curveName[80]; ++ ++ if (!EVP_PKEY_get_utf8_string_param(publicKey, OSSL_PKEY_PARAM_GROUP_NAME, ++ curveName, sizeof(curveName), NULL) ++ || !EVP_PKEY_get_bn_param(publicKey, OSSL_PKEY_PARAM_EC_PUB_X, &bnX) ++ || !EVP_PKEY_get_bn_param(publicKey, OSSL_PKEY_PARAM_EC_PUB_Y, &bnY)) { ++ goto_error(r, TSS2_ESYS_RC_GENERAL_FAILURE, ++ "Get public key", cleanup); ++ } ++ curveId = OBJ_txt2nid(curveName); ++ EC_GROUP *ecGroup = EC_GROUP_new_by_curve_name(curveId); ++ ecKeySize = (EC_GROUP_get_degree(ecGroup) + 7) / 8; ++ EC_GROUP_free(ecGroup); ++#endif ++ tpmPublic->publicArea.unique.ecc.x.size = ecKeySize; ++ tpmPublic->publicArea.unique.ecc.y.size = ecKeySize; + if (1 != ifapi_bn2binpad(bnX, &tpmPublic->publicArea.unique.ecc.x.buffer[0], + ecKeySize)) { + goto_error(r, TSS2_FAPI_RC_GENERAL_FAILURE, +@@ -1015,7 +1121,9 @@ get_ecc_tpm2b_public_from_evp( + tpmPublic->publicArea.parameters.eccDetail.curveID = tpmCurveId; + + cleanup: ++#if OPENSSL_VERSION_NUMBER < 0x30000000 + OSSL_FREE(ecKey, EC_KEY); ++#endif + OSSL_FREE(bnX, BN); + OSSL_FREE(bnY, BN); + return r; +@@ -2077,14 +2185,11 @@ ifapi_get_tpm_key_fingerprint( + "Unsupported hash algorithm (%" PRIu16 ")", cleanup, + hashAlg); + +- evpPublicKey = EVP_PKEY_new(); +- goto_if_null2(evpPublicKey, "Out of memory.", r, TSS2_FAPI_RC_MEMORY, cleanup); +- + if (tpmPublicKey->publicArea.type == TPM2_ALG_RSA) { +- r = ossl_rsa_pub_from_tpm(tpmPublicKey, evpPublicKey); +- } else if (tpmPublicKey->publicArea.type == TPM2_ALG_ECC) +- r = ossl_ecc_pub_from_tpm(tpmPublicKey, evpPublicKey); +- else { ++ r = ossl_rsa_pub_from_tpm(tpmPublicKey, &evpPublicKey); ++ } else if (tpmPublicKey->publicArea.type == TPM2_ALG_ECC) { ++ r = ossl_ecc_pub_from_tpm(tpmPublicKey, &evpPublicKey); ++ } else { + goto_error(r,TSS2_FAPI_RC_BAD_VALUE, "Invalid alg id.", cleanup); + } + goto_if_error(r, "Get ossl public key.", cleanup); +diff --git a/test/helper/tpm_getek.c b/test/helper/tpm_getek.c +index c6a8e906..67f76b6a 100644 +--- a/test/helper/tpm_getek.c ++++ b/test/helper/tpm_getek.c +@@ -7,8 +7,14 @@ + #include + #include + #include +-#include + #include ++#if OPENSSL_VERSION_NUMBER < 0x30000000 ++#include ++#else ++#include ++#include ++#include ++#endif + + #include "tss2_sys.h" + #include "tss2_mu.h" +@@ -109,7 +115,7 @@ main (int argc, char *argv[]) + + /* Convert the key from out_public to PEM */ + +- EVP_PKEY *evp = EVP_PKEY_new(); ++ EVP_PKEY *evp = NULL; + BIO *bio; + FILE *out = NULL; + +@@ -124,34 +130,35 @@ main (int argc, char *argv[]) + else + bio = BIO_new_fp(stdout, BIO_NOCLOSE); + +- RSA *rsa = RSA_new(); +- BIGNUM *e = BN_new(); +- BIGNUM *d = BN_new(); +- BIGNUM *p = BN_new(); +- BIGNUM *q = BN_new(); +- BIGNUM *dmp1 = BN_new(); +- BIGNUM *dmq1 = BN_new(); +- BIGNUM *iqmp = BN_new(); + BIGNUM *n = BN_bin2bn(out_public.publicArea.unique.rsa.buffer, + out_public.publicArea.unique.rsa.size, NULL); +- BN_set_word(d, 0); +- BN_set_word(p, 0); +- BN_set_word(q, 0); +- BN_set_word(dmp1, 0); +- BN_set_word(dmq1, 0); +- BN_set_word(iqmp, 0); + uint32_t exp; + if (out_public.publicArea.parameters.rsaDetail.exponent == 0) + exp = 65537; + else + exp = out_public.publicArea.parameters.rsaDetail.exponent; ++ ++#if OPENSSL_VERSION_NUMBER < 0x30000000 ++ BIGNUM *e = BN_new(); + BN_set_word(e, exp); + +- RSA_set0_key(rsa, n, e, d); +- RSA_set0_factors(rsa, p, q); +- RSA_set0_crt_params(rsa, dmp1, dmq1, iqmp); ++ RSA *rsa = RSA_new(); ++ RSA_set0_key(rsa, n, e, NULL); ++ n = NULL; ++ e = NULL; + ++ evp = EVP_PKEY_new(); + EVP_PKEY_assign_RSA(evp, rsa); ++#else /* OPENSSL_VERSION_NUMBER < 0x30000000 */ ++ OSSL_PARAM_BLD *build = OSSL_PARAM_BLD_new(); ++ OSSL_PARAM_BLD_push_BN(build, OSSL_PKEY_PARAM_RSA_N, n); ++ OSSL_PARAM_BLD_push_uint32(build, OSSL_PKEY_PARAM_RSA_E, exp); ++ OSSL_PARAM *params = OSSL_PARAM_BLD_to_param(build); ++ ++ EVP_PKEY_CTX *ctx = EVP_PKEY_CTX_new_from_name(NULL, "RSA", NULL); ++ EVP_PKEY_fromdata_init(ctx); ++ EVP_PKEY_fromdata(ctx, &evp, EVP_PKEY_PUBLIC_KEY, params); ++#endif /* OPENSSL_VERSION_NUMBER < 0x30000000 */ + + if (!PEM_write_bio_PUBKEY(bio, evp)) { + LOG_ERROR("PEM_write failed"); +@@ -159,6 +166,14 @@ main (int argc, char *argv[]) + } + + EVP_PKEY_free(evp); ++#if OPENSSL_VERSION_NUMBER < 0x30000000 ++ /* ownership was taken by the EVP_PKEY */ ++#else ++ EVP_PKEY_CTX_free(ctx); ++ OSSL_PARAM_free(params); ++ OSSL_PARAM_BLD_free(build); ++#endif ++ BN_free(n); + BIO_free(bio); + fclose(out); + +diff --git a/test/helper/tpm_getek_ecc.c b/test/helper/tpm_getek_ecc.c +index 75165fdd..d4602925 100644 +--- a/test/helper/tpm_getek_ecc.c ++++ b/test/helper/tpm_getek_ecc.c +@@ -7,9 +7,15 @@ + #include + #include + #include +-#include + #include + #include ++#if OPENSSL_VERSION_NUMBER < 0x30000000 ++#include ++#else ++#include ++#include ++#include ++#endif + #include + + #include "tss2_sys.h" +@@ -127,8 +133,7 @@ main (int argc, char *argv[]) + + /* Convert the key from out_public to PEM */ + +- EVP_PKEY *evp = EVP_PKEY_new(); +- EC_KEY *ecc_key = EC_KEY_new(); ++ EVP_PKEY *evp = NULL; + BIGNUM *x = NULL, *y = NULL; + BIO *bio; + FILE *out = NULL; +@@ -148,11 +153,6 @@ main (int argc, char *argv[]) + nid = EC_curve_nist2nid("P-256"); + EC_GROUP *ecgroup = EC_GROUP_new_by_curve_name(nid); + +- if (!EC_KEY_set_group(ecc_key, ecgroup)) +- exit(1); +- +- EC_GROUP_free(ecgroup); +- + /* Set the ECC parameters in the OpenSSL key */ + x = BN_bin2bn(out_public.publicArea.unique.ecc.x.buffer, + out_public.publicArea.unique.ecc.x.size, NULL); +@@ -164,15 +164,46 @@ main (int argc, char *argv[]) + exit(1); + } + +- if (!EC_KEY_set_public_key_affine_coordinates(ecc_key, x, y)) { ++ EC_POINT *point = EC_POINT_new(ecgroup); ++#if OPENSSL_VERSION_NUMBER < 0x10101000L ++ EC_POINT_set_affine_coordinates_GFp(ecgroup, point, x, y, NULL); ++#else ++ EC_POINT_set_affine_coordinates(ecgroup, point, x, y, NULL); ++#endif ++ ++#if OPENSSL_VERSION_NUMBER < 0x30000000 ++ EC_KEY *ecc_key = EC_KEY_new(); ++ if (!EC_KEY_set_group(ecc_key, ecgroup)) ++ exit(1); ++ ++ if (!EC_KEY_set_public_key(ecc_key, point)) { + exit(1); + } + ++ evp = EVP_PKEY_new(); + if (!EVP_PKEY_assign_EC_KEY(evp, ecc_key)) { + handleErrors(); + LOG_ERROR("PEM_write failed"); + exit(1); + } ++#else /* OPENSSL_VERSION_NUMBER < 0x30000000 */ ++ unsigned char *puboct = NULL; ++ size_t bsize; ++ ++ bsize = EC_POINT_point2buf(ecgroup, point, POINT_CONVERSION_UNCOMPRESSED, ++ &puboct, NULL); ++ ++ OSSL_PARAM_BLD *build = OSSL_PARAM_BLD_new(); ++ OSSL_PARAM_BLD_push_utf8_string(build, OSSL_PKEY_PARAM_GROUP_NAME, ++ (char *)OBJ_nid2sn(nid), 0); ++ OSSL_PARAM_BLD_push_octet_string(build, OSSL_PKEY_PARAM_PUB_KEY, ++ puboct, bsize); ++ OSSL_PARAM *params = OSSL_PARAM_BLD_to_param(build); ++ ++ EVP_PKEY_CTX *ctx = EVP_PKEY_CTX_new_from_name(NULL, "EC", NULL); ++ EVP_PKEY_fromdata_init(ctx); ++ EVP_PKEY_fromdata(ctx, &evp, EVP_PKEY_PUBLIC_KEY, params); ++#endif /* OPENSSL_VERSION_NUMBER < 0x30000000 */ + + if (!PEM_write_bio_PUBKEY(bio, evp)) { + handleErrors(); +@@ -180,9 +211,19 @@ main (int argc, char *argv[]) + exit(1); + } + ++ EVP_PKEY_free(evp); ++#if OPENSSL_VERSION_NUMBER < 0x30000000 ++ /* ownership was taken by the EVP_PKEY */ ++#else ++ EVP_PKEY_CTX_free(ctx); ++ OSSL_PARAM_free(params); ++ OSSL_PARAM_BLD_free(build); ++ OPENSSL_free(puboct); ++#endif ++ EC_POINT_free(point); ++ EC_GROUP_free(ecgroup); + BN_free(y); + BN_free(x); +- EVP_PKEY_free(evp); + BIO_free(bio); + fclose(out); + +-- +2.26.3 + diff --git a/SPECS/tpm2-tss.spec b/SPECS/tpm2-tss.spec index 97cc119..067c5d0 100644 --- a/SPECS/tpm2-tss.spec +++ b/SPECS/tpm2-tss.spec @@ -1,6 +1,6 @@ Name: tpm2-tss Version: 3.0.3 -Release: 5%{?dist} +Release: 6%{?dist} Summary: TPM2.0 Software Stack # The entire source code is under BSD except implementation.h and tpmb.h which @@ -10,6 +10,20 @@ URL: https://github.com/tpm2-software/tpm2-tss Source0: https://github.com/tpm2-software/tpm2-tss/releases/download/%{version}/%{name}-%{version}.tar.gz # doxygen crash Patch0: tpm2-tss-3.0.0-doxygen.patch +# OpenSSL 3 support +Patch1: 0001-FAPI-Fix-reading-of-the-root-certificate-for-provisi.patch +Patch2: 0002-FAPI-use-FAPI_TEST_EK_CERT_LESS-with-disable-self-ge.patch +Patch3: 0003-Makefile.am-Use-LIBCRYPTO_CFLAGS-when-building-FAPI.patch +Patch4: 0004-Test-Remove-duplicate-openssl-req-new.patch +Patch5: 0005-FAPI-Test-Call-EVP_DigestSignInit-in-the-correct-ord.patch +Patch6: 0006-FAPI-Test-Use-EVP_PKEY_base_id-to-detect-key-type.patch +Patch7: 0007-FAPI-Test-Change-RSA_sign-to-EVP_PKEY_sign.patch +Patch8: 0008-Require-OpenSSL-1.1.0.patch +Patch9: 0009-FAPI-Change-SHA256_Update-to-EVP_DigestUpdate.patch +Patch10: 0010-Test-Use-EVP_MAC_xxx-with-OpenSSL-3.0.patch +Patch11: 0011-Drop-support-for-OpenSSL-1.1.0.patch +Patch12: 0012-Implement-EVP_PKEY-export-import-for-OpenSSL-3.0.patch + %global udevrules_prefix 60- @@ -33,9 +47,10 @@ APIs. It sits between TPM driver and applications, providing TPM2.0 specified APIs for applications to access TPM module through kernel TPM drivers. %prep -%autosetup -n %{name}-%{version} +%autosetup -p1 -n %{name}-%{version} %build +autoreconf -i # Use built-in tpm-udev.rules, with specified installation path and prefix. %configure --disable-static --disable-silent-rules \ --with-udevrulesdir=%{_udevrulesdir} --with-udevrulesprefix=%{udevrules_prefix} \ @@ -118,6 +133,10 @@ use tpm2-tss. %changelog +* Wed Aug 18 2021 Štěpán Horáček - 3.0.3-6 +- Fix failures while using OpenSSL 3 + Resolves: rhbz#1984634 + * Tue Aug 10 2021 Mohan Boddu - 3.0.3-5 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags Related: rhbz#1991688