79 changes: 1 addition & 78 deletions include/sapi/tss2_tpm2_types.h
View file
Expand Up @@ -41,7 +41,7 @@
#define CLEAR 0

#define MAX_CAP_DATA (MAX_CAP_BUFFER-sizeof(TPM_CAP)-sizeof(UINT32))
#define MAX_CAP_ALGS (ALG_LAST_VALUE - ALG_FIRST_VALUE + 1)
#define MAX_CAP_ALGS (TPM_ALG_LAST - TPM_ALG_FIRST + 1)
#define MAX_CAP_HANDLES (MAX_CAP_DATA/sizeof(TPM_HANDLE))
#define MAX_CAP_CC (COMMAND_COUNT)
#define MAX_TPM_PROPERTIES (MAX_CAP_DATA/sizeof(TPMS_TAGGED_PROPERTY))
Expand Down Expand Up @@ -987,24 +987,11 @@ typedef struct {

/* Table 70 Definition of TPMU_HA Union <INOUT S> */
typedef union {
#ifdef TPM_ALG_SHA
BYTE sha[SHA_DIGEST_SIZE]; /* all hashes */
#endif
#ifdef TPM_ALG_SHA1
BYTE sha1[SHA1_DIGEST_SIZE]; /* all hashes */
#endif
#ifdef TPM_ALG_SHA256
BYTE sha256[SHA256_DIGEST_SIZE]; /* all hashes */
#endif
#ifdef TPM_ALG_SHA384
BYTE sha384[SHA384_DIGEST_SIZE]; /* all hashes */
#endif
#ifdef TPM_ALG_SHA512
BYTE sha512[SHA512_DIGEST_SIZE]; /* all hashes */
#endif
#ifdef TPM_ALG_SM3_256
BYTE sm3_256[SM3_256_DIGEST_SIZE]; /* all hashes */
#endif
} TPMU_HA;

/* Table 71 Definition of TPMT_HA Structure <INOUT> */
Expand Down Expand Up @@ -1313,30 +1300,18 @@ typedef TPM_KEY_BITS TPMI_CAMELLIA_KEY_BITS;

/* Table 125 Definition of TPMU_SYM_KEY_BITS Union */
typedef union {
#ifdef TPM_ALG_AES
TPMI_AES_KEY_BITS aes; /* all symmetric algorithms */
#endif
#ifdef TPM_ALG_SM4
TPMI_SM4_KEY_BITS sm4; /* all symmetric algorithms */
#endif
#ifdef TPM_ALG_CAMELLIA
TPMI_CAMELLIA_KEY_BITS camellia; /* all symmetric algorithms */
#endif
TPM_KEY_BITS sym; /* when selector may be any of the symmetric block ciphers */
TPMI_ALG_HASH exclusiveOr; /* overload for using xorNOTE TPM_ALG_NULL is not allowed */
} TPMU_SYM_KEY_BITS;

/* Table 126 Definition of TPMU_SYM_MODE Union */
typedef union {
#ifdef TPM_ALG_AES
TPMI_ALG_SYM_MODE aes; /* */
#endif
#ifdef TPM_ALG_SM4
TPMI_ALG_SYM_MODE sm4; /* */
#endif
#ifdef TPM_ALG_CAMELLIA
TPMI_ALG_SYM_MODE camellia; /* */
#endif
TPMI_ALG_SYM_MODE sym; /* when selector may be any of the symmetric block ciphers */
} TPMU_SYM_MODE;

Expand Down Expand Up @@ -1421,24 +1396,12 @@ typedef TPMS_SCHEME_ECDAA TPMS_SIG_SCHEME_ECDAA; /* schemes that need a hash an

/* Table 144 Definition of TPMU_SIG_SCHEME Union <INOUT S> */
typedef union {
#ifdef TPM_ALG_RSASSA
TPMS_SIG_SCHEME_RSASSA rsassa; /* all signing schemes including anonymous schemes */
#endif
#ifdef TPM_ALG_RSAPSS
TPMS_SIG_SCHEME_RSAPSS rsapss; /* all signing schemes including anonymous schemes */
#endif
#ifdef TPM_ALG_ECDSA
TPMS_SIG_SCHEME_ECDSA ecdsa; /* all signing schemes including anonymous schemes */
#endif
#ifdef TPM_ALG_ECDAA
TPMS_SIG_SCHEME_ECDAA ecdaa; /* all signing schemes including anonymous schemes */
#endif
#ifdef TPM_ALG_SM2
TPMS_SIG_SCHEME_SM2 sm2; /* all signing schemes including anonymous schemes */
#endif
#ifdef TPM_ALG_ECSCHNORR
TPMS_SIG_SCHEME_ECSCHNORR ecschnorr; /* all signing schemes including anonymous schemes */
#endif
TPMS_SCHEME_HMAC hmac; /* the HMAC scheme */
TPMS_SCHEME_HASH any; /* selector that allows access to digest for any signing scheme */
} TPMU_SIG_SCHEME;
Expand All @@ -1465,18 +1428,10 @@ typedef TPMS_SCHEME_HASH TPMS_SCHEME_KDF1_SP800_108; /* hashbased key or maskge

/* Table 149 Definition of TPMU_KDF_SCHEME Union <INOUT S> */
typedef union {
#ifdef TPM_ALG_MGF1
TPMS_SCHEME_MGF1 mgf1; /* */
#endif
#ifdef TPM_ALG_KDF1_SP800_56A
TPMS_SCHEME_KDF1_SP800_56A kdf1_sp800_56a; /* */
#endif
#ifdef TPM_ALG_KDF2
TPMS_SCHEME_KDF2 kdf2; /* */
#endif
#ifdef TPM_ALG_KDF1_SP800_108
TPMS_SCHEME_KDF1_SP800_108 kdf1_sp800_108; /* */
#endif
} TPMU_KDF_SCHEME;

/* Table 150 Definition of TPMT_KDF_SCHEME Structure */
Expand All @@ -1490,36 +1445,16 @@ typedef TPM_ALG_ID TPMI_ALG_ASYM_SCHEME;

/* Table 152 Definition of TPMU_ASYM_SCHEME Union */
typedef union {
#ifdef TPM_ALG_ECDH
TPMS_KEY_SCHEME_ECDH ecdh; /* */
#endif
#ifdef TPM_ALG_ECMQV
TPMS_KEY_SCHEME_ECMQV ecmqv; /* */
#endif
#ifdef TPM_ALG_RSASSA
TPMS_SIG_SCHEME_RSASSA rsassa; /* signing and anonymous signing */
#endif
#ifdef TPM_ALG_RSAPSS
TPMS_SIG_SCHEME_RSAPSS rsapss; /* signing and anonymous signing */
#endif
#ifdef TPM_ALG_ECDSA
TPMS_SIG_SCHEME_ECDSA ecdsa; /* signing and anonymous signing */
#endif
#ifdef TPM_ALG_ECDAA
TPMS_SIG_SCHEME_ECDAA ecdaa; /* signing and anonymous signing */
#endif
#ifdef TPM_ALG_SM2
TPMS_SIG_SCHEME_SM2 sm2; /* signing and anonymous signing */
#endif
#ifdef TPM_ALG_ECSCHNORR
TPMS_SIG_SCHEME_ECSCHNORR ecschnorr; /* signing and anonymous signing */
#endif
#ifdef TPM_ALG_RSAES
TPMS_ENC_SCHEME_RSAES rsaes; /* schemes with no hash */
#endif
#ifdef TPM_ALG_OAEP
TPMS_ENC_SCHEME_OAEP oaep; /* schemes with no hash */
#endif
TPMS_SCHEME_HASH anySig; /* */
} TPMU_ASYM_SCHEME;

Expand Down Expand Up @@ -1620,24 +1555,12 @@ typedef TPMS_SIGNATURE_ECC TPMS_SIGNATURE_ECSCHNORR; /* */

/* Table 172 Definition of TPMU_SIGNATURE Union <INOUT S> */
typedef union {
#ifdef TPM_ALG_RSASSA
TPMS_SIGNATURE_RSASSA rsassa; /* all asymmetric signatures */
#endif
#ifdef TPM_ALG_RSAPSS
TPMS_SIGNATURE_RSAPSS rsapss; /* all asymmetric signatures */
#endif
#ifdef TPM_ALG_ECDSA
TPMS_SIGNATURE_ECDSA ecdsa; /* all asymmetric signatures */
#endif
#ifdef TPM_ALG_ECDAA
TPMS_SIGNATURE_ECDAA ecdaa; /* all asymmetric signatures */
#endif
#ifdef TPM_ALG_SM2
TPMS_SIGNATURE_SM2 sm2; /* all asymmetric signatures */
#endif
#ifdef TPM_ALG_ECSCHNORR
TPMS_SIGNATURE_ECSCHNORR ecschnorr; /* all asymmetric signatures */
#endif
TPMT_HA hmac; /* HMAC signature required to be supported */
TPMS_SCHEME_HASH any; /* used to access the hash */
} TPMU_SIGNATURE;
Expand Down
4 changes: 0 additions & 4 deletions sysapi/sysapi_util/GetDigestSize.c
View file
Expand Up @@ -37,12 +37,8 @@ typedef struct {
HASH_SIZE_INFO hashSizes[] = {
{TPM_ALG_SHA1, SHA1_DIGEST_SIZE},
{TPM_ALG_SHA256, SHA256_DIGEST_SIZE},
#ifdef TPM_ALG_SHA384
{TPM_ALG_SHA384, SHA384_DIGEST_SIZE},
#endif
#ifdef TPM_ALG_SHA512
{TPM_ALG_SHA512, SHA512_DIGEST_SIZE},
#endif
{TPM_ALG_SM3_256, SM3_256_DIGEST_SIZE},
{TPM_ALG_NULL,0}
};
Expand Down
22 changes: 0 additions & 22 deletions sysapi/sysapi_util/Marshal_TPMU_ASYM_SCHEME.c
View file
Expand Up @@ -39,60 +39,38 @@ void Marshal_TPMU_ASYM_SCHEME(

switch( selector )
{
#ifdef TPM_ALG_ECDH
case TPM_ALG_ECDH:
Marshal_TPMS_KEY_SCHEME_ECDH( sysContext, &asymScheme->ecdh );
break;
#endif
#ifdef TPM_ALG_ECMQV
case TPM_ALG_ECMQV:
Marshal_TPMS_KEY_SCHEME_ECMQV( sysContext, &asymScheme->ecmqv );
break;
#endif
#ifdef TPM_ALG_RSASSA
case TPM_ALG_RSASSA:
Marshal_TPMS_SIG_SCHEME_RSASSA( sysContext, &asymScheme->rsassa );
break;
#endif
#ifdef TPM_ALG_RSAPSS
case TPM_ALG_RSAPSS:
Marshal_TPMS_SIG_SCHEME_RSAPSS( sysContext, &asymScheme->rsapss );
break;
#endif
#ifdef TPM_ALG_ECDSA
case TPM_ALG_ECDSA:
Marshal_TPMS_SIG_SCHEME_ECDSA( sysContext, &asymScheme->ecdsa );
break;
#endif
#ifdef TPM_ALG_ECDAA
case TPM_ALG_ECDAA:
Marshal_TPMS_SIG_SCHEME_ECDAA( sysContext, &asymScheme->ecdaa );
break;
#endif
#ifdef TPM_ALG_SM2
case TPM_ALG_SM2:
Marshal_TPMS_SIG_SCHEME_SM2( sysContext, &asymScheme->sm2 );
break;
#endif
#ifdef TPM_ALG_ECSCHNORR
case TPM_ALG_ECSCHNORR:
Marshal_TPMS_SIG_SCHEME_ECSCHNORR( sysContext, &asymScheme->ecschnorr );
break;
#endif
#ifdef TPM_ALG_RSAES
case TPM_ALG_RSAES:
Marshal_TPMS_ENC_SCHEME_RSAES( sysContext, &asymScheme->rsaes );
break;
#endif
#ifdef TPM_ALG_OAEP
case TPM_ALG_OAEP:
Marshal_TPMS_ENC_SCHEME_OAEP( sysContext, &asymScheme->oaep );
break;
#endif
#ifdef TPM_ALG_NULL
case TPM_ALG_NULL:
break;
#endif
}
return;
}
21 changes: 0 additions & 21 deletions sysapi/sysapi_util/Marshal_TPMU_HA.c
View file
Expand Up @@ -41,64 +41,43 @@ void Marshal_TPMU_HA(

switch( selector )
{
#ifdef TPM_ALG_SHA
case TPM_ALG_SHA:

for( i = 0; i < SHA_DIGEST_SIZE; i++ )
{
Marshal_UINT8( SYS_CONTEXT->tpmInBuffPtr, SYS_CONTEXT->maxCommandSize, &(SYS_CONTEXT->nextData), ha->sha[i], &( SYS_CONTEXT->rval ) );
}
break;
#endif
#ifdef TPM_ALG_SHA1
case TPM_ALG_SHA1:

for( i = 0; i < SHA1_DIGEST_SIZE; i++ )
{
Marshal_UINT8( SYS_CONTEXT->tpmInBuffPtr, SYS_CONTEXT->maxCommandSize, &(SYS_CONTEXT->nextData), ha->sha1[i], &( SYS_CONTEXT->rval ) );
}
break;
#endif
#ifdef TPM_ALG_SHA256
case TPM_ALG_SHA256:

for( i = 0; i < SHA256_DIGEST_SIZE; i++ )
{
Marshal_UINT8( SYS_CONTEXT->tpmInBuffPtr, SYS_CONTEXT->maxCommandSize, &(SYS_CONTEXT->nextData), ha->sha256[i], &( SYS_CONTEXT->rval ) );
}
break;
#endif
#ifdef TPM_ALG_SHA384
case TPM_ALG_SHA384:

for( i = 0; i < SHA384_DIGEST_SIZE; i++ )
{
Marshal_UINT8( SYS_CONTEXT->tpmInBuffPtr, SYS_CONTEXT->maxCommandSize, &(SYS_CONTEXT->nextData), ha->sha384[i], &( SYS_CONTEXT->rval ) );
}
break;
#endif
#ifdef TPM_ALG_SHA512
case TPM_ALG_SHA512:

for( i = 0; i < SHA512_DIGEST_SIZE; i++ )
{
Marshal_UINT8( SYS_CONTEXT->tpmInBuffPtr, SYS_CONTEXT->maxCommandSize, &(SYS_CONTEXT->nextData), ha->sha512[i], &( SYS_CONTEXT->rval ) );
}
break;
#endif
#ifdef TPM_ALG_SM3_256
case TPM_ALG_SM3_256:

for( i = 0; i < SM3_256_DIGEST_SIZE; i++ )
{
Marshal_UINT8( SYS_CONTEXT->tpmInBuffPtr, SYS_CONTEXT->maxCommandSize, &(SYS_CONTEXT->nextData), ha->sm3_256[i], &( SYS_CONTEXT->rval ) );
}
break;
#endif
#ifdef TPM_ALG_NULL
case TPM_ALG_NULL:
break;
#endif
}
return;
}
10 changes: 0 additions & 10 deletions sysapi/sysapi_util/Marshal_TPMU_KDF_SCHEME.c
View file
Expand Up @@ -39,30 +39,20 @@ void Marshal_TPMU_KDF_SCHEME(

switch( selector )
{
#ifdef TPM_ALG_MGF1
case TPM_ALG_MGF1:
Marshal_TPMS_SCHEME_MGF1( sysContext, &kdfScheme->mgf1 );
break;
#endif
#ifdef TPM_ALG_KDF1_SP800_56A
case TPM_ALG_KDF1_SP800_56A:
Marshal_TPMS_SCHEME_KDF1_SP800_56A( sysContext, &kdfScheme->kdf1_sp800_56a );
break;
#endif
#ifdef TPM_ALG_KDF2
case TPM_ALG_KDF2:
Marshal_TPMS_SCHEME_KDF2( sysContext, &kdfScheme->kdf2 );
break;
#endif
#ifdef TPM_ALG_KDF1_SP800_108
case TPM_ALG_KDF1_SP800_108:
Marshal_TPMS_SCHEME_KDF1_SP800_108( sysContext, &kdfScheme->kdf1_sp800_108 );
break;
#endif
#ifdef TPM_ALG_NULL
case TPM_ALG_NULL:
break;
#endif
}
return;
}
8 changes: 0 additions & 8 deletions sysapi/sysapi_util/Marshal_TPMU_PUBLIC_ID.c
View file
Expand Up @@ -39,26 +39,18 @@ void Marshal_TPMU_PUBLIC_ID(

switch( selector )
{
#ifdef TPM_ALG_KEYEDHASH
case TPM_ALG_KEYEDHASH:
MARSHAL_SIMPLE_TPM2B( sysContext, (TPM2B *)&publicVarId->keyedHash );
break;
#endif
#ifdef TPM_ALG_SYMCIPHER
case TPM_ALG_SYMCIPHER:
MARSHAL_SIMPLE_TPM2B( sysContext, (TPM2B *)&publicVarId->sym );
break;
#endif
#ifdef TPM_ALG_RSA
case TPM_ALG_RSA:
MARSHAL_SIMPLE_TPM2B( sysContext, (TPM2B *)&publicVarId->rsa );
break;
#endif
#ifdef TPM_ALG_ECC
case TPM_ALG_ECC:
Marshal_TPMS_ECC_POINT( sysContext, &publicVarId->ecc );
break;
#endif
}
return;
}
8 changes: 0 additions & 8 deletions sysapi/sysapi_util/Marshal_TPMU_PUBLIC_PARMS.c
View file
Expand Up @@ -39,26 +39,18 @@ void Marshal_TPMU_PUBLIC_PARMS(

switch( selector )
{
#ifdef TPM_ALG_KEYEDHASH
case TPM_ALG_KEYEDHASH:
Marshal_TPMS_KEYEDHASH_PARMS( sysContext, &publicVarParms->keyedHashDetail );
break;
#endif
#ifdef TPM_ALG_SYMCIPHER
case TPM_ALG_SYMCIPHER:
Marshal_TPMS_SYMCIPHER_PARMS( sysContext, &publicVarParms->symDetail );
break;
#endif
#ifdef TPM_ALG_RSA
case TPM_ALG_RSA:
Marshal_TPMS_RSA_PARMS( sysContext, &publicVarParms->rsaDetail );
break;
#endif
#ifdef TPM_ALG_ECC
case TPM_ALG_ECC:
Marshal_TPMS_ECC_PARMS( sysContext, &publicVarParms->eccDetail );
break;
#endif
}
return;
}
6 changes: 0 additions & 6 deletions sysapi/sysapi_util/Marshal_TPMU_SCHEME_KEYEDHASH.c
View file
Expand Up @@ -39,20 +39,14 @@ void Marshal_TPMU_SCHEME_KEYEDHASH(

switch( selector )
{
#ifdef TPM_ALG_HMAC
case TPM_ALG_HMAC:
Marshal_TPMS_SCHEME_HMAC( sysContext, &schemeKeyedhash->hmac );
break;
#endif
#ifdef TPM_ALG_XOR
case TPM_ALG_XOR:
Marshal_TPMS_SCHEME_XOR( sysContext, &schemeKeyedhash->exclusiveOr );
break;
#endif
#ifdef TPM_ALG_NULL
case TPM_ALG_NULL:
break;
#endif
}
return;
}
8 changes: 0 additions & 8 deletions sysapi/sysapi_util/Marshal_TPMU_SENSITIVE_COMPOSITE.c
View file
Expand Up @@ -39,26 +39,18 @@ void Marshal_TPMU_SENSITIVE_COMPOSITE(

switch( selector )
{
#ifdef TPM_ALG_RSA
case TPM_ALG_RSA:
MARSHAL_SIMPLE_TPM2B( sysContext, (TPM2B *)&sensitiveComposite->rsa );
break;
#endif
#ifdef TPM_ALG_ECC
case TPM_ALG_ECC:
MARSHAL_SIMPLE_TPM2B( sysContext, (TPM2B *)&sensitiveComposite->ecc );
break;
#endif
#ifdef TPM_ALG_KEYEDHASH
case TPM_ALG_KEYEDHASH:
MARSHAL_SIMPLE_TPM2B( sysContext, (TPM2B *)&sensitiveComposite->bits );
break;
#endif
#ifdef TPM_ALG_SYMCIPHER
case TPM_ALG_SYMCIPHER:
MARSHAL_SIMPLE_TPM2B( sysContext, (TPM2B *)&sensitiveComposite->sym );
break;
#endif
}
return;
}
16 changes: 0 additions & 16 deletions sysapi/sysapi_util/Marshal_TPMU_SIGNATURE.c
View file
Expand Up @@ -39,45 +39,29 @@ void Marshal_TPMU_SIGNATURE(

switch( selector )
{
#ifdef TPM_ALG_RSASSA
case TPM_ALG_RSASSA:
Marshal_TPMS_SIGNATURE_RSASSA( sysContext, &signature->rsassa );
break;
#endif
#ifdef TPM_ALG_RSAPSS
case TPM_ALG_RSAPSS:
Marshal_TPMS_SIGNATURE_RSAPSS( sysContext, &signature->rsapss );
break;
#endif
#ifdef TPM_ALG_ECDSA
case TPM_ALG_ECDSA:
Marshal_TPMS_SIGNATURE_ECDSA( sysContext, &signature->ecdsa );
break;
#endif
#ifdef TPM_ALG_ECDAA
case TPM_ALG_ECDAA:
Marshal_TPMS_SIGNATURE_ECDAA( sysContext, &signature->ecdaa );
break;
#endif
#ifdef TPM_ALG_SM2
case TPM_ALG_SM2:
Marshal_TPMS_SIGNATURE_SM2( sysContext, &signature->sm2 );
break;
#endif
#ifdef TPM_ALG_ECSCHNORR
case TPM_ALG_ECSCHNORR:
Marshal_TPMS_SIGNATURE_ECSCHNORR( sysContext, &signature->ecschnorr );
break;
#endif
#ifdef TPM_ALG_HMAC
case TPM_ALG_HMAC:
Marshal_TPMT_HA( sysContext, &signature->hmac );
break;
#endif
#ifdef TPM_ALG_NULL
case TPM_ALG_NULL:
break;
#endif
}
return;
}
16 changes: 0 additions & 16 deletions sysapi/sysapi_util/Marshal_TPMU_SIG_SCHEME.c
View file
Expand Up @@ -39,45 +39,29 @@ void Marshal_TPMU_SIG_SCHEME(

switch( selector )
{
#ifdef TPM_ALG_RSASSA
case TPM_ALG_RSASSA:
Marshal_TPMS_SIG_SCHEME_RSASSA( sysContext, &sigScheme->rsassa );
break;
#endif
#ifdef TPM_ALG_RSAPSS
case TPM_ALG_RSAPSS:
Marshal_TPMS_SIG_SCHEME_RSAPSS( sysContext, &sigScheme->rsapss );
break;
#endif
#ifdef TPM_ALG_ECDSA
case TPM_ALG_ECDSA:
Marshal_TPMS_SIG_SCHEME_ECDSA( sysContext, &sigScheme->ecdsa );
break;
#endif
#ifdef TPM_ALG_ECDAA
case TPM_ALG_ECDAA:
Marshal_TPMS_SIG_SCHEME_ECDAA( sysContext, &sigScheme->ecdaa );
break;
#endif
#ifdef TPM_ALG_SM2
case TPM_ALG_SM2:
Marshal_TPMS_SIG_SCHEME_SM2( sysContext, &sigScheme->sm2 );
break;
#endif
#ifdef TPM_ALG_ECSCHNORR
case TPM_ALG_ECSCHNORR:
Marshal_TPMS_SIG_SCHEME_ECSCHNORR( sysContext, &sigScheme->ecschnorr );
break;
#endif
#ifdef TPM_ALG_HMAC
case TPM_ALG_HMAC:
Marshal_TPMS_SCHEME_HMAC( sysContext, &sigScheme->hmac );
break;
#endif
#ifdef TPM_ALG_NULL
case TPM_ALG_NULL:
break;
#endif
}
return;
}
10 changes: 0 additions & 10 deletions sysapi/sysapi_util/Marshal_TPMU_SYM_KEY_BITS.c
View file
Expand Up @@ -39,30 +39,20 @@ void Marshal_TPMU_SYM_KEY_BITS(

switch( selector )
{
#ifdef TPM_ALG_AES
case TPM_ALG_AES:
Marshal_UINT16( SYS_CONTEXT->tpmInBuffPtr, SYS_CONTEXT->maxCommandSize, &(SYS_CONTEXT->nextData), symKeyBits->aes, &( SYS_CONTEXT->rval ) );
break;
#endif
#ifdef TPM_ALG_SM4
case TPM_ALG_SM4:
Marshal_UINT16( SYS_CONTEXT->tpmInBuffPtr, SYS_CONTEXT->maxCommandSize, &(SYS_CONTEXT->nextData), symKeyBits->sm4, &( SYS_CONTEXT->rval ) );
break;
#endif
#ifdef TPM_ALG_CAMELLIA
case TPM_ALG_CAMELLIA:
Marshal_UINT16( SYS_CONTEXT->tpmInBuffPtr, SYS_CONTEXT->maxCommandSize, &(SYS_CONTEXT->nextData), symKeyBits->camellia, &( SYS_CONTEXT->rval ) );
break;
#endif
#ifdef TPM_ALG_XOR
case TPM_ALG_XOR:
Marshal_UINT16( SYS_CONTEXT->tpmInBuffPtr, SYS_CONTEXT->maxCommandSize, &(SYS_CONTEXT->nextData), symKeyBits->exclusiveOr, &( SYS_CONTEXT->rval ) );
break;
#endif
#ifdef TPM_ALG_NULL
case TPM_ALG_NULL:
break;
#endif
}
return;
}
10 changes: 0 additions & 10 deletions sysapi/sysapi_util/Marshal_TPMU_SYM_MODE.c
View file
Expand Up @@ -39,29 +39,19 @@ void Marshal_TPMU_SYM_MODE(

switch( selector )
{
#ifdef TPM_ALG_AES
case TPM_ALG_AES:
Marshal_UINT16( SYS_CONTEXT->tpmInBuffPtr, SYS_CONTEXT->maxCommandSize, &(SYS_CONTEXT->nextData), symMode->aes, &( SYS_CONTEXT->rval ) );
break;
#endif
#ifdef TPM_ALG_SM4
case TPM_ALG_SM4:
Marshal_UINT16( SYS_CONTEXT->tpmInBuffPtr, SYS_CONTEXT->maxCommandSize, &(SYS_CONTEXT->nextData), symMode->sm4, &( SYS_CONTEXT->rval ) );
break;
#endif
#ifdef TPM_ALG_CAMELLIA
case TPM_ALG_CAMELLIA:
Marshal_UINT16( SYS_CONTEXT->tpmInBuffPtr, SYS_CONTEXT->maxCommandSize, &(SYS_CONTEXT->nextData), symMode->camellia, &( SYS_CONTEXT->rval ) );
break;
#endif
#ifdef TPM_ALG_XOR
case TPM_ALG_XOR:
break;
#endif
#ifdef TPM_ALG_NULL
case TPM_ALG_NULL:
break;
#endif
}
return;
}
22 changes: 0 additions & 22 deletions sysapi/sysapi_util/Unmarshal_TPMU_ASYM_SCHEME.c
View file
Expand Up @@ -42,60 +42,38 @@ void Unmarshal_TPMU_ASYM_SCHEME(

switch( selector )
{
#ifdef TPM_ALG_ECDH
case TPM_ALG_ECDH:
Unmarshal_TPMS_KEY_SCHEME_ECDH( sysContext, &asymScheme->ecdh );
break;
#endif
#ifdef TPM_ALG_ECMQV
case TPM_ALG_ECMQV:
Unmarshal_TPMS_KEY_SCHEME_ECMQV( sysContext, &asymScheme->ecmqv );
break;
#endif
#ifdef TPM_ALG_RSASSA
case TPM_ALG_RSASSA:
Unmarshal_TPMS_SIG_SCHEME_RSASSA( sysContext, &asymScheme->rsassa );
break;
#endif
#ifdef TPM_ALG_RSAPSS
case TPM_ALG_RSAPSS:
Unmarshal_TPMS_SIG_SCHEME_RSAPSS( sysContext, &asymScheme->rsapss );
break;
#endif
#ifdef TPM_ALG_ECDSA
case TPM_ALG_ECDSA:
Unmarshal_TPMS_SIG_SCHEME_ECDSA( sysContext, &asymScheme->ecdsa );
break;
#endif
#ifdef TPM_ALG_ECDAA
case TPM_ALG_ECDAA:
Unmarshal_TPMS_SIG_SCHEME_ECDAA( sysContext, &asymScheme->ecdaa );
break;
#endif
#ifdef TPM_ALG_SM2
case TPM_ALG_SM2:
Unmarshal_TPMS_SIG_SCHEME_SM2( sysContext, &asymScheme->sm2 );
break;
#endif
#ifdef TPM_ALG_ECSCHNORR
case TPM_ALG_ECSCHNORR:
Unmarshal_TPMS_SIG_SCHEME_ECSCHNORR( sysContext, &asymScheme->ecschnorr );
break;
#endif
#ifdef TPM_ALG_RSAES
case TPM_ALG_RSAES:
Unmarshal_TPMS_ENC_SCHEME_RSAES( sysContext, &asymScheme->rsaes );
break;
#endif
#ifdef TPM_ALG_OAEP
case TPM_ALG_OAEP:
Unmarshal_TPMS_ENC_SCHEME_OAEP( sysContext, &asymScheme->oaep );
break;
#endif
#ifdef TPM_ALG_NULL
case TPM_ALG_NULL:
break;
#endif
}
return;
}
14 changes: 0 additions & 14 deletions sysapi/sysapi_util/Unmarshal_TPMU_ATTEST.c
View file
Expand Up @@ -42,41 +42,27 @@ void Unmarshal_TPMU_ATTEST(

switch( selector )
{
#ifdef TPM_ST_ATTEST_CERTIFY
case TPM_ST_ATTEST_CERTIFY:
Unmarshal_TPMS_CERTIFY_INFO( sysContext, &attest->certify );
break;
#endif
#ifdef TPM_ST_ATTEST_CREATION
case TPM_ST_ATTEST_CREATION:
Unmarshal_TPMS_CREATION_INFO( sysContext, &attest->creation );
break;
#endif
#ifdef TPM_ST_ATTEST_QUOTE
case TPM_ST_ATTEST_QUOTE:
Unmarshal_TPMS_QUOTE_INFO( sysContext, &attest->quote );
break;
#endif
#ifdef TPM_ST_ATTEST_COMMAND_AUDIT
case TPM_ST_ATTEST_COMMAND_AUDIT:
Unmarshal_TPMS_COMMAND_AUDIT_INFO( sysContext, &attest->commandAudit );
break;
#endif
#ifdef TPM_ST_ATTEST_SESSION_AUDIT
case TPM_ST_ATTEST_SESSION_AUDIT:
Unmarshal_TPMS_SESSION_AUDIT_INFO( sysContext, &attest->sessionAudit );
break;
#endif
#ifdef TPM_ST_ATTEST_TIME
case TPM_ST_ATTEST_TIME:
Unmarshal_TPMS_TIME_ATTEST_INFO( sysContext, &attest->time );
break;
#endif
#ifdef TPM_ST_ATTEST_NV
case TPM_ST_ATTEST_NV:
Unmarshal_TPMS_NV_CERTIFY_INFO( sysContext, &attest->nv );
break;
#endif
}
return;
}
18 changes: 0 additions & 18 deletions sysapi/sysapi_util/Unmarshal_TPMU_CAPABILITIES.c
View file
Expand Up @@ -42,51 +42,33 @@ void Unmarshal_TPMU_CAPABILITIES(

switch( selector )
{
#ifdef TPM_CAP_ALGS
case TPM_CAP_ALGS:
Unmarshal_TPML_ALG_PROPERTY( sysContext, &capabilities->algorithms );
break;
#endif
#ifdef TPM_CAP_HANDLES
case TPM_CAP_HANDLES:
Unmarshal_TPML_HANDLE( sysContext, &capabilities->handles );
break;
#endif
#ifdef TPM_CAP_COMMANDS
case TPM_CAP_COMMANDS:
Unmarshal_TPML_CCA( sysContext, &capabilities->command );
break;
#endif
#ifdef TPM_CAP_PP_COMMANDS
case TPM_CAP_PP_COMMANDS:
Unmarshal_TPML_CC( sysContext, &capabilities->ppCommands );
break;
#endif
#ifdef TPM_CAP_AUDIT_COMMANDS
case TPM_CAP_AUDIT_COMMANDS:
Unmarshal_TPML_CC( sysContext, &capabilities->auditCommands );
break;
#endif
#ifdef TPM_CAP_PCRS
case TPM_CAP_PCRS:
Unmarshal_TPML_PCR_SELECTION( sysContext, &capabilities->assignedPCR );
break;
#endif
#ifdef TPM_CAP_TPM_PROPERTIES
case TPM_CAP_TPM_PROPERTIES:
Unmarshal_TPML_TAGGED_TPM_PROPERTY( sysContext, &capabilities->tpmProperties );
break;
#endif
#ifdef TPM_CAP_PCR_PROPERTIES
case TPM_CAP_PCR_PROPERTIES:
Unmarshal_TPML_TAGGED_PCR_PROPERTY( sysContext, &capabilities->pcrProperties );
break;
#endif
#ifdef TPM_CAP_ECC_CURVES
case TPM_CAP_ECC_CURVES:
Unmarshal_TPML_ECC_CURVE( sysContext, &capabilities->eccCurves );
break;
#endif
}
return;
}
21 changes: 0 additions & 21 deletions sysapi/sysapi_util/Unmarshal_TPMU_HA.c
View file
Expand Up @@ -44,64 +44,43 @@ void Unmarshal_TPMU_HA(

switch( selector )
{
#ifdef TPM_ALG_SHA
case TPM_ALG_SHA:

for( i = 0; i < SHA_DIGEST_SIZE; i++ )
{
Unmarshal_UINT8( SYS_CONTEXT->tpmOutBuffPtr, SYS_CONTEXT->maxResponseSize, &(SYS_CONTEXT->nextData), &ha->sha[i], &( SYS_CONTEXT->rval ) );
}
break;
#endif
#ifdef TPM_ALG_SHA1
case TPM_ALG_SHA1:

for( i = 0; i < SHA1_DIGEST_SIZE; i++ )
{
Unmarshal_UINT8( SYS_CONTEXT->tpmOutBuffPtr, SYS_CONTEXT->maxResponseSize, &(SYS_CONTEXT->nextData), &ha->sha1[i], &( SYS_CONTEXT->rval ) );
}
break;
#endif
#ifdef TPM_ALG_SHA256
case TPM_ALG_SHA256:

for( i = 0; i < SHA256_DIGEST_SIZE; i++ )
{
Unmarshal_UINT8( SYS_CONTEXT->tpmOutBuffPtr, SYS_CONTEXT->maxResponseSize, &(SYS_CONTEXT->nextData), &ha->sha256[i], &( SYS_CONTEXT->rval ) );
}
break;
#endif
#ifdef TPM_ALG_SHA384
case TPM_ALG_SHA384:

for( i = 0; i < SHA384_DIGEST_SIZE; i++ )
{
Unmarshal_UINT8( SYS_CONTEXT->tpmOutBuffPtr, SYS_CONTEXT->maxResponseSize, &(SYS_CONTEXT->nextData), &ha->sha384[i], &( SYS_CONTEXT->rval ) );
}
break;
#endif
#ifdef TPM_ALG_SHA512
case TPM_ALG_SHA512:

for( i = 0; i < SHA512_DIGEST_SIZE; i++ )
{
Unmarshal_UINT8( SYS_CONTEXT->tpmOutBuffPtr, SYS_CONTEXT->maxResponseSize, &(SYS_CONTEXT->nextData), &ha->sha512[i], &( SYS_CONTEXT->rval ) );
}
break;
#endif
#ifdef TPM_ALG_SM3_256
case TPM_ALG_SM3_256:

for( i = 0; i < SM3_256_DIGEST_SIZE; i++ )
{
Unmarshal_UINT8( SYS_CONTEXT->tpmOutBuffPtr, SYS_CONTEXT->maxResponseSize, &(SYS_CONTEXT->nextData), &ha->sm3_256[i], &( SYS_CONTEXT->rval ) );
}
break;
#endif
#ifdef TPM_ALG_NULL
case TPM_ALG_NULL:
break;
#endif
}
return;
}
10 changes: 0 additions & 10 deletions sysapi/sysapi_util/Unmarshal_TPMU_KDF_SCHEME.c
View file
Expand Up @@ -42,30 +42,20 @@ void Unmarshal_TPMU_KDF_SCHEME(

switch( selector )
{
#ifdef TPM_ALG_MGF1
case TPM_ALG_MGF1:
Unmarshal_TPMS_SCHEME_MGF1( sysContext, &kdfScheme->mgf1 );
break;
#endif
#ifdef TPM_ALG_KDF1_SP800_56A
case TPM_ALG_KDF1_SP800_56A:
Unmarshal_TPMS_SCHEME_KDF1_SP800_56A( sysContext, &kdfScheme->kdf1_sp800_56a );
break;
#endif
#ifdef TPM_ALG_KDF2
case TPM_ALG_KDF2:
Unmarshal_TPMS_SCHEME_KDF2( sysContext, &kdfScheme->kdf2 );
break;
#endif
#ifdef TPM_ALG_KDF1_SP800_108
case TPM_ALG_KDF1_SP800_108:
Unmarshal_TPMS_SCHEME_KDF1_SP800_108( sysContext, &kdfScheme->kdf1_sp800_108 );
break;
#endif
#ifdef TPM_ALG_NULL
case TPM_ALG_NULL:
break;
#endif
}
return;
}
8 changes: 0 additions & 8 deletions sysapi/sysapi_util/Unmarshal_TPMU_PUBLIC_ID.c
View file
Expand Up @@ -42,26 +42,18 @@ void Unmarshal_TPMU_PUBLIC_ID(

switch( selector )
{
#ifdef TPM_ALG_KEYEDHASH
case TPM_ALG_KEYEDHASH:
UNMARSHAL_SIMPLE_TPM2B_NO_SIZE_CHECK( sysContext, (TPM2B *)&publicVarId->keyedHash );
break;
#endif
#ifdef TPM_ALG_SYMCIPHER
case TPM_ALG_SYMCIPHER:
UNMARSHAL_SIMPLE_TPM2B_NO_SIZE_CHECK( sysContext, (TPM2B *)&publicVarId->sym );
break;
#endif
#ifdef TPM_ALG_RSA
case TPM_ALG_RSA:
UNMARSHAL_SIMPLE_TPM2B_NO_SIZE_CHECK( sysContext, (TPM2B *)&publicVarId->rsa );
break;
#endif
#ifdef TPM_ALG_ECC
case TPM_ALG_ECC:
Unmarshal_TPMS_ECC_POINT( sysContext, &publicVarId->ecc );
break;
#endif
}
return;
}
8 changes: 0 additions & 8 deletions sysapi/sysapi_util/Unmarshal_TPMU_PUBLIC_PARMS.c
View file
Expand Up @@ -42,26 +42,18 @@ void Unmarshal_TPMU_PUBLIC_PARMS(

switch( selector )
{
#ifdef TPM_ALG_KEYEDHASH
case TPM_ALG_KEYEDHASH:
Unmarshal_TPMS_KEYEDHASH_PARMS( sysContext, &publicVarParms->keyedHashDetail );
break;
#endif
#ifdef TPM_ALG_SYMCIPHER
case TPM_ALG_SYMCIPHER:
Unmarshal_TPMS_SYMCIPHER_PARMS( sysContext, &publicVarParms->symDetail );
break;
#endif
#ifdef TPM_ALG_RSA
case TPM_ALG_RSA:
Unmarshal_TPMS_RSA_PARMS( sysContext, &publicVarParms->rsaDetail );
break;
#endif
#ifdef TPM_ALG_ECC
case TPM_ALG_ECC:
Unmarshal_TPMS_ECC_PARMS( sysContext, &publicVarParms->eccDetail );
break;
#endif
}
return;
}
6 changes: 0 additions & 6 deletions sysapi/sysapi_util/Unmarshal_TPMU_SCHEME_KEYEDHASH.c
View file
Expand Up @@ -42,20 +42,14 @@ void Unmarshal_TPMU_SCHEME_KEYEDHASH(

switch( selector )
{
#ifdef TPM_ALG_HMAC
case TPM_ALG_HMAC:
Unmarshal_TPMS_SCHEME_HMAC( sysContext, &schemeKeyedhash->hmac );
break;
#endif
#ifdef TPM_ALG_XOR
case TPM_ALG_XOR:
Unmarshal_TPMS_SCHEME_XOR( sysContext, &schemeKeyedhash->exclusiveOr );
break;
#endif
#ifdef TPM_ALG_NULL
case TPM_ALG_NULL:
break;
#endif
}
return;
}
8 changes: 0 additions & 8 deletions sysapi/sysapi_util/Unmarshal_TPMU_SENSITIVE_COMPOSITE.c
View file
Expand Up @@ -42,26 +42,18 @@ void Unmarshal_TPMU_SENSITIVE_COMPOSITE(

switch( selector )
{
#ifdef TPM_ALG_RSA
case TPM_ALG_RSA:
UNMARSHAL_SIMPLE_TPM2B_NO_SIZE_CHECK( sysContext, (TPM2B *)&sensitiveComposite->rsa );
break;
#endif
#ifdef TPM_ALG_ECC
case TPM_ALG_ECC:
UNMARSHAL_SIMPLE_TPM2B_NO_SIZE_CHECK( sysContext, (TPM2B *)&sensitiveComposite->ecc );
break;
#endif
#ifdef TPM_ALG_KEYEDHASH
case TPM_ALG_KEYEDHASH:
UNMARSHAL_SIMPLE_TPM2B_NO_SIZE_CHECK( sysContext, (TPM2B *)&sensitiveComposite->bits );
break;
#endif
#ifdef TPM_ALG_SYMCIPHER
case TPM_ALG_SYMCIPHER:
UNMARSHAL_SIMPLE_TPM2B_NO_SIZE_CHECK( sysContext, (TPM2B *)&sensitiveComposite->sym );
break;
#endif
}
return;
}
16 changes: 0 additions & 16 deletions sysapi/sysapi_util/Unmarshal_TPMU_SIGNATURE.c
View file
Expand Up @@ -42,45 +42,29 @@ void Unmarshal_TPMU_SIGNATURE(

switch( selector )
{
#ifdef TPM_ALG_RSASSA
case TPM_ALG_RSASSA:
Unmarshal_TPMS_SIGNATURE_RSASSA( sysContext, &signature->rsassa );
break;
#endif
#ifdef TPM_ALG_RSAPSS
case TPM_ALG_RSAPSS:
Unmarshal_TPMS_SIGNATURE_RSAPSS( sysContext, &signature->rsapss );
break;
#endif
#ifdef TPM_ALG_ECDSA
case TPM_ALG_ECDSA:
Unmarshal_TPMS_SIGNATURE_ECDSA( sysContext, &signature->ecdsa );
break;
#endif
#ifdef TPM_ALG_ECDAA
case TPM_ALG_ECDAA:
Unmarshal_TPMS_SIGNATURE_ECDAA( sysContext, &signature->ecdaa );
break;
#endif
#ifdef TPM_ALG_SM2
case TPM_ALG_SM2:
Unmarshal_TPMS_SIGNATURE_SM2( sysContext, &signature->sm2 );
break;
#endif
#ifdef TPM_ALG_ECSCHNORR
case TPM_ALG_ECSCHNORR:
Unmarshal_TPMS_SIGNATURE_ECSCHNORR( sysContext, &signature->ecschnorr );
break;
#endif
#ifdef TPM_ALG_HMAC
case TPM_ALG_HMAC:
Unmarshal_TPMT_HA( sysContext, &signature->hmac );
break;
#endif
#ifdef TPM_ALG_NULL
case TPM_ALG_NULL:
break;
#endif
}
return;
}
16 changes: 0 additions & 16 deletions sysapi/sysapi_util/Unmarshal_TPMU_SIG_SCHEME.c
View file
Expand Up @@ -42,45 +42,29 @@ void Unmarshal_TPMU_SIG_SCHEME(

switch( selector )
{
#ifdef TPM_ALG_RSASSA
case TPM_ALG_RSASSA:
Unmarshal_TPMS_SIG_SCHEME_RSASSA( sysContext, &sigScheme->rsassa );
break;
#endif
#ifdef TPM_ALG_RSAPSS
case TPM_ALG_RSAPSS:
Unmarshal_TPMS_SIG_SCHEME_RSAPSS( sysContext, &sigScheme->rsapss );
break;
#endif
#ifdef TPM_ALG_ECDSA
case TPM_ALG_ECDSA:
Unmarshal_TPMS_SIG_SCHEME_ECDSA( sysContext, &sigScheme->ecdsa );
break;
#endif
#ifdef TPM_ALG_ECDAA
case TPM_ALG_ECDAA:
Unmarshal_TPMS_SIG_SCHEME_ECDAA( sysContext, &sigScheme->ecdaa );
break;
#endif
#ifdef TPM_ALG_SM2
case TPM_ALG_SM2:
Unmarshal_TPMS_SIG_SCHEME_SM2( sysContext, &sigScheme->sm2 );
break;
#endif
#ifdef TPM_ALG_ECSCHNORR
case TPM_ALG_ECSCHNORR:
Unmarshal_TPMS_SIG_SCHEME_ECSCHNORR( sysContext, &sigScheme->ecschnorr );
break;
#endif
#ifdef TPM_ALG_HMAC
case TPM_ALG_HMAC:
Unmarshal_TPMS_SCHEME_HMAC( sysContext, &sigScheme->hmac );
break;
#endif
#ifdef TPM_ALG_NULL
case TPM_ALG_NULL:
break;
#endif
}
return;
}
10 changes: 0 additions & 10 deletions sysapi/sysapi_util/Unmarshal_TPMU_SYM_KEY_BITS.c
View file
Expand Up @@ -42,30 +42,20 @@ void Unmarshal_TPMU_SYM_KEY_BITS(

switch( selector )
{
#ifdef TPM_ALG_AES
case TPM_ALG_AES:
Unmarshal_UINT16( SYS_CONTEXT->tpmOutBuffPtr, SYS_CONTEXT->maxResponseSize, &(SYS_CONTEXT->nextData), &symKeyBits->aes, &( SYS_CONTEXT->rval ) );
break;
#endif
#ifdef TPM_ALG_SM4
case TPM_ALG_SM4:
Unmarshal_UINT16( SYS_CONTEXT->tpmOutBuffPtr, SYS_CONTEXT->maxResponseSize, &(SYS_CONTEXT->nextData), &symKeyBits->sm4, &( SYS_CONTEXT->rval ) );
break;
#endif
#ifdef TPM_ALG_CAMELLIA
case TPM_ALG_CAMELLIA:
Unmarshal_UINT16( SYS_CONTEXT->tpmOutBuffPtr, SYS_CONTEXT->maxResponseSize, &(SYS_CONTEXT->nextData), &symKeyBits->camellia, &( SYS_CONTEXT->rval ) );
break;
#endif
#ifdef TPM_ALG_XOR
case TPM_ALG_XOR:
Unmarshal_UINT16( SYS_CONTEXT->tpmOutBuffPtr, SYS_CONTEXT->maxResponseSize, &(SYS_CONTEXT->nextData), &symKeyBits->exclusiveOr, &( SYS_CONTEXT->rval ) );
break;
#endif
#ifdef TPM_ALG_NULL
case TPM_ALG_NULL:
break;
#endif
}
return;
}
10 changes: 0 additions & 10 deletions sysapi/sysapi_util/Unmarshal_TPMU_SYM_MODE.c
View file
Expand Up @@ -42,29 +42,19 @@ void Unmarshal_TPMU_SYM_MODE(

switch( selector )
{
#ifdef TPM_ALG_AES
case TPM_ALG_AES:
Unmarshal_UINT16( SYS_CONTEXT->tpmOutBuffPtr, SYS_CONTEXT->maxResponseSize, &(SYS_CONTEXT->nextData), &symMode->aes, &( SYS_CONTEXT->rval ) );
break;
#endif
#ifdef TPM_ALG_SM4
case TPM_ALG_SM4:
Unmarshal_UINT16( SYS_CONTEXT->tpmOutBuffPtr, SYS_CONTEXT->maxResponseSize, &(SYS_CONTEXT->nextData), &symMode->sm4, &( SYS_CONTEXT->rval ) );
break;
#endif
#ifdef TPM_ALG_CAMELLIA
case TPM_ALG_CAMELLIA:
Unmarshal_UINT16( SYS_CONTEXT->tpmOutBuffPtr, SYS_CONTEXT->maxResponseSize, &(SYS_CONTEXT->nextData), &symMode->camellia, &( SYS_CONTEXT->rval ) );
break;
#endif
#ifdef TPM_ALG_XOR
case TPM_ALG_XOR:
break;
#endif
#ifdef TPM_ALG_NULL
case TPM_ALG_NULL:
break;
#endif
}
return;
}