Proxmox-Port/libtpms
1
0
Fork 0
mirror of https://github.com/stefanberger/libtpms synced 2025-08-26 04:33:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tpm2: Fix TDES key creation by adding missing un-/marshalling functions

Browse Source 
Some TDES related marshalling and unmarshalling functions were
missing, so add them. Now TDES keys can be created.

Signed-off-by: stefan Berger <stefanb@linux.ibm.com>
This commit is contained in:
Stefan Berger 2019-12-25 23:45:09 -05:00
parent e58cbdd4fd
commit 2da6f27c33
2 changed files with 56 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/tpm2/Marshal.c
View File

@ -1125,6 +1125,14 @@ TPMI_AES_KEY_BITS_Marshal(TPMI_AES_KEY_BITS *source, BYTE **buffer, INT32 *size)
return written;
}
UINT16 // libtpms added begin
TPMI_TDES_KEY_BITS_Marshal(TPMI_TDES_KEY_BITS *source, BYTE **buffer, INT32 *size)
{
UINT16 written = 0;
written += TPM_KEY_BITS_Marshal(source, buffer, size);
return written;
} // libtpms added end
/* Table 2:128 - Definition of TPMU_SYM_KEY_BITS Union (StructuresTable()) */
UINT16
@ -1148,6 +1156,11 @@ TPMU_SYM_KEY_BITS_Marshal(TPMU_SYM_KEY_BITS *source, BYTE **buffer, INT32 *size,
written += TPMI_CAMELLIA_KEY_BITS_Marshal(&source->camellia, buffer, size);
break;
#endif
#if ALG_TDES // libtpms added begin
case TPM_ALG_TDES:
written += TPMI_TDES_KEY_BITS_Marshal(&source->tdes, buffer, size);
break;
#endif // libtpms added end
#if ALG_XOR
case TPM_ALG_XOR:
written += TPMI_ALG_HASH_Marshal(&source->xorr, buffer, size);
@ -1184,6 +1197,11 @@ TPMU_SYM_MODE_Marshal(TPMU_SYM_MODE *source, BYTE **buffer, INT32 *size, UINT32
written += TPMI_ALG_SYM_MODE_Marshal(&source->camellia, buffer, size);
break;
#endif
#if ALG_TDES // libtpms added begin
case TPM_ALG_TDES:
written += TPMI_ALG_SYM_MODE_Marshal(&source->tdes, buffer, size);
break;
#endif // libtpms added end
#if ALG_XOR
case TPM_ALG_XOR:
#endif

38
src/tpm2/Unmarshal.c
View File

@ -1085,6 +1085,9 @@ TPMI_ALG_SYM_Unmarshal(TPMI_ALG_SYM *target, BYTE **buffer, INT32 *size, BOOL al
#if ALG_CAMELLIA
case TPM_ALG_CAMELLIA:
#endif
#if ALG_TDES // libtpms added begin
case TPM_ALG_TDES:
#endif // libtpms added end
#if ALG_XOR
case TPM_ALG_XOR:
#endif
@ -1121,6 +1124,9 @@ TPMI_ALG_SYM_OBJECT_Unmarshal(TPMI_ALG_SYM_OBJECT *target, BYTE **buffer, INT32
#if ALG_CAMELLIA
case TPM_ALG_CAMELLIA:
#endif
#if ALG_TDES // libtpms added begin
case TPM_ALG_TDES:
#endif // iibtpms added end
break;
case TPM_ALG_NULL:
if (allowNull) {
@ -2449,6 +2455,28 @@ TPMI_SM4_KEY_BITS_Unmarshal(TPMI_SM4_KEY_BITS *target, BYTE **buffer, INT32 *siz
}
#endif
#if ALG_TDES // libtpms added begin
TPM_RC
TPMI_TDES_KEY_BITS_Unmarshal(TPMI_SM4_KEY_BITS *target, BYTE **buffer, INT32 *size)
{
TPM_RC rc = TPM_RC_SUCCESS;
if (rc == TPM_RC_SUCCESS) {
rc = TPM_KEY_BITS_Unmarshal(target, buffer, size);
}
if (rc == TPM_RC_SUCCESS) {
switch (*target) {
case 128:
case 192:
break;
default:
rc = TPM_RC_VALUE;
}
}
return rc;
}
#endif // libtpms added end
/* Table 125 - Definition of TPMU_SYM_KEY_BITS Union */
TPM_RC
@ -2472,6 +2500,11 @@ TPMU_SYM_KEY_BITS_Unmarshal(TPMU_SYM_KEY_BITS *target, BYTE **buffer, INT32 *siz
rc = TPMI_CAMELLIA_KEY_BITS_Unmarshal(&target->camellia, buffer, size);
break;
#endif
#if ALG_TDES // libtpms added beging
case TPM_ALG_TDES:
rc = TPMI_TDES_KEY_BITS_Unmarshal(&target->tdes, buffer, size);
break;
#endif // libtpms added end
#if ALG_XOR
case TPM_ALG_XOR:
rc = TPMI_ALG_HASH_Unmarshal(&target->xorr, buffer, size, NO);
@ -2508,6 +2541,11 @@ TPMU_SYM_MODE_Unmarshal(TPMU_SYM_MODE *target, BYTE **buffer, INT32 *size, UINT3
rc = TPMI_ALG_SYM_MODE_Unmarshal(&target->camellia, buffer, size, YES);
break;
#endif
#if ALG_TDES // libtpms added begin
case TPM_ALG_TDES:
rc = TPMI_ALG_SYM_MODE_Unmarshal(&target->tdes, buffer, size, YES);
break;
#endif // libtpms added end
case TPM_ALG_XOR:
case TPM_ALG_NULL:
break;