From 8b6bbcaa7bd2f0b44d7d0d867acc6002ba09a6fd Mon Sep 17 00:00:00 2001 From: "Dr. David von Oheimb" Date: Fri, 14 Apr 2023 15:00:39 +0200 Subject: [PATCH] crmf_lib.c: clean up coments on OSSL_CRMF_CERTTEMPLATE*() Reviewed-by: Tomas Mraz Reviewed-by: Paul Dale Reviewed-by: David von Oheimb (Merged from https://github.com/openssl/openssl/pull/20736) --- crypto/crmf/crmf_lib.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/crypto/crmf/crmf_lib.c b/crypto/crmf/crmf_lib.c index 86152ee247..6fc7c91095 100644 --- a/crypto/crmf/crmf_lib.c +++ b/crypto/crmf/crmf_lib.c @@ -547,7 +547,6 @@ X509_PUBKEY return tmpl != NULL ? tmpl->publicKey : NULL; } -/* retrieves the serialNumber of the given cert template or NULL on error */ const ASN1_INTEGER *OSSL_CRMF_CERTTEMPLATE_get0_serialNumber(const OSSL_CRMF_CERTTEMPLATE *tmpl) { @@ -560,7 +559,6 @@ const X509_NAME return tmpl != NULL ? tmpl->subject : NULL; } -/* retrieves the issuer name of the given cert template or NULL on error */ const X509_NAME *OSSL_CRMF_CERTTEMPLATE_get0_issuer(const OSSL_CRMF_CERTTEMPLATE *tmpl) { @@ -573,14 +571,12 @@ X509_EXTENSIONS return tmpl != NULL ? tmpl->extensions : NULL; } -/* retrieves the issuer name of the given CertId or NULL on error */ const X509_NAME *OSSL_CRMF_CERTID_get0_issuer(const OSSL_CRMF_CERTID *cid) { return cid != NULL && cid->issuer->type == GEN_DIRNAME ? cid->issuer->d.directoryName : NULL; } -/* retrieves the serialNumber of the given CertId or NULL on error */ const ASN1_INTEGER *OSSL_CRMF_CERTID_get0_serialNumber(const OSSL_CRMF_CERTID *cid) { @@ -588,8 +584,8 @@ const ASN1_INTEGER *OSSL_CRMF_CERTID_get0_serialNumber(const OSSL_CRMF_CERTID } /*- - * fill in certificate template. - * Any value argument that is NULL will leave the respective field unchanged. + * Fill in the certificate template |tmpl|. + * Any other NULL argument will leave the respective field unchanged. */ int OSSL_CRMF_CERTTEMPLATE_fill(OSSL_CRMF_CERTTEMPLATE *tmpl, EVP_PKEY *pubkey,