diff options
| author | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2021-07-06 12:23:51 +0200 |
|---|---|---|
| committer | Dr. David von Oheimb <dev@ddvo.net> | 2022-12-07 21:57:36 +0100 |
| commit | 084d3afd26cc20b41241b70b6c709b76d2a334a5 (patch) | |
| tree | 97d0f88b9a2941a2ca9dfe664a9216a98b794caa /crypto/crmf/crmf_local.h | |
| parent | a63fa5f711f1f97e623348656b42717d6904ee3e (diff) | |
Compensate for CMP-related TODOs removed by PR #15539
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
Reviewed-by: Hugo Landau <hlandau@openssl.org>
Reviewed-by: David von Oheimb <david.von.oheimb@siemens.com>
(Merged from https://github.com/openssl/openssl/pull/16006)
Diffstat (limited to 'crypto/crmf/crmf_local.h')
| -rw-r--r-- | crypto/crmf/crmf_local.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/crmf/crmf_local.h b/crypto/crmf/crmf_local.h index f8d028442b..e8937b4231 100644 --- a/crypto/crmf/crmf_local.h +++ b/crypto/crmf/crmf_local.h @@ -188,6 +188,7 @@ typedef struct ossl_crmf_popoprivkey_st { ASN1_BIT_STRING *dhMAC; /* 2 */ /* Deprecated */ OSSL_CRMF_PKMACVALUE *agreeMAC; /* 3 */ ASN1_NULL *encryptedKey; /* 4 */ + /* When supported, ASN1_NULL needs to be replaced by CMS_ENVELOPEDDATA */ } value; } OSSL_CRMF_POPOPRIVKEY; DECLARE_ASN1_FUNCTIONS(OSSL_CRMF_POPOPRIVKEY) @@ -329,7 +330,7 @@ struct ossl_crmf_certtemplate_st { struct ossl_crmf_certrequest_st { ASN1_INTEGER *certReqId; OSSL_CRMF_CERTTEMPLATE *certTemplate; - STACK_OF(OSSL_CRMF_ATTRIBUTETYPEANDVALUE) *controls; + STACK_OF(OSSL_CRMF_ATTRIBUTETYPEANDVALUE /* Controls expanded */) *controls; } /* OSSL_CRMF_CERTREQUEST */; DECLARE_ASN1_FUNCTIONS(OSSL_CRMF_CERTREQUEST) DECLARE_ASN1_DUP_FUNCTION(OSSL_CRMF_CERTREQUEST) |