Skip to content

Commit d5b93f2

Browse files
committed
Gate on wolfTPM v3.9.0 for now until next rev of wolfTPM.
1 parent bda10eb commit d5b93f2

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

src/internal.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8325,7 +8325,7 @@ static int WP11_Object_LoadTpmKey(WP11_Object* object)
83258325
{
83268326
RsaKey* key = &object->data.rsaKey;
83278327
if (key->type == RSA_PRIVATE) {
8328-
#if defined(LIBWOLFTPM_VERSION_HEX) && LIBWOLFTPM_VERSION_HEX > 0x03009001
8328+
#if defined(LIBWOLFTPM_VERSION_HEX) && LIBWOLFTPM_VERSION_HEX > 0x03009000
83298329
ret = wolfTPM2_CreateRsaKeyBlob(&object->slot->tpmDev,
83308330
&object->slot->tpmSrk, &object->tpmKey, key);
83318331
#else
@@ -8375,7 +8375,7 @@ static int WP11_Object_LoadTpmKey(WP11_Object* object)
83758375
{
83768376
ecc_key* key = &object->data.ecKey;
83778377
if (key->type == ECC_PRIVATEKEY_ONLY || key->type == ECC_PRIVATEKEY) {
8378-
#if defined(LIBWOLFTPM_VERSION_HEX) && LIBWOLFTPM_VERSION_HEX > 0x03009001
8378+
#if defined(LIBWOLFTPM_VERSION_HEX) && LIBWOLFTPM_VERSION_HEX > 0x03009000
83798379
ret = wolfTPM2_CreateEccKeyBlob(&object->slot->tpmDev,
83808380
&object->slot->tpmSrk, &object->tpmKey, key);
83818381
#else
@@ -8468,7 +8468,7 @@ static int WP11_Object_LoadTpmKey(WP11_Object* object)
84688468
}
84698469
else if (object->tpmKey.pub.publicArea.type == TPM_ALG_ECC) {
84708470
/* tell crypto callback which EccKey to use */
8471-
#if defined(LIBWOLFTPM_VERSION_HEX) && LIBWOLFTPM_VERSION_HEX > 0x03009001
8471+
#if defined(LIBWOLFTPM_VERSION_HEX) && LIBWOLFTPM_VERSION_HEX > 0x03009000
84728472
object->slot->tpmCtx.ecdsaKey = &object->tpmKey;
84738473
#else
84748474
object->slot->tpmCtx.eccKey = (WOLFTPM2_KEY*)&object->tpmKey;
@@ -9327,7 +9327,7 @@ int WP11_Ec_GenerateKeyPair(WP11_Object* pub, WP11_Object* priv,
93279327
CK_ULONG len = sizeof(isSign);
93289328
ret = WP11_Object_GetAttr(priv, CKA_SIGN, &isSign, &len);
93299329
if (ret == 0 && isSign) {
9330-
#if defined(LIBWOLFTPM_VERSION_HEX) && LIBWOLFTPM_VERSION_HEX > 0x03009001
9330+
#if defined(LIBWOLFTPM_VERSION_HEX) && LIBWOLFTPM_VERSION_HEX > 0x03009000
93319331
priv->slot->tpmCtx.ecdsaKey = &priv->tpmKey;
93329332
#else
93339333
priv->slot->tpmCtx.eccKey = (WOLFTPM2_KEY*)&priv->tpmKey;

0 commit comments

Comments
 (0)