diff options
| author | James Bottomley <James.Bottomley@HansenPartnership.com> | 2023-06-25 08:53:35 -0400 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2023-06-26 10:13:45 -0400 |
| commit | 058fdde98ce658d1d3f67e08f55fce6e68c38319 (patch) | |
| tree | 7bd15059a28ed8c99c70b2f32d19dc26b01fbb5e | |
| parent | 196d7a43297885ca86cb44adcfcc8cc3b2f7bd24 (diff) | |
| download | openssl_tpm2_engine-058fdde98ce658d1d3f67e08f55fce6e68c38319.tar.gz | |
intel-tss: fix openssl3 code
The correct format of an else if in CPP is #elif not #elsif (not sure
why the CPP didn't error).
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 da4c682..b82d09f 100644 --- a/src/include/intel-tss.h +++ b/src/include/intel-tss.h @@ -393,7 +393,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; -#elsif OPENSSL_VERSION < 0x30000000 +#elif OPENSSL_VERSION < 0x30000000 HMAC_CTX *ctx; #else EVP_MAC *mac = EVP_MAC_fetch(NULL, "HMAC", NULL); @@ -412,7 +412,7 @@ TSS_HMAC_Generate(TPMT_HA *digest, const TPM2B_KEY *hmacKey, ...) #if OPENSSL_VERSION_NUMBER < 0x10100000 HMAC_CTX_init(&ctx); -#elsif OPENSSL_VERSION < 0x30000000 +#elif OPENSSL_VERSION < 0x30000000 ctx = HMAC_CTX_new(); #else ctx = EVP_MAC_CTX_new(mac); @@ -426,7 +426,7 @@ TSS_HMAC_Generate(TPMT_HA *digest, const TPM2B_KEY *hmacKey, ...) hmacKey->buffer, hmacKey->size, /* HMAC key */ md, /* message digest method */ NULL); -#elsif OPENSSL_VERSION < 0x30000000 +#elif OPENSSL_VERSION < 0x30000000 rc = HMAC_Init_ex(ctx, hmacKey->buffer, hmacKey->size, /* HMAC key */ md, /* message digest method */ @@ -452,7 +452,7 @@ TSS_HMAC_Generate(TPMT_HA *digest, const TPM2B_KEY *hmacKey, ...) } #if OPENSSL_VERSION_NUMBER < 0x10100000 rc = HMAC_Update(&ctx, buffer, length); -#elsif OPENSSL_VERSION < 0x30000000 +#elif OPENSSL_VERSION < 0x30000000 rc = HMAC_Update(ctx, buffer, length); #else rc = EVP_MAC_update(ctx, buffer, length); @@ -466,7 +466,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); -#elsif OPENSSL_VERSION < 0x30000000 +#elif OPENSSL_VERSION < 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)); @@ -479,7 +479,7 @@ TSS_HMAC_Generate(TPMT_HA *digest, const TPM2B_KEY *hmacKey, ...) out_free: #if OPENSSL_VERSION_NUMBER < 0x10100000 HMAC_CTX_cleanup(&ctx); -#elsif OPENSSL_VERSION < 0x30000000 +#elif OPENSSL_VERSION < 0x30000000 HMAC_CTX_free(ctx); #else EVP_MAC_CTX_free(ctx); |