Use correct function ID in error path

This fixes "make update".

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>

diff --git a/engines/e_dasync.c b/engines/e_dasync.c
index 1f5cc0215ba3511564bc8413e7d7822aa34e0ced..0e10f6dfdd4840f60b40410d36117b826f139475 100644 (file)
--- a/engines/e_dasync.c
+++ b/engines/e_dasync.c
@@ -674,7 +674,7 @@ static int dasync_cipher_init_key_helper(EVP_CIPHER_CTX *ctx,
         pipe_ctx->inner_cipher_data = OPENSSL_zalloc(
             EVP_CIPHER_impl_ctx_size(cipher));
         if (pipe_ctx->inner_cipher_data == NULL) {
-            DASYNCerr(DASYNC_F_DASYNC_AES128_INIT_KEY,
+            DASYNCerr(DASYNC_F_DASYNC_CIPHER_INIT_KEY_HELPER,
                         ERR_R_MALLOC_FAILURE);
             return 0;
         }

diff --git a/engines/e_dasync_err.c b/engines/e_dasync_err.c
index ed5e98ee3f2c1fad72efb2909069fc5bd92631ef..3b462ba851296e3e9ef4d8d35552518b310a29ae 100644 (file)
--- a/engines/e_dasync_err.c
+++ b/engines/e_dasync_err.c
@@ -75,6 +75,8 @@ static ERR_STRING_DATA DASYNC_str_functs[] = {
      "dasync_aes128_cbc_hmac_sha1_init_key"},
     {ERR_FUNC(DASYNC_F_DASYNC_AES128_INIT_KEY), "dasync_aes128_init_key"},
     {ERR_FUNC(DASYNC_F_DASYNC_BN_MOD_EXP), "DASYNC_BN_MOD_EXP"},
+    {ERR_FUNC(DASYNC_F_DASYNC_CIPHER_INIT_KEY_HELPER),
+     "dasync_cipher_init_key_helper"},
     {ERR_FUNC(DASYNC_F_DASYNC_MOD_EXP), "DASYNC_MOD_EXP"},
     {ERR_FUNC(DASYNC_F_DASYNC_PRIVATE_DECRYPT), "DASYNC_PRIVATE_DECRYPT"},
     {ERR_FUNC(DASYNC_F_DASYNC_PRIVATE_ENCRYPT), "DASYNC_PRIVATE_ENCRYPT"},

diff --git a/engines/e_dasync_err.h b/engines/e_dasync_err.h
index 560f163a6f5defa327d49060237178ffb043c491..304eeef5e99b298b8cefa21be870dcedd4c36cc6 100644 (file)
--- a/engines/e_dasync_err.h
+++ b/engines/e_dasync_err.h
@@ -67,7 +67,7 @@ extern "C" {
 static void ERR_load_DASYNC_strings(void);
 static void ERR_unload_DASYNC_strings(void);
 static void ERR_DASYNC_error(int function, int reason, char *file, int line);
-#define DASYNCerr(f,r) ERR_DASYNC_error((f),(r),OPENSSL_FILE,OPENSSL_LINE)
+# define DASYNCerr(f,r) ERR_DASYNC_error((f),(r),OPENSSL_FILE,OPENSSL_LINE)
 
 /* Error codes for the DASYNC functions. */
 
@@ -77,6 +77,7 @@ static void ERR_DASYNC_error(int function, int reason, char *file, int line);
 # define DASYNC_F_DASYNC_AES128_CBC_HMAC_SHA1_INIT_KEY    109
 # define DASYNC_F_DASYNC_AES128_INIT_KEY                  108
 # define DASYNC_F_DASYNC_BN_MOD_EXP                       101
+# define DASYNC_F_DASYNC_CIPHER_INIT_KEY_HELPER           110
 # define DASYNC_F_DASYNC_MOD_EXP                          102
 # define DASYNC_F_DASYNC_PRIVATE_DECRYPT                  103
 # define DASYNC_F_DASYNC_PRIVATE_ENCRYPT                  104