 +
 +const ASN1_ITEM CRMF_ENCRYPTEDKEY_it = {
 +	.itype = ASN1_ITYPE_CHOICE,
-+	.utype = V_ASN1_SEQUENCE,
++	.utype = offsetof(CRMF_ENCRYPTEDKEY, type),
 +	.templates = CRMF_ENCRYPTEDKEY_ch_tt,
 +	.tcount = sizeof(CRMF_ENCRYPTEDKEY_ch_tt) / sizeof(ASN1_TEMPLATE),
 +	.funcs = NULL,

+
+const ASN1_ITEM CRMF_PROOFOFPOSSESION_it = {
+	.itype = ASN1_ITYPE_CHOICE,
+	.utype = V_ASN1_SEQUENCE,
+	.templates = CRMF_PROOFOFPOSSESION_ch_tt,
+	.tcount = sizeof(CRMF_PROOFOFPOSSESION_ch_tt) / sizeof(ASN1_TEMPLATE),
+	.funcs = NULL,

+
+const ASN1_ITEM CRMF_ENCKEYWITHID_IDENTIFIER_it = {
+	.itype = ASN1_ITYPE_CHOICE,
+	.utype = offsetof(CRMF_ENCKEYWITHID_IDENTIFIER, type),
+	.templates = CRMF_ENCKEYWITHID_IDENTIFIER_ch_tt,
+	.tcount = sizeof(CRMF_ENCKEYWITHID_IDENTIFIER_ch_tt) / sizeof(ASN1_TEMPLATE),
+	.funcs = NULL,
