diff options
| author | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2020-03-23 14:42:34 +0100 |
|---|---|---|
| committer | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2020-04-18 19:54:17 +0200 |
| commit | 642f60d8402ade17701fc8c4eeecc3a086e86c63 (patch) | |
| tree | c5ffc49826fc318e1f1370e1e751b933d72ef91f /crypto | |
| parent | 7a417606677c646d33d65de2fd298bc93d943edf (diff) | |
Rename CMP_PROTECTEDPART to OSSL_CMP_PROTECTEDPART for consistency
Reviewed-by: Kurt Roeckx <kurt@roeckx.be>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/11386)
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/cmp/cmp_asn.c | 6 | ||||
| -rw-r--r-- | crypto/cmp/cmp_local.h | 6 | ||||
| -rw-r--r-- | crypto/cmp/cmp_protect.c | 4 | ||||
| -rw-r--r-- | crypto/cmp/cmp_vfy.c | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/crypto/cmp/cmp_asn.c b/crypto/cmp/cmp_asn.c index e02076bb12..42473f79f2 100644 --- a/crypto/cmp/cmp_asn.c +++ b/crypto/cmp/cmp_asn.c @@ -396,11 +396,11 @@ ASN1_SEQUENCE(OSSL_CMP_PKIHEADER) = { } ASN1_SEQUENCE_END(OSSL_CMP_PKIHEADER) IMPLEMENT_ASN1_FUNCTIONS(OSSL_CMP_PKIHEADER) -ASN1_SEQUENCE(CMP_PROTECTEDPART) = { +ASN1_SEQUENCE(OSSL_CMP_PROTECTEDPART) = { ASN1_SIMPLE(OSSL_CMP_MSG, header, OSSL_CMP_PKIHEADER), ASN1_SIMPLE(OSSL_CMP_MSG, body, OSSL_CMP_PKIBODY) -} ASN1_SEQUENCE_END(CMP_PROTECTEDPART) -IMPLEMENT_ASN1_FUNCTIONS(CMP_PROTECTEDPART) +} ASN1_SEQUENCE_END(OSSL_CMP_PROTECTEDPART) +IMPLEMENT_ASN1_FUNCTIONS(OSSL_CMP_PROTECTEDPART) ASN1_SEQUENCE(OSSL_CMP_MSG) = { ASN1_SIMPLE(OSSL_CMP_MSG, header, OSSL_CMP_PKIHEADER), diff --git a/crypto/cmp/cmp_local.h b/crypto/cmp/cmp_local.h index c3a080f2bd..e7219b0879 100644 --- a/crypto/cmp/cmp_local.h +++ b/crypto/cmp/cmp_local.h @@ -674,11 +674,11 @@ DECLARE_ASN1_FUNCTIONS(OSSL_CMP_MSG) * body PKIBody * } */ -typedef struct cmp_protectedpart_st { +typedef struct ossl_cmp_protectedpart_st { OSSL_CMP_PKIHEADER *header; OSSL_CMP_PKIBODY *body; -} CMP_PROTECTEDPART; -DECLARE_ASN1_FUNCTIONS(CMP_PROTECTEDPART) +} OSSL_CMP_PROTECTEDPART; +DECLARE_ASN1_FUNCTIONS(OSSL_CMP_PROTECTEDPART) /*- * this is not defined here as it is already in CRMF: diff --git a/crypto/cmp/cmp_protect.c b/crypto/cmp/cmp_protect.c index ce20ef203e..2101a6c46e 100644 --- a/crypto/cmp/cmp_protect.c +++ b/crypto/cmp/cmp_protect.c @@ -35,7 +35,7 @@ ASN1_BIT_STRING *ossl_cmp_calc_protection(const OSSL_CMP_MSG *msg, EVP_PKEY *pkey) { ASN1_BIT_STRING *prot = NULL; - CMP_PROTECTEDPART prot_part; + OSSL_CMP_PROTECTEDPART prot_part; const ASN1_OBJECT *algorOID = NULL; int len; size_t prot_part_der_len; @@ -58,7 +58,7 @@ ASN1_BIT_STRING *ossl_cmp_calc_protection(const OSSL_CMP_MSG *msg, prot_part.header = msg->header; prot_part.body = msg->body; - len = i2d_CMP_PROTECTEDPART(&prot_part, &prot_part_der); + len = i2d_OSSL_CMP_PROTECTEDPART(&prot_part, &prot_part_der); if (len < 0 || prot_part_der == NULL) { CMPerr(0, CMP_R_ERROR_CALCULATING_PROTECTION); goto end; diff --git a/crypto/cmp/cmp_vfy.c b/crypto/cmp/cmp_vfy.c index 11688059da..1ee1b3325e 100644 --- a/crypto/cmp/cmp_vfy.c +++ b/crypto/cmp/cmp_vfy.c @@ -32,7 +32,7 @@ static int verify_signature(const OSSL_CMP_CTX *cmp_ctx, const OSSL_CMP_MSG *msg, X509 *cert) { EVP_MD_CTX *ctx = NULL; - CMP_PROTECTEDPART prot_part; + OSSL_CMP_PROTECTEDPART prot_part; int digest_nid, pk_nid; const EVP_MD *digest = NULL; EVP_PKEY *pubkey = NULL; @@ -62,7 +62,7 @@ static int verify_signature(const OSSL_CMP_CTX *cmp_ctx, prot_part.header = msg->header; prot_part.body = msg->body; - len = i2d_CMP_PROTECTEDPART(&prot_part, &prot_part_der); + len = i2d_OSSL_CMP_PROTECTEDPART(&prot_part, &prot_part_der); if (len < 0 || prot_part_der == NULL) goto end; prot_part_der_len = (size_t) len; |