1 files changed, 14 insertions, 19 deletions

diff --git a/src/lib/libcrypto/cms/cms_enc.c b/src/lib/libcrypto/cms/cms_enc.c
index b3a00f67fa..a04c831f95 100644
--- a/src/lib/libcrypto/cms/cms_enc.c
+++ b/src/lib/libcrypto/cms/cms_enc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cms_enc.c,v 1.14 2019/08/10 18:15:52 jsing Exp $ */
+/* $OpenBSD: cms_enc.c,v 1.15 2019/08/11 10:38:27 jsing Exp $ */
 /*
  * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project.
@@ -84,7 +84,7 @@ cms_EncryptedContent_init_bio(CMS_EncryptedContentInfo *ec)
 
         b = BIO_new(BIO_f_cipher());
         if (b == NULL) {
-                CMSerr(CMS_F_CMS_ENCRYPTEDCONTENT_INIT_BIO, ERR_R_MALLOC_FAILURE);
+                CMSerror(ERR_R_MALLOC_FAILURE);
                 return NULL;
         }
 
@@ -101,14 +101,13 @@ cms_EncryptedContent_init_bio(CMS_EncryptedContentInfo *ec)
                 ciph = EVP_get_cipherbyobj(calg->algorithm);
 
                 if (!ciph) {
-                        CMSerr(CMS_F_CMS_ENCRYPTEDCONTENT_INIT_BIO, CMS_R_UNKNOWN_CIPHER);
+                        CMSerror(CMS_R_UNKNOWN_CIPHER);
                         goto err;
                 }
         }
 
         if (EVP_CipherInit_ex(ctx, ciph, NULL, NULL, NULL, enc) <= 0) {
-                CMSerr(CMS_F_CMS_ENCRYPTEDCONTENT_INIT_BIO,
-                           CMS_R_CIPHER_INITIALISATION_ERROR);
+                CMSerror(CMS_R_CIPHER_INITIALISATION_ERROR);
                 goto err;
         }
 
@@ -123,8 +122,7 @@ cms_EncryptedContent_init_bio(CMS_EncryptedContentInfo *ec)
                         piv = iv;
                 }
         } else if (EVP_CIPHER_asn1_to_param(ctx, calg->parameter) <= 0) {
-                CMSerr(CMS_F_CMS_ENCRYPTEDCONTENT_INIT_BIO,
-                           CMS_R_CIPHER_PARAMETER_INITIALISATION_ERROR);
+                CMSerror(CMS_R_CIPHER_PARAMETER_INITIALISATION_ERROR);
                 goto err;
         }
         tkeylen = EVP_CIPHER_CTX_key_length(ctx);
@@ -132,7 +130,7 @@ cms_EncryptedContent_init_bio(CMS_EncryptedContentInfo *ec)
         if (!enc || !ec->key) {
                 tkey = OPENSSL_malloc(tkeylen);
                 if (tkey == NULL) {
-                        CMSerr(CMS_F_CMS_ENCRYPTEDCONTENT_INIT_BIO, ERR_R_MALLOC_FAILURE);
+                        CMSerror(ERR_R_MALLOC_FAILURE);
                         goto err;
                 }
                 if (EVP_CIPHER_CTX_rand_key(ctx, tkey) <= 0)
@@ -158,8 +156,7 @@ cms_EncryptedContent_init_bio(CMS_EncryptedContentInfo *ec)
                          * which may be useful in MMA.
                          */
                         if (enc || ec->debug) {
-                            CMSerr(CMS_F_CMS_ENCRYPTEDCONTENT_INIT_BIO,
-                                   CMS_R_INVALID_KEY_LENGTH);
+                            CMSerror(CMS_R_INVALID_KEY_LENGTH);
                             goto err;
                         } else {
                             /* Use random key */
@@ -173,19 +170,17 @@ cms_EncryptedContent_init_bio(CMS_EncryptedContentInfo *ec)
         }
 
         if (EVP_CipherInit_ex(ctx, NULL, NULL, ec->key, piv, enc) <= 0) {
-                CMSerr(CMS_F_CMS_ENCRYPTEDCONTENT_INIT_BIO,
-                           CMS_R_CIPHER_INITIALISATION_ERROR);
+                CMSerror(CMS_R_CIPHER_INITIALISATION_ERROR);
                 goto err;
         }
         if (enc) {
                 calg->parameter = ASN1_TYPE_new();
                 if (calg->parameter == NULL) {
-                        CMSerr(CMS_F_CMS_ENCRYPTEDCONTENT_INIT_BIO, ERR_R_MALLOC_FAILURE);
+                        CMSerror(ERR_R_MALLOC_FAILURE);
                         goto err;
                 }
                 if (EVP_CIPHER_param_to_asn1(ctx, calg->parameter) <= 0) {
-                        CMSerr(CMS_F_CMS_ENCRYPTEDCONTENT_INIT_BIO,
-                               CMS_R_CIPHER_PARAMETER_INITIALISATION_ERROR);
+                        CMSerror(CMS_R_CIPHER_PARAMETER_INITIALISATION_ERROR);
                         goto err;
                 }
                 /* If parameter type not set omit parameter */
@@ -215,7 +210,7 @@ cms_EncryptedContent_init(CMS_EncryptedContentInfo *ec,
         ec->cipher = cipher;
         if (key) {
                 if ((ec->key = OPENSSL_malloc(keylen)) == NULL) {
-                        CMSerr(CMS_F_CMS_ENCRYPTEDCONTENT_INIT, ERR_R_MALLOC_FAILURE);
+                        CMSerror(ERR_R_MALLOC_FAILURE);
                         return 0;
                 }
                 memcpy(ec->key, key, keylen);
@@ -234,19 +229,19 @@ CMS_EncryptedData_set1_key(CMS_ContentInfo *cms, const EVP_CIPHER *ciph,
         CMS_EncryptedContentInfo *ec;
 
         if (!key || !keylen) {
-                CMSerr(CMS_F_CMS_ENCRYPTEDDATA_SET1_KEY, CMS_R_NO_KEY);
+                CMSerror(CMS_R_NO_KEY);
                 return 0;
         }
         if (ciph) {
                 cms->d.encryptedData = M_ASN1_new_of(CMS_EncryptedData);
                 if (!cms->d.encryptedData) {
-                        CMSerr(CMS_F_CMS_ENCRYPTEDDATA_SET1_KEY, ERR_R_MALLOC_FAILURE);
+                        CMSerror(ERR_R_MALLOC_FAILURE);
                         return 0;
                 }
                 cms->contentType = OBJ_nid2obj(NID_pkcs7_encrypted);
                 cms->d.encryptedData->version = 0;
         } else if (OBJ_obj2nid(cms->contentType) != NID_pkcs7_encrypted) {
-                CMSerr(CMS_F_CMS_ENCRYPTEDDATA_SET1_KEY, CMS_R_NOT_ENCRYPTED_DATA);
+                CMSerror(CMS_R_NOT_ENCRYPTED_DATA);
                 return 0;
         }
         ec = cms->d.encryptedData->encryptedContentInfo;