[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  2f781956779d64e32f3cfb0016a532de2bb6dc89 (commit)
       via  a060574458752ad1f914221be4627598efff62df (commit)
      from  bfd53c32cd840ed381ba557c4de8f21e3615655c (commit)


- Log -----------------------------------------------------------------
commit 2f781956779d64e32f3cfb0016a532de2bb6dc89
Author: Alessandro Ghedini <alessandro at ghedini.me>
Date:   Tue Mar 8 23:12:53 2016 +0000

    Use correct function ID in error path
    
    This fixes "make update".
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>

commit a060574458752ad1f914221be4627598efff62df
Author: Alessandro Ghedini <alessandro at ghedini.me>
Date:   Tue Mar 8 21:58:17 2016 +0000

    Move variable declaration to the start of the function
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 crypto/mem_dbg.c       | 3 ++-
 engines/e_dasync.c     | 2 +-
 engines/e_dasync_err.c | 2 ++
 engines/e_dasync_err.h | 3 ++-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/crypto/mem_dbg.c b/crypto/mem_dbg.c
index 36efed8..e69869d 100644
--- a/crypto/mem_dbg.c
+++ b/crypto/mem_dbg.c
@@ -284,11 +284,12 @@ int CRYPTO_mem_ctrl(int mode)
 static int mem_check_on(void)
 {
     int ret = 0;
+    CRYPTO_THREAD_ID cur;
 
     if (mh_mode & CRYPTO_MEM_CHECK_ON) {
         CRYPTO_THREAD_run_once(&memdbg_init, do_memdbg_init);
 
-        CRYPTO_THREAD_ID cur = CRYPTO_THREAD_get_current_id();
+        cur = CRYPTO_THREAD_get_current_id();
         CRYPTO_THREAD_read_lock(malloc_lock);
 
         ret = (mh_mode & CRYPTO_MEM_CHECK_ENABLE)
diff --git a/engines/e_dasync.c b/engines/e_dasync.c
index 1f5cc02..0e10f6d 100644
--- 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 ed5e98e..3b462ba 100644
--- 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 560f163..304eeef 100644
--- 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