Convert CMSerr() to CMSerror().

1 files changed, 30 insertions, 37 deletions

diff --git a/src/lib/libcrypto/cms/cms_sd.c b/src/lib/libcrypto/cms/cms_sd.c
index 2289c7e8a3..7072ce7dac 100644
--- a/src/lib/libcrypto/cms/cms_sd.c
+++ b/src/lib/libcrypto/cms/cms_sd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cms_sd.c,v 1.18 2019/08/11 10:15:30 jsing Exp $ */
+/* $OpenBSD: cms_sd.c,v 1.19 2019/08/11 10:38:27 jsing Exp $ */
 /*
  * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project.
@@ -69,7 +69,7 @@ static CMS_SignedData *
 cms_get0_signed(CMS_ContentInfo *cms)
 {
         if (OBJ_obj2nid(cms->contentType) != NID_pkcs7_signed) {
-                CMSerr(CMS_F_CMS_GET0_SIGNED, CMS_R_CONTENT_TYPE_NOT_SIGNED_DATA);
+                CMSerror(CMS_R_CONTENT_TYPE_NOT_SIGNED_DATA);
                 return NULL;
         }
         return cms->d.signedData;
@@ -81,7 +81,7 @@ cms_signed_data_init(CMS_ContentInfo *cms)
         if (cms->d.other == NULL) {
                 cms->d.signedData = M_ASN1_new_of(CMS_SignedData);
                 if (!cms->d.signedData) {
-                        CMSerr(CMS_F_CMS_SIGNED_DATA_INIT, ERR_R_MALLOC_FAILURE);
+                        CMSerror(ERR_R_MALLOC_FAILURE);
                         return NULL;
                 }
                 cms->d.signedData->version = 1;
@@ -180,8 +180,7 @@ cms_copy_messageDigest(CMS_ContentInfo *cms, CMS_SignerInfo *si)
                 messageDigest = CMS_signed_get0_data_by_OBJ(sitmp,
                     OBJ_nid2obj(NID_pkcs9_messageDigest), -3, V_ASN1_OCTET_STRING);
                 if (!messageDigest) {
-                        CMSerr(CMS_F_CMS_COPY_MESSAGEDIGEST,
-                            CMS_R_ERROR_READING_MESSAGEDIGEST_ATTRIBUTE);
+                        CMSerror(CMS_R_ERROR_READING_MESSAGEDIGEST_ATTRIBUTE);
                         return 0;
                 }
 
@@ -192,7 +191,7 @@ cms_copy_messageDigest(CMS_ContentInfo *cms, CMS_SignerInfo *si)
                         return 0;
         }
 
-        CMSerr(CMS_F_CMS_COPY_MESSAGEDIGEST, CMS_R_NO_MATCHING_DIGEST);
+        CMSerror(CMS_R_NO_MATCHING_DIGEST);
 
         return 0;
 }
@@ -212,7 +211,7 @@ cms_set1_SignerIdentifier(CMS_SignerIdentifier *sid, X509 *cert, int type)
                 break;
 
         default:
-                CMSerr(CMS_F_CMS_SET1_SIGNERIDENTIFIER, CMS_R_UNKNOWN_ID);
+                CMSerror(CMS_R_UNKNOWN_ID);
                 return 0;
         }
 
@@ -260,11 +259,11 @@ cms_sd_asn1_ctrl(CMS_SignerInfo *si, int cmd)
                 return 1;
         i = pkey->ameth->pkey_ctrl(pkey, ASN1_PKEY_CTRL_CMS_SIGN, cmd, si);
         if (i == -2) {
-                CMSerr(CMS_F_CMS_SD_ASN1_CTRL, CMS_R_NOT_SUPPORTED_FOR_THIS_KEY_TYPE);
+                CMSerror(CMS_R_NOT_SUPPORTED_FOR_THIS_KEY_TYPE);
                 return 0;
         }
         if (i <= 0) {
-                CMSerr(CMS_F_CMS_SD_ASN1_CTRL, CMS_R_CTRL_FAILURE);
+                CMSerror(CMS_R_CTRL_FAILURE);
                 return 0;
         }
 
@@ -281,8 +280,7 @@ CMS_add1_signer(CMS_ContentInfo *cms, X509 *signer, EVP_PKEY *pk,
         int i, type;
 
         if (!X509_check_private_key(signer, pk)) {
-                CMSerr(CMS_F_CMS_ADD1_SIGNER,
-                   CMS_R_PRIVATE_KEY_DOES_NOT_MATCH_CERTIFICATE);
+                CMSerror(CMS_R_PRIVATE_KEY_DOES_NOT_MATCH_CERTIFICATE);
                 return NULL;
         }
         sd = cms_signed_data_init(cms);
@@ -303,7 +301,7 @@ CMS_add1_signer(CMS_ContentInfo *cms, X509 *signer, EVP_PKEY *pk,
         si->pctx = NULL;
 
         if (si->mctx == NULL) {
-                CMSerr(CMS_F_CMS_ADD1_SIGNER, ERR_R_MALLOC_FAILURE);
+                CMSerror(ERR_R_MALLOC_FAILURE);
                 goto err;
         }
 
@@ -326,13 +324,13 @@ CMS_add1_signer(CMS_ContentInfo *cms, X509 *signer, EVP_PKEY *pk,
                         goto err;
                 md = EVP_get_digestbynid(def_nid);
                 if (md == NULL) {
-                        CMSerr(CMS_F_CMS_ADD1_SIGNER, CMS_R_NO_DEFAULT_DIGEST);
+                        CMSerror(CMS_R_NO_DEFAULT_DIGEST);
                         goto err;
                 }
         }
 
         if (!md) {
-                CMSerr(CMS_F_CMS_ADD1_SIGNER, CMS_R_NO_DIGEST_SET);
+                CMSerror(CMS_R_NO_DIGEST_SET);
                 goto err;
         }
 
@@ -418,7 +416,7 @@ CMS_add1_signer(CMS_ContentInfo *cms, X509 *signer, EVP_PKEY *pk,
         return si;
 
  merr:
-        CMSerr(CMS_F_CMS_ADD1_SIGNER, ERR_R_MALLOC_FAILURE);
+        CMSerror(ERR_R_MALLOC_FAILURE);
  err:
         M_ASN1_free_of(si, CMS_SignerInfo);
 
@@ -449,7 +447,7 @@ cms_add1_signingTime(CMS_SignerInfo *si, ASN1_TIME *t)
         if (!t)
                 ASN1_TIME_free(tt);
         if (!r)
-                CMSerr(CMS_F_CMS_ADD1_SIGNINGTIME, ERR_R_MALLOC_FAILURE);
+                CMSerror(ERR_R_MALLOC_FAILURE);
 
         return r;
 }
@@ -606,12 +604,12 @@ cms_SignerInfo_content_sign(CMS_ContentInfo *cms, CMS_SignerInfo *si, BIO *chain
         EVP_PKEY_CTX *pctx = NULL;
 
         if (mctx == NULL) {
-                CMSerr(CMS_F_CMS_SIGNERINFO_CONTENT_SIGN, ERR_R_MALLOC_FAILURE);
+                CMSerror(ERR_R_MALLOC_FAILURE);
                 return 0;
         }
 
         if (!si->pkey) {
-                CMSerr(CMS_F_CMS_SIGNERINFO_CONTENT_SIGN, CMS_R_NO_PRIVATE_KEY);
+                CMSerror(CMS_R_NO_PRIVATE_KEY);
                 goto err;
         }
 
@@ -654,7 +652,7 @@ cms_SignerInfo_content_sign(CMS_ContentInfo *cms, CMS_SignerInfo *si, BIO *chain
                 siglen = EVP_PKEY_size(si->pkey);
                 sig = OPENSSL_malloc(siglen);
                 if (sig == NULL) {
-                        CMSerr(CMS_F_CMS_SIGNERINFO_CONTENT_SIGN, ERR_R_MALLOC_FAILURE);
+                        CMSerror(ERR_R_MALLOC_FAILURE);
                         goto err;
                 }
                 if (EVP_PKEY_sign(pctx, sig, &siglen, md, mdlen) <= 0) {
@@ -668,11 +666,11 @@ cms_SignerInfo_content_sign(CMS_ContentInfo *cms, CMS_SignerInfo *si, BIO *chain
 
                 sig = OPENSSL_malloc(EVP_PKEY_size(si->pkey));
                 if (sig == NULL) {
-                        CMSerr(CMS_F_CMS_SIGNERINFO_CONTENT_SIGN, ERR_R_MALLOC_FAILURE);
+                        CMSerror(ERR_R_MALLOC_FAILURE);
                         goto err;
                 }
                 if (!EVP_SignFinal(mctx, sig, &siglen, si->pkey)) {
-                        CMSerr(CMS_F_CMS_SIGNERINFO_CONTENT_SIGN, CMS_R_SIGNFINAL_ERROR);
+                        CMSerror(CMS_R_SIGNFINAL_ERROR);
                         OPENSSL_free(sig);
                         goto err;
                 }
@@ -736,7 +734,7 @@ CMS_SignerInfo_sign(CMS_SignerInfo *si)
 
         if (EVP_PKEY_CTX_ctrl(pctx, -1, EVP_PKEY_OP_SIGN,
             EVP_PKEY_CTRL_CMS_SIGN, 0, si) <= 0) {
-                CMSerr(CMS_F_CMS_SIGNERINFO_SIGN, CMS_R_CTRL_ERROR);
+                CMSerror(CMS_R_CTRL_ERROR);
                 goto err;
         }
 
@@ -757,7 +755,7 @@ CMS_SignerInfo_sign(CMS_SignerInfo *si)
 
         if (EVP_PKEY_CTX_ctrl(pctx, -1, EVP_PKEY_OP_SIGN,
             EVP_PKEY_CTRL_CMS_SIGN, 1, si) <= 0) {
-                CMSerr(CMS_F_CMS_SIGNERINFO_SIGN, CMS_R_CTRL_ERROR);
+                CMSerror(CMS_R_CTRL_ERROR);
                 goto err;
         }
 
@@ -783,7 +781,7 @@ CMS_SignerInfo_verify(CMS_SignerInfo *si)
         const EVP_MD *md = NULL;
 
         if (!si->pkey) {
-                CMSerr(CMS_F_CMS_SIGNERINFO_VERIFY, CMS_R_NO_PUBLIC_KEY);
+                CMSerror(CMS_R_NO_PUBLIC_KEY);
                 return -1;
         }
 
@@ -791,7 +789,7 @@ CMS_SignerInfo_verify(CMS_SignerInfo *si)
         if (md == NULL)
                 return -1;
         if (si->mctx == NULL && (si->mctx = EVP_MD_CTX_new()) == NULL) {
-                CMSerr(CMS_F_CMS_SIGNERINFO_VERIFY, ERR_R_MALLOC_FAILURE);
+                CMSerror(ERR_R_MALLOC_FAILURE);
                 return -1;
         }
         mctx = si->mctx;
@@ -815,7 +813,7 @@ CMS_SignerInfo_verify(CMS_SignerInfo *si)
         r = EVP_DigestVerifyFinal(mctx, si->signature->data,
             si->signature->length);
         if (r <= 0)
-                CMSerr(CMS_F_CMS_SIGNERINFO_VERIFY, CMS_R_VERIFICATION_FAILURE);
+                CMSerror(CMS_R_VERIFICATION_FAILURE);
 
  err:
         EVP_MD_CTX_reset(mctx);
@@ -869,7 +867,7 @@ CMS_SignerInfo_verify_content(CMS_SignerInfo *si, BIO *chain)
         unsigned int mlen;
 
         if (mctx == NULL) {
-                CMSerr(CMS_F_CMS_SIGNERINFO_VERIFY_CONTENT, ERR_R_MALLOC_FAILURE);
+                CMSerror(ERR_R_MALLOC_FAILURE);
                 goto err;
         }
         /* If we have any signed attributes look for messageDigest value */
@@ -878,8 +876,7 @@ CMS_SignerInfo_verify_content(CMS_SignerInfo *si, BIO *chain)
                     OBJ_nid2obj(NID_pkcs9_messageDigest), -3,
                     V_ASN1_OCTET_STRING);
                 if (!os) {
-                        CMSerr(CMS_F_CMS_SIGNERINFO_VERIFY_CONTENT,
-                            CMS_R_ERROR_READING_MESSAGEDIGEST_ATTRIBUTE);
+                        CMSerror(CMS_R_ERROR_READING_MESSAGEDIGEST_ATTRIBUTE);
                         goto err;
                 }
         }
@@ -888,8 +885,7 @@ CMS_SignerInfo_verify_content(CMS_SignerInfo *si, BIO *chain)
                 goto err;
 
         if (EVP_DigestFinal_ex(mctx, mval, &mlen) <= 0) {
-                CMSerr(CMS_F_CMS_SIGNERINFO_VERIFY_CONTENT,
-                   CMS_R_UNABLE_TO_FINALIZE_CONTEXT);
+                CMSerror(CMS_R_UNABLE_TO_FINALIZE_CONTEXT);
                 goto err;
         }
 
@@ -897,14 +893,12 @@ CMS_SignerInfo_verify_content(CMS_SignerInfo *si, BIO *chain)
 
         if (os) {
                 if (mlen != (unsigned int)os->length) {
-                        CMSerr(CMS_F_CMS_SIGNERINFO_VERIFY_CONTENT,
-                            CMS_R_MESSAGEDIGEST_ATTRIBUTE_WRONG_LENGTH);
+                        CMSerror(CMS_R_MESSAGEDIGEST_ATTRIBUTE_WRONG_LENGTH);
                         goto err;
                 }
 
                 if (memcmp(mval, os->data, mlen)) {
-                        CMSerr(CMS_F_CMS_SIGNERINFO_VERIFY_CONTENT,
-                            CMS_R_VERIFICATION_FAILURE);
+                        CMSerror(CMS_R_VERIFICATION_FAILURE);
                         r = 0;
                 } else
                         r = 1;
@@ -924,8 +918,7 @@ CMS_SignerInfo_verify_content(CMS_SignerInfo *si, BIO *chain)
                 r = EVP_PKEY_verify(pkctx, si->signature->data,
                                         si->signature->length, mval, mlen);
                 if (r <= 0) {
-                        CMSerr(CMS_F_CMS_SIGNERINFO_VERIFY_CONTENT,
-                               CMS_R_VERIFICATION_FAILURE);
+                        CMSerror(CMS_R_VERIFICATION_FAILURE);
                         r = 0;
                 }
         }