Convert all {NAME}err() in crypto/ to their corresponding ERR_raise() call

[openssl.git] / crypto / dsa / dsa_ameth.c

diff --git a/crypto/dsa/dsa_ameth.c b/crypto/dsa/dsa_ameth.c
index d3e22abc358a9f0dc54bc58bd5242645b7c52c5e..ff4904952d0d98b5eb5bc94a5f77cea02c326686 100644 (file)
--- a/crypto/dsa/dsa_ameth.c
+++ b/crypto/dsa/dsa_ameth.c
@@ -48,27 +48,27 @@ static int dsa_pub_decode(EVP_PKEY *pkey, const X509_PUBKEY *pubkey)
         pmlen = pstr->length;
 
         if ((dsa = d2i_DSAparams(NULL, &pm, pmlen)) == NULL) {
         pmlen = pstr->length;
 
         if ((dsa = d2i_DSAparams(NULL, &pm, pmlen)) == NULL) {

-            DSAerr(DSA_F_DSA_PUB_DECODE, DSA_R_DECODE_ERROR);
+            ERR_raise(ERR_LIB_DSA, DSA_R_DECODE_ERROR);

             goto err;
         }
 
     } else if ((ptype == V_ASN1_NULL) || (ptype == V_ASN1_UNDEF)) {
         if ((dsa = DSA_new()) == NULL) {
             goto err;
         }
 
     } else if ((ptype == V_ASN1_NULL) || (ptype == V_ASN1_UNDEF)) {
         if ((dsa = DSA_new()) == NULL) {

-            DSAerr(DSA_F_DSA_PUB_DECODE, ERR_R_MALLOC_FAILURE);
+            ERR_raise(ERR_LIB_DSA, ERR_R_MALLOC_FAILURE);

             goto err;
         }
     } else {
             goto err;
         }
     } else {

-        DSAerr(DSA_F_DSA_PUB_DECODE, DSA_R_PARAMETER_ENCODING_ERROR);
+        ERR_raise(ERR_LIB_DSA, DSA_R_PARAMETER_ENCODING_ERROR);

         goto err;
     }
 
     if ((public_key = d2i_ASN1_INTEGER(NULL, &p, pklen)) == NULL) {
         goto err;
     }
 
     if ((public_key = d2i_ASN1_INTEGER(NULL, &p, pklen)) == NULL) {

-        DSAerr(DSA_F_DSA_PUB_DECODE, DSA_R_DECODE_ERROR);
+        ERR_raise(ERR_LIB_DSA, DSA_R_DECODE_ERROR);

         goto err;
     }
 
     if ((dsa->pub_key = ASN1_INTEGER_to_BN(public_key, NULL)) == NULL) {
         goto err;
     }
 
     if ((dsa->pub_key = ASN1_INTEGER_to_BN(public_key, NULL)) == NULL) {

-        DSAerr(DSA_F_DSA_PUB_DECODE, DSA_R_BN_DECODE_ERROR);
+        ERR_raise(ERR_LIB_DSA, DSA_R_BN_DECODE_ERROR);

         goto err;
     }
 
         goto err;
     }
 


@@ -101,12 +101,12 @@ static int dsa_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey)
         && dsa->params.g != NULL) {
         str = ASN1_STRING_new();
         if (str == NULL) {
         && dsa->params.g != NULL) {
         str = ASN1_STRING_new();
         if (str == NULL) {

-            DSAerr(DSA_F_DSA_PUB_ENCODE, ERR_R_MALLOC_FAILURE);
+            ERR_raise(ERR_LIB_DSA, ERR_R_MALLOC_FAILURE);

             goto err;
         }
         str->length = i2d_DSAparams(dsa, &str->data);
         if (str->length <= 0) {
             goto err;
         }
         str->length = i2d_DSAparams(dsa, &str->data);
         if (str->length <= 0) {

-            DSAerr(DSA_F_DSA_PUB_ENCODE, ERR_R_MALLOC_FAILURE);
+            ERR_raise(ERR_LIB_DSA, ERR_R_MALLOC_FAILURE);

             goto err;
         }
         ptype = V_ASN1_SEQUENCE;
             goto err;
         }
         ptype = V_ASN1_SEQUENCE;


@@ -116,7 +116,7 @@ static int dsa_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey)
     pubint = BN_to_ASN1_INTEGER(dsa->pub_key, NULL);
 
     if (pubint == NULL) {
     pubint = BN_to_ASN1_INTEGER(dsa->pub_key, NULL);
 
     if (pubint == NULL) {

-        DSAerr(DSA_F_DSA_PUB_ENCODE, ERR_R_MALLOC_FAILURE);
+        ERR_raise(ERR_LIB_DSA, ERR_R_MALLOC_FAILURE);

         goto err;
     }
 
         goto err;
     }
 


@@ -124,7 +124,7 @@ static int dsa_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey)
     ASN1_INTEGER_free(pubint);
 
     if (penclen <= 0) {
     ASN1_INTEGER_free(pubint);
 
     if (penclen <= 0) {

-        DSAerr(DSA_F_DSA_PUB_ENCODE, ERR_R_MALLOC_FAILURE);
+        ERR_raise(ERR_LIB_DSA, ERR_R_MALLOC_FAILURE);

         goto err;
     }
 
         goto err;
     }
 


@@ -179,23 +179,23 @@ static int dsa_priv_decode(EVP_PKEY *pkey, const PKCS8_PRIV_KEY_INFO *p8)
     /* We have parameters now set private key */
     if ((dsa->priv_key = BN_secure_new()) == NULL
         || !ASN1_INTEGER_to_BN(privkey, dsa->priv_key)) {
     /* We have parameters now set private key */
     if ((dsa->priv_key = BN_secure_new()) == NULL
         || !ASN1_INTEGER_to_BN(privkey, dsa->priv_key)) {

-        DSAerr(DSA_F_DSA_PRIV_DECODE, DSA_R_BN_ERROR);
+        ERR_raise(ERR_LIB_DSA, DSA_R_BN_ERROR);

         goto dsaerr;
     }
     /* Calculate public key */
     if ((dsa->pub_key = BN_new()) == NULL) {
         goto dsaerr;
     }
     /* Calculate public key */
     if ((dsa->pub_key = BN_new()) == NULL) {

-        DSAerr(DSA_F_DSA_PRIV_DECODE, ERR_R_MALLOC_FAILURE);
+        ERR_raise(ERR_LIB_DSA, ERR_R_MALLOC_FAILURE);

         goto dsaerr;
     }
     if ((ctx = BN_CTX_new()) == NULL) {
         goto dsaerr;
     }
     if ((ctx = BN_CTX_new()) == NULL) {

-        DSAerr(DSA_F_DSA_PRIV_DECODE, ERR_R_MALLOC_FAILURE);
+        ERR_raise(ERR_LIB_DSA, ERR_R_MALLOC_FAILURE);

         goto dsaerr;
     }
 
     BN_set_flags(dsa->priv_key, BN_FLG_CONSTTIME);
     if (!BN_mod_exp(dsa->pub_key, dsa->params.g, dsa->priv_key, dsa->params.p,
                     ctx)) {
         goto dsaerr;
     }
 
     BN_set_flags(dsa->priv_key, BN_FLG_CONSTTIME);
     if (!BN_mod_exp(dsa->pub_key, dsa->params.g, dsa->priv_key, dsa->params.p,
                     ctx)) {

-        DSAerr(DSA_F_DSA_PRIV_DECODE, DSA_R_BN_ERROR);
+        ERR_raise(ERR_LIB_DSA, DSA_R_BN_ERROR);

         goto dsaerr;
     }
 
         goto dsaerr;
     }
 


@@ -206,7 +206,7 @@ static int dsa_priv_decode(EVP_PKEY *pkey, const PKCS8_PRIV_KEY_INFO *p8)
     goto done;
 
  decerr:
     goto done;
 
  decerr:

-    DSAerr(DSA_F_DSA_PRIV_DECODE, DSA_R_DECODE_ERROR);
+    ERR_raise(ERR_LIB_DSA, DSA_R_DECODE_ERROR);

  dsaerr:
     DSA_free(dsa);
  done:
  dsaerr:
     DSA_free(dsa);
  done:


@@ -223,20 +223,20 @@ static int dsa_priv_encode(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pkey)
     int dplen;
 
     if (pkey->pkey.dsa  == NULL|| pkey->pkey.dsa->priv_key == NULL) {
     int dplen;
 
     if (pkey->pkey.dsa  == NULL|| pkey->pkey.dsa->priv_key == NULL) {

-        DSAerr(DSA_F_DSA_PRIV_ENCODE, DSA_R_MISSING_PARAMETERS);
+        ERR_raise(ERR_LIB_DSA, DSA_R_MISSING_PARAMETERS);

         goto err;
     }
 
     params = ASN1_STRING_new();
 
     if (params == NULL) {
         goto err;
     }
 
     params = ASN1_STRING_new();
 
     if (params == NULL) {

-        DSAerr(DSA_F_DSA_PRIV_ENCODE, ERR_R_MALLOC_FAILURE);
+        ERR_raise(ERR_LIB_DSA, ERR_R_MALLOC_FAILURE);

         goto err;
     }
 
     params->length = i2d_DSAparams(pkey->pkey.dsa, &params->data);
     if (params->length <= 0) {
         goto err;
     }
 
     params->length = i2d_DSAparams(pkey->pkey.dsa, &params->data);
     if (params->length <= 0) {

-        DSAerr(DSA_F_DSA_PRIV_ENCODE, ERR_R_MALLOC_FAILURE);
+        ERR_raise(ERR_LIB_DSA, ERR_R_MALLOC_FAILURE);

         goto err;
     }
     params->type = V_ASN1_SEQUENCE;
         goto err;
     }
     params->type = V_ASN1_SEQUENCE;


@@ -245,7 +245,7 @@ static int dsa_priv_encode(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pkey)
     prkey = BN_to_ASN1_INTEGER(pkey->pkey.dsa->priv_key, NULL);
 
     if (prkey == NULL) {
     prkey = BN_to_ASN1_INTEGER(pkey->pkey.dsa->priv_key, NULL);
 
     if (prkey == NULL) {

-        DSAerr(DSA_F_DSA_PRIV_ENCODE, DSA_R_BN_ERROR);
+        ERR_raise(ERR_LIB_DSA, DSA_R_BN_ERROR);

         goto err;
     }
 
         goto err;
     }
 


@@ -411,7 +411,7 @@ static int old_dsa_priv_decode(EVP_PKEY *pkey,
     DSA *dsa;
 
     if ((dsa = d2i_DSAPrivateKey(NULL, pder, derlen)) == NULL) {
     DSA *dsa;
 
     if ((dsa = d2i_DSAPrivateKey(NULL, pder, derlen)) == NULL) {

-        DSAerr(DSA_F_OLD_DSA_PRIV_DECODE, ERR_R_DSA_LIB);
+        ERR_raise(ERR_LIB_DSA, ERR_R_DSA_LIB);

         return 0;
     }
     dsa->dirty_cnt++;
         return 0;
     }
     dsa->dirty_cnt++;