tpm2: x509 certify: rename field qualifyinData to reserved

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
This commit is contained in:
Stefan Berger 2019-11-16 22:47:59 -05:00 committed by Stefan Berger
parent e821b4e849
commit 8265f6e8bd
2 changed files with 24 additions and 24 deletions

View File

@ -1,9 +1,9 @@
/********************************************************************************/
/* */
/* */
/* TPM2_CertifyX509 Command Header */
/* Written by Ken Goldman */
/* IBM Thomas J. Watson Research Center */
/* $Id: CertifyX509_fp.h 1490 2019-07-26 21:13:22Z kgoldman $ */
/* $Id: CertifyX509_fp.h 1519 2019-11-15 20:43:51Z kgoldman $ */
/* */
/* Licenses and Notices */
/* */
@ -67,14 +67,14 @@
typedef struct {
TPMI_DH_OBJECT objectHandle;
TPMI_DH_OBJECT signHandle;
TPM2B_DATA qualifyingData;
TPM2B_DATA reserved;
TPMT_SIG_SCHEME inScheme;
TPM2B_MAX_BUFFER partialCertificate;
} CertifyX509_In;
#define RC_CertifyX509_signHandle (TPM_RC_H + TPM_RC_1)
#define RC_CertifyX509_objectHandle (TPM_RC_H + TPM_RC_2)
#define RC_CertifyX509_qualifyingData (TPM_RC_P + TPM_RC_1)
#define RC_CertifyX509_reserved (TPM_RC_P + TPM_RC_1)
#define RC_CertifyX509_inScheme (TPM_RC_P + TPM_RC_2)
#define RC_CertifyX509_partialCertificate (TPM_RC_P + TPM_RC_3)

View File

@ -1801,26 +1801,26 @@ typedef const struct {
BYTE types[10];
} CertifyX509_COMMAND_DESCRIPTOR_t;
CertifyX509_COMMAND_DESCRIPTOR_t _CertifyX509Data = {
/* entry */ &TPM2_CertifyX509,
/* inSize */ (UINT16)(sizeof(CertifyX509_In)),
/* outSize */ (UINT16)(sizeof(CertifyX509_Out)),
/* offsetOfTypes */ offsetof(CertifyX509_COMMAND_DESCRIPTOR_t, types),
/* offsets */ {(UINT16)(offsetof(CertifyX509_In, signHandle)),
(UINT16)(offsetof(CertifyX509_In, qualifyingData)),
(UINT16)(offsetof(CertifyX509_In, inScheme)),
(UINT16)(offsetof(CertifyX509_In, partialCertificate)),
(UINT16)(offsetof(CertifyX509_Out, tbsDigest)),
(UINT16)(offsetof(CertifyX509_Out, signature))},
/* types */ {TPMI_DH_OBJECT_H_UNMARSHAL,
TPMI_DH_OBJECT_H_UNMARSHAL + ADD_FLAG,
TPM2B_DATA_P_UNMARSHAL,
TPMT_SIG_SCHEME_P_UNMARSHAL + ADD_FLAG,
TPM2B_MAX_BUFFER_P_UNMARSHAL,
END_OF_LIST,
TPM2B_MAX_BUFFER_P_MARSHAL,
TPM2B_DIGEST_P_MARSHAL,
TPMT_SIGNATURE_P_MARSHAL,
END_OF_LIST}
/* entry */ &TPM2_CertifyX509,
/* inSize */ (UINT16)(sizeof(CertifyX509_In)),
/* outSize */ (UINT16)(sizeof(CertifyX509_Out)),
/* offsetOfTypes */ offsetof(CertifyX509_COMMAND_DESCRIPTOR_t, types),
/* offsets */ {(UINT16)(offsetof(CertifyX509_In, signHandle)),
(UINT16)(offsetof(CertifyX509_In, reserved)),
(UINT16)(offsetof(CertifyX509_In, inScheme)),
(UINT16)(offsetof(CertifyX509_In, partialCertificate)),
(UINT16)(offsetof(CertifyX509_Out, tbsDigest)),
(UINT16)(offsetof(CertifyX509_Out, signature))},
/* types */ {TPMI_DH_OBJECT_H_UNMARSHAL,
TPMI_DH_OBJECT_H_UNMARSHAL + ADD_FLAG,
TPM2B_DATA_P_UNMARSHAL,
TPMT_SIG_SCHEME_P_UNMARSHAL + ADD_FLAG,
TPM2B_MAX_BUFFER_P_UNMARSHAL,
END_OF_LIST,
TPM2B_MAX_BUFFER_P_MARSHAL,
TPM2B_DIGEST_P_MARSHAL,
TPMT_SIGNATURE_P_MARSHAL,
END_OF_LIST}
};
#define _CertifyX509DataAddress (&_CertifyX509Data)
#else