VirtualBox

Changeset 91691 in vbox


Ignore:
Timestamp:
Oct 12, 2021 1:29:42 PM (3 years ago)
Author:
vboxsync
Message:

src/libs: Fix openssl version number check for API which was added in 1.1.1 and not in 1.1.0, bugref:10078

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/libs/libtpms-0.9.0/src/tpm2/crypto/openssl/TpmToOsslMath.c

    r91612 r91691  
    502502        FAIL(FATAL_ERROR_ALLOCATION);
    503503    // If this returns false, then the point is at infinity
    504 #if OPENSSL_VERSION_NUMBER >= 0x10100000L && \
    505     !defined(LIBRESSL_VERSION_NUMBER)                                   // libtpms added begin
     504#if OPENSSL_VERSION_NUMBER >= 0x10101000L && \
     505    !defined(LIBRESSL_VERSION_NUMBER)                                   // libtpms added begin VBox: fixed openssl version number check from 0x10100000L
    506506    OK = EC_POINT_get_affine_coordinates(E->G, pIn, x, y, E->CTX);
    507507#else                                                                   // libtpms added begin
     
    537537                FAIL(FATAL_ERROR_ALLOCATION);
    538538            P = EC_POINT_new(E->G);
    539 #if OPENSSL_VERSION_NUMBER >= 0x10100000L && \
    540     !defined(LIBRESSL_VERSION_NUMBER)                                   // libtpms added begin
     539#if OPENSSL_VERSION_NUMBER >= 0x10101000L && \
     540    !defined(LIBRESSL_VERSION_NUMBER)                                   // libtpms added begin VBox: fixed openssl version number check from 0x10100000L
    541541            if(!EC_POINT_set_affine_coordinates(E->G, P, bnX, bnY, E->CTX))
    542542#else                                                                   // libtpms added end
     
    595595           
    596596            // Need to use this in case Montgomery method is being used
    597 #if OPENSSL_VERSION_NUMBER >= 0x10100000L && \
    598     !defined(LIBRESSL_VERSION_NUMBER)                                           // libtpms added begin
     597#if OPENSSL_VERSION_NUMBER >= 0x10101000L && \
     598    !defined(LIBRESSL_VERSION_NUMBER)                                           // libtpms added begin VBox: fixed openssl version number check from 0x10100000L
    599599            VERIFY(EC_POINT_set_affine_coordinates(E->G, P, bnX, bnY, CTX));
    600600#else                                                                           // libtpms added end
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette