X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=crypto%2Fevp%2Fevp_pbe.c;h=e6bd33259d5410a42f1a0d33eb0044f4a20edd18;hb=9311d0c471ca2eaa259e8c1bbbeb7c46394c7ba2;hp=b283b0a684dc3126e1a76951dd418afbb85ce64c;hpb=31a6b52f6db009c639c67387a707dd235f29a430;p=thirdparty%2Fopenssl.git

diff --git a/crypto/evp/evp_pbe.c b/crypto/evp/evp_pbe.c
index b283b0a684..e6bd33259d 100644
--- a/crypto/evp/evp_pbe.c
+++ b/crypto/evp/evp_pbe.c
@@ -94,7 +94,7 @@ int EVP_PBE_CipherInit(ASN1_OBJECT *pbe_obj, const char *pass, int passlen,
                       &cipher_nid, &md_nid, &keygen)) {
         char obj_tmp[80];
 
-        EVPerr(EVP_F_EVP_PBE_CIPHERINIT, EVP_R_UNKNOWN_PBE_ALGORITHM);
+        ERR_raise(ERR_LIB_EVP, EVP_R_UNKNOWN_PBE_ALGORITHM);
         if (pbe_obj == NULL)
             OPENSSL_strlcpy(obj_tmp, "NULL", sizeof(obj_tmp));
         else
@@ -113,7 +113,7 @@ int EVP_PBE_CipherInit(ASN1_OBJECT *pbe_obj, const char *pass, int passlen,
     else {
         cipher = EVP_get_cipherbynid(cipher_nid);
         if (!cipher) {
-            EVPerr(EVP_F_EVP_PBE_CIPHERINIT, EVP_R_UNKNOWN_CIPHER);
+            ERR_raise(ERR_LIB_EVP, EVP_R_UNKNOWN_CIPHER);
             ERR_add_error_data(1, OBJ_nid2sn(cipher_nid));
             return 0;
         }
@@ -124,7 +124,7 @@ int EVP_PBE_CipherInit(ASN1_OBJECT *pbe_obj, const char *pass, int passlen,
     else {
         md = EVP_get_digestbynid(md_nid);
         if (!md) {
-            EVPerr(EVP_F_EVP_PBE_CIPHERINIT, EVP_R_UNKNOWN_DIGEST);
+            ERR_raise(ERR_LIB_EVP, EVP_R_UNKNOWN_DIGEST);
             return 0;
         }
     }
@@ -183,7 +183,7 @@ int EVP_PBE_alg_add_type(int pbe_type, int pbe_nid, int cipher_nid,
     return 1;
 
  err:
-    EVPerr(EVP_F_EVP_PBE_ALG_ADD_TYPE, ERR_R_MALLOC_FAILURE);
+    ERR_raise(ERR_LIB_EVP, ERR_R_MALLOC_FAILURE);
     return 0;
 }