Proxmox-Port/libtpms
1
0
Fork 0
mirror of https://github.com/stefanberger/libtpms synced 2026-08-08 21:58:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tpm2: Use EC_POINT_set/get_affine_coordinates on OpenSSL >= 1.1

Browse Source 
Use the EC_POINT_set/get_affine_coordinates function on OpenSSL >= 1.1.
These function are a 1:1 replacement for the
EC_POINT_set/get_affine_coordinates_GFp functions and are available
since OpenSSL 1.1 and are deprecated in OpenSSL 3.0.

This patch addresses one aspect of the OpenSSL 3.0 issues raised in
issue #215.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
This commit is contained in:
Stefan Berger 2021-08-03 08:22:23 -04:00 committed by Stefan Berger
parent 7899608f2a
commit aa579cee5b
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/tpm2/crypto/openssl/TpmToOsslMath.c
View File

@ -501,7 +501,8 @@ PointFromOssl(
if(y == NULL)
FAIL(FATAL_ERROR_ALLOCATION);
// If this returns false, then the point is at infinity
#if defined(OPENSSL_API_COMPAT) && OPENSSL_API_COMPAT >= 0x10200000L // libtpms added
#if OPENSSL_VERSION_NUMBER >= 0x10100000L && \
!defined(LIBRESSL_VERSION_NUMBER) // libtpms added begin
OK = EC_POINT_get_affine_coordinates(E->G, pIn, x, y, E->CTX);
#else // libtpms added begin
OK = EC_POINT_get_affine_coordinates_GFp(E->G, pIn, x, y, E->CTX);
@ -535,7 +536,8 @@ EcPointInitialized(
if(E == NULL)
FAIL(FATAL_ERROR_ALLOCATION);
P = EC_POINT_new(E->G);
#if defined(OPENSSL_API_COMPAT) && OPENSSL_API_COMPAT >= 0x10200000L // libtpms added begin
#if OPENSSL_VERSION_NUMBER >= 0x10100000L && \
!defined(LIBRESSL_VERSION_NUMBER) // libtpms added begin
if(!EC_POINT_set_affine_coordinates(E->G, P, bnX, bnY, E->CTX))
#else // libtpms added end
if(!EC_POINT_set_affine_coordinates_GFp(E->G, P, bnX, bnY, E->CTX))
@ -592,11 +594,12 @@ BnCurveInitialize(
VERIFY(P != NULL);
// Need to use this in case Montgomery method is being used
#if defined(OPENSSL_API_COMPAT) && OPENSSL_API_COMPAT >= 0x10200000L
#if OPENSSL_VERSION_NUMBER >= 0x10100000L && \
!defined(LIBRESSL_VERSION_NUMBER) // libtpms added begin
VERIFY(EC_POINT_set_affine_coordinates(E->G, P, bnX, bnY, CTX));
#else
#else // libtpms added end
VERIFY(EC_POINT_set_affine_coordinates_GFp(E->G, P, bnX, bnY, CTX));
#endif
#endif // libtpms added
// Now set the generator
VERIFY(EC_GROUP_set_generator(E->G, P, bnN, bnH));