diff options
| author | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2019-12-13 20:07:08 +0100 |
|---|---|---|
| committer | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2020-02-17 07:43:58 +0100 |
| commit | 235595c402bd7815f07f1f3f3babe9fcc247a206 (patch) | |
| tree | b4fd2cf01de36a6988d1eceadf8f51e6238b5a1c /crypto/crmf/crmf_local.h | |
| parent | ebf3006917e0e968af4a5d5c2c6379c5b866f801 (diff) | |
fix various formatting nits in CMP contribution chunks 1-6 found by the new util/check-format.pl
in addition:
correct wording in doc, comments, and parameter names: self-signed -> self-issued where appropriate
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Bernd Edlinger <bernd.edlinger@hotmail.de>
(Merged from https://github.com/openssl/openssl/pull/10620)
Diffstat (limited to 'crypto/crmf/crmf_local.h')
| -rw-r--r-- | crypto/crmf/crmf_local.h | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/crypto/crmf/crmf_local.h b/crypto/crmf/crmf_local.h index 06b32b5378..3f3f75cf2f 100644 --- a/crypto/crmf/crmf_local.h +++ b/crypto/crmf/crmf_local.h @@ -185,9 +185,9 @@ DECLARE_ASN1_FUNCTIONS(OSSL_CRMF_PKMACVALUE) typedef struct ossl_crmf_popoprivkey_st { int type; union { - ASN1_BIT_STRING *thisMessage; /* 0 */ /* Deprecated */ + ASN1_BIT_STRING *thisMessage; /* 0 */ /* Deprecated */ ASN1_INTEGER *subsequentMessage; /* 1 */ - ASN1_BIT_STRING *dhMAC; /* 2 */ /* Deprecated */ + ASN1_BIT_STRING *dhMAC; /* 2 */ /* Deprecated */ OSSL_CRMF_PKMACVALUE *agreeMAC; /* 3 */ /* * TODO: This is not ASN1_NULL but CMS_ENVELOPEDDATA which should be @@ -310,20 +310,20 @@ DECLARE_ASN1_FUNCTIONS(OSSL_CRMF_OPTIONALVALIDITY) * } */ struct ossl_crmf_certtemplate_st { - ASN1_INTEGER *version; /* 0 */ - ASN1_INTEGER *serialNumber; /* 1 */ /* serialNumber MUST be omitted */ - /* This field is assigned by the CA during certificate creation */ - X509_ALGOR *signingAlg; /* 2 */ /* signingAlg MUST be omitted */ - /* This field is assigned by the CA during certificate creation */ - X509_NAME *issuer; /* 3 */ - OSSL_CRMF_OPTIONALVALIDITY *validity; /* 4 */ - X509_NAME *subject; /* 5 */ - X509_PUBKEY *publicKey; /* 6 */ - ASN1_BIT_STRING *issuerUID; /* 7 */ /* deprecated in version 2 */ - /* According to rfc 3280: UniqueIdentifier ::= BIT STRING */ - ASN1_BIT_STRING *subjectUID; /* 8 */ /* deprecated in version 2 */ - /* Could be X509_EXTENSION*S*, but that's only cosmetic */ - STACK_OF(X509_EXTENSION) *extensions; /* 9 */ + ASN1_INTEGER *version; + ASN1_INTEGER *serialNumber; /* serialNumber MUST be omitted */ + /* This field is assigned by the CA during certificate creation */ + X509_ALGOR *signingAlg; /* signingAlg MUST be omitted */ + /* This field is assigned by the CA during certificate creation */ + X509_NAME *issuer; + OSSL_CRMF_OPTIONALVALIDITY *validity; + X509_NAME *subject; + X509_PUBKEY *publicKey; + ASN1_BIT_STRING *issuerUID; /* deprecated in version 2 */ + /* According to rfc 3280: UniqueIdentifier ::= BIT STRING */ + ASN1_BIT_STRING *subjectUID; /* deprecated in version 2 */ + /* Could be X509_EXTENSION*S*, but that's only cosmetic */ + STACK_OF(X509_EXTENSION) *extensions; } /* OSSL_CRMF_CERTTEMPLATE */; /*- |