diff options
| author | James Bottomley <James.Bottomley@HansenPartnership.com> | 2023-06-29 16:31:22 -0400 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2023-06-29 16:50:52 -0400 |
| commit | cd2b01cd05bd1e77e1bfaa47796fb27f283bf60e (patch) | |
| tree | 855dcc4afbc7e35e07f0078c80e2f548b59266ed | |
| parent | ccf5b65b8e7842b40c5ff759a8846e16d040b3d0 (diff) | |
| download | openssl_tpm2_engine-cd2b01cd05bd1e77e1bfaa47796fb27f283bf60e.tar.gz | |
intel-tss: more openssl-3 fixes
Update incorrect use of macro to OPENSSL_VERSION_NUMBER
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
| -rw-r--r-- | src/include/intel-tss.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/include/intel-tss.h b/src/include/intel-tss.h index db38fee..7525c19 100644 --- a/src/include/intel-tss.h +++ b/src/include/intel-tss.h @@ -398,7 +398,7 @@ TSS_HMAC_Generate(TPMT_HA *digest, const TPM2B_KEY *hmacKey, ...) const EVP_MD *md; /* message digest method */ #if OPENSSL_VERSION_NUMBER < 0x10100000 HMAC_CTX ctx; -#elif OPENSSL_VERSION < 0x30000000 +#elif OPENSSL_VERSION_NUMBER < 0x30000000 HMAC_CTX *ctx; #else EVP_MAC *mac = EVP_MAC_fetch(NULL, "HMAC", NULL); @@ -417,7 +417,7 @@ TSS_HMAC_Generate(TPMT_HA *digest, const TPM2B_KEY *hmacKey, ...) #if OPENSSL_VERSION_NUMBER < 0x10100000 HMAC_CTX_init(&ctx); -#elif OPENSSL_VERSION < 0x30000000 +#elif OPENSSL_VERSION_NUMBER < 0x30000000 ctx = HMAC_CTX_new(); #else ctx = EVP_MAC_CTX_new(mac); @@ -431,7 +431,7 @@ TSS_HMAC_Generate(TPMT_HA *digest, const TPM2B_KEY *hmacKey, ...) hmacKey->buffer, hmacKey->size, /* HMAC key */ md, /* message digest method */ NULL); -#elif OPENSSL_VERSION < 0x30000000 +#elif OPENSSL_VERSION_NUMBER < 0x30000000 rc = HMAC_Init_ex(ctx, hmacKey->buffer, hmacKey->size, /* HMAC key */ md, /* message digest method */ @@ -457,7 +457,7 @@ TSS_HMAC_Generate(TPMT_HA *digest, const TPM2B_KEY *hmacKey, ...) } #if OPENSSL_VERSION_NUMBER < 0x10100000 rc = HMAC_Update(&ctx, buffer, length); -#elif OPENSSL_VERSION < 0x30000000 +#elif OPENSSL_VERSION_NUMBER < 0x30000000 rc = HMAC_Update(ctx, buffer, length); #else rc = EVP_MAC_update(ctx, buffer, length); @@ -471,7 +471,7 @@ TSS_HMAC_Generate(TPMT_HA *digest, const TPM2B_KEY *hmacKey, ...) #if OPENSSL_VERSION_NUMBER < 0x10100000 rc = HMAC_Final(&ctx, (uint8_t *)&digest->digest, NULL); -#elif OPENSSL_VERSION < 0x30000000 +#elif OPENSSL_VERSION_NUMBER < 0x30000000 rc = HMAC_Final(ctx, (uint8_t *)&digest->digest, NULL); #else rc = EVP_MAC_final(ctx, (uint8_t *)&digest->digest, NULL, TSS_GetDigestSize(digest->hashAlg)); @@ -484,7 +484,7 @@ TSS_HMAC_Generate(TPMT_HA *digest, const TPM2B_KEY *hmacKey, ...) out_free: #if OPENSSL_VERSION_NUMBER < 0x10100000 HMAC_CTX_cleanup(&ctx); -#elif OPENSSL_VERSION < 0x30000000 +#elif OPENSSL_VERSION_NUMBER < 0x30000000 HMAC_CTX_free(ctx); #else EVP_MAC_CTX_free(ctx); |