tpm2-asn: add TPMPolicy definition

Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

1 files changed, 34 insertions, 0 deletions

diff --git a/tpm2-asn.h b/tpm2-asn.h
index 2a08e3a..8bcc596 100644
--- a/tpm2-asn.h
+++ b/tpm2-asn.h
@@ -8,6 +8,37 @@
 #include <openssl/asn1t.h>
 
 /*
+ * Define the format of policy commands required for TPM enhanced authorization.
+ *
+ * TPMPolicy ::= SEQUENCE {
+ *	CommandCode		[0] EXPLICIT INTEGER
+ *	CommandPolicy		[1] EXPLICIT OCTET STRING
+ * }
+ */
+typedef struct {
+	ASN1_INTEGER *CommandCode;
+	ASN1_OCTET_STRING *CommandPolicy;
+} TSSOPTPOLICY;
+
+ASN1_SEQUENCE(TSSOPTPOLICY) = {
+	ASN1_EXP(TSSOPTPOLICY, CommandCode, ASN1_INTEGER, 0),
+	ASN1_EXP(TSSOPTPOLICY, CommandPolicy, ASN1_OCTET_STRING, 1)
+} ASN1_SEQUENCE_END(TSSOPTPOLICY)
+
+IMPLEMENT_ASN1_FUNCTIONS(TSSOPTPOLICY);
+
+#if OPENSSL_VERSION_NUMBER < 0x10100000
+#define sk_TSSOPTPOLICY_new_null() SKM_sk_new_null(TSSOPTPOLICY)
+#define sk_TSSOPTPOLICY_push(sk, policy) SKM_sk_push(TSSOPTPOLICY, sk, policy)
+#define sk_TSSOPTPOLICY_pop(sk) SKM_sk_pop(TSSOPTPOLICY, sk)
+#define sk_TSSOPTPOLICY_free(sk) SKM_sk_free(TSSOPTPOLICY, sk)
+#define sk_TSSOPTPOLICY_num(policy) SKM_sk_num(TSSOPTPOLICY, policy)
+#define sk_TSSOPTPOLICY_value(policy, i) SKM_sk_value(TSSOPTPOLICY, policy, i)
+#else
+DEFINE_STACK_OF(TSSOPTPOLICY);
+#endif
+
+/*
  * Define the format of a TPM key file.  The current format covers
  * both TPM1.2 keys as well as symmetrically encrypted private keys
  * produced by TSS2_Import and the TPM2 format public key which
@@ -19,6 +50,7 @@
  *	emptyAuth	[0] EXPLICIT BOOLEAN OPTIONAL
  *	parent		[1] EXPLICIT INTEGER OPTIONAL
  *	pubkey		[2] EXPLICIT OCTET STRING OPTIONAL
+ *	policy		[3] EXPLICIT SEQUENCE OF TPMPolicy OPTIONAL
  *	privkey		OCTET STRING
  * }
  */
@@ -28,6 +60,7 @@ typedef struct {
 	ASN1_BOOLEAN emptyAuth;
 	ASN1_INTEGER *parent;
 	ASN1_OCTET_STRING *pubkey;
+	STACK_OF(TSSOPTPOLICY) *policy;
 	ASN1_OCTET_STRING *privkey;
 } TSSLOADABLE;
 
@@ -45,6 +78,7 @@ ASN1_SEQUENCE(TSSLOADABLE) = {
 	ASN1_EXP_OPT(TSSLOADABLE, emptyAuth, ASN1_BOOLEAN, 0),
 	ASN1_EXP_OPT(TSSLOADABLE, parent, ASN1_INTEGER, 1),
 	ASN1_EXP_OPT(TSSLOADABLE, pubkey, ASN1_OCTET_STRING, 2),
+	ASN1_EXP_SEQUENCE_OF_OPT(TSSLOADABLE, policy, TSSOPTPOLICY, 3),
 	ASN1_SIMPLE(TSSLOADABLE, privkey, ASN1_OCTET_STRING)
 } ASN1_SEQUENCE_END(TSSLOADABLE)