1 files changed, 20 insertions, 21 deletions

diff --git a/src/lib/libcrypto/cms/cms_ess.c b/src/lib/libcrypto/cms/cms_ess.c
index 5f0ab4995b..1d3f092ae8 100644
--- a/src/lib/libcrypto/cms/cms_ess.c
+++ b/src/lib/libcrypto/cms/cms_ess.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cms_ess.c,v 1.15 2019/08/11 10:15:30 jsing Exp $ */
+/* $OpenBSD: cms_ess.c,v 1.16 2019/08/11 10:38:27 jsing Exp $ */
 /*
  * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project.
@@ -145,7 +145,7 @@ CMS_ReceiptRequest_create0(unsigned char *id, int idlen, int allorfirst,
         return rr;
 
  merr:
-        CMSerr(CMS_F_CMS_RECEIPTREQUEST_CREATE0, ERR_R_MALLOC_FAILURE);
+        CMSerror(ERR_R_MALLOC_FAILURE);
 
  err:
         CMS_ReceiptRequest_free(rr);
@@ -170,7 +170,7 @@ CMS_add1_ReceiptRequest(CMS_SignerInfo *si, CMS_ReceiptRequest *rr)
 
  merr:
         if (!r)
-                CMSerr(CMS_F_CMS_ADD1_RECEIPTREQUEST, ERR_R_MALLOC_FAILURE);
+                CMSerror(ERR_R_MALLOC_FAILURE);
 
         OPENSSL_free(rrder);
 
@@ -225,12 +225,12 @@ cms_msgSigDigest_add1(CMS_SignerInfo *dest, CMS_SignerInfo *src)
         unsigned int diglen;
 
         if (!cms_msgSigDigest(src, dig, &diglen)) {
-                CMSerr(CMS_F_CMS_MSGSIGDIGEST_ADD1, CMS_R_MSGSIGDIGEST_ERROR);
+                CMSerror(CMS_R_MSGSIGDIGEST_ERROR);
                 return 0;
         }
         if (!CMS_signed_add1_attr_by_NID(dest, NID_id_smime_aa_msgSigDigest,
             V_ASN1_OCTET_STRING, dig, diglen)) {
-                CMSerr(CMS_F_CMS_MSGSIGDIGEST_ADD1, ERR_R_MALLOC_FAILURE);
+                CMSerror(ERR_R_MALLOC_FAILURE);
                 return 0;
         }
 
@@ -259,27 +259,27 @@ cms_Receipt_verify(CMS_ContentInfo *cms, CMS_ContentInfo *req_cms)
                 goto err;
 
         if (sk_CMS_SignerInfo_num(sis) != 1) {
-                CMSerr(CMS_F_CMS_RECEIPT_VERIFY, CMS_R_NEED_ONE_SIGNER);
+                CMSerror(CMS_R_NEED_ONE_SIGNER);
                 goto err;
         }
 
         /* Check receipt content type */
         if (OBJ_obj2nid(CMS_get0_eContentType(cms)) != NID_id_smime_ct_receipt) {
-                CMSerr(CMS_F_CMS_RECEIPT_VERIFY, CMS_R_NOT_A_SIGNED_RECEIPT);
+                CMSerror(CMS_R_NOT_A_SIGNED_RECEIPT);
                 goto err;
         }
 
         /* Extract and decode receipt content */
         pcont = CMS_get0_content(cms);
         if (!pcont || !*pcont) {
-                CMSerr(CMS_F_CMS_RECEIPT_VERIFY, CMS_R_NO_CONTENT);
+                CMSerror(CMS_R_NO_CONTENT);
                 goto err;
         }
 
         rct = ASN1_item_unpack(*pcont, &CMS_Receipt_it);
 
         if (!rct) {
-                CMSerr(CMS_F_CMS_RECEIPT_VERIFY, CMS_R_RECEIPT_DECODE_ERROR);
+                CMSerror(CMS_R_RECEIPT_DECODE_ERROR);
                 goto err;
         }
 
@@ -292,7 +292,7 @@ cms_Receipt_verify(CMS_ContentInfo *cms, CMS_ContentInfo *req_cms)
         }
 
         if (i == sk_CMS_SignerInfo_num(osis)) {
-                CMSerr(CMS_F_CMS_RECEIPT_VERIFY, CMS_R_NO_MATCHING_SIGNATURE);
+                CMSerror(CMS_R_NO_MATCHING_SIGNATURE);
                 goto err;
         }
 
@@ -304,23 +304,22 @@ cms_Receipt_verify(CMS_ContentInfo *cms, CMS_ContentInfo *req_cms)
             OBJ_nid2obj(NID_id_smime_aa_msgSigDigest), -3, V_ASN1_OCTET_STRING);
 
         if (!msig) {
-                CMSerr(CMS_F_CMS_RECEIPT_VERIFY, CMS_R_NO_MSGSIGDIGEST);
+                CMSerror(CMS_R_NO_MSGSIGDIGEST);
                 goto err;
         }
 
         if (!cms_msgSigDigest(osi, dig, &diglen)) {
-                CMSerr(CMS_F_CMS_RECEIPT_VERIFY, CMS_R_MSGSIGDIGEST_ERROR);
+                CMSerror(CMS_R_MSGSIGDIGEST_ERROR);
                 goto err;
         }
 
         if (diglen != (unsigned int)msig->length) {
-                CMSerr(CMS_F_CMS_RECEIPT_VERIFY, CMS_R_MSGSIGDIGEST_WRONG_LENGTH);
+                CMSerror(CMS_R_MSGSIGDIGEST_WRONG_LENGTH);
                 goto err;
         }
 
         if (memcmp(dig, msig->data, diglen)) {
-                CMSerr(CMS_F_CMS_RECEIPT_VERIFY,
-                           CMS_R_MSGSIGDIGEST_VERIFICATION_FAILURE);
+                CMSerror(CMS_R_MSGSIGDIGEST_VERIFICATION_FAILURE);
                 goto err;
         }
 
@@ -329,27 +328,27 @@ cms_Receipt_verify(CMS_ContentInfo *cms, CMS_ContentInfo *req_cms)
         octype = CMS_signed_get0_data_by_OBJ(osi,
             OBJ_nid2obj(NID_pkcs9_contentType), -3, V_ASN1_OBJECT);
         if (!octype) {
-                CMSerr(CMS_F_CMS_RECEIPT_VERIFY, CMS_R_NO_CONTENT_TYPE);
+                CMSerror(CMS_R_NO_CONTENT_TYPE);
                 goto err;
         }
 
         /* Compare details in receipt request */
 
         if (OBJ_cmp(octype, rct->contentType)) {
-                CMSerr(CMS_F_CMS_RECEIPT_VERIFY, CMS_R_CONTENT_TYPE_MISMATCH);
+                CMSerror(CMS_R_CONTENT_TYPE_MISMATCH);
                 goto err;
         }
 
         /* Get original receipt request details */
 
         if (CMS_get1_ReceiptRequest(osi, &rr) <= 0) {
-                CMSerr(CMS_F_CMS_RECEIPT_VERIFY, CMS_R_NO_RECEIPT_REQUEST);
+                CMSerror(CMS_R_NO_RECEIPT_REQUEST);
                 goto err;
         }
 
         if (ASN1_STRING_cmp(rr->signedContentIdentifier,
             rct->signedContentIdentifier)) {
-                CMSerr(CMS_F_CMS_RECEIPT_VERIFY, CMS_R_CONTENTIDENTIFIER_MISMATCH);
+                CMSerror(CMS_R_CONTENTIDENTIFIER_MISMATCH);
                 goto err;
         }
 
@@ -379,7 +378,7 @@ cms_encode_Receipt(CMS_SignerInfo *si)
         /* Get original receipt request details */
 
         if (CMS_get1_ReceiptRequest(si, &rr) <= 0) {
-                CMSerr(CMS_F_CMS_ENCODE_RECEIPT, CMS_R_NO_RECEIPT_REQUEST);
+                CMSerror(CMS_R_NO_RECEIPT_REQUEST);
                 goto err;
         }
 
@@ -388,7 +387,7 @@ cms_encode_Receipt(CMS_SignerInfo *si)
         ctype = CMS_signed_get0_data_by_OBJ(si,
             OBJ_nid2obj(NID_pkcs9_contentType), -3, V_ASN1_OBJECT);
         if (!ctype) {
-                CMSerr(CMS_F_CMS_ENCODE_RECEIPT, CMS_R_NO_CONTENT_TYPE);
+                CMSerror(CMS_R_NO_CONTENT_TYPE);
                 goto err;
         }