[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  e7c8cafab8f1e35afc977e30ba7ebbae72d58387 (commit)
      from  6d505f284293b6621fc8e99e7b6d857adb06291f (commit)


- Log -----------------------------------------------------------------
commit e7c8cafab8f1e35afc977e30ba7ebbae72d58387
Author: Richard Levitte <levitte at openssl.org>
Date:   Sun Mar 13 14:54:51 2016 +0100

    Change an function macro for ERR match the function it's used in.
    
    Reviewed-by: Kurt Roeckx <kurt at openssl.org>

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

Summary of changes:
 crypto/ex_data.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/ex_data.c b/crypto/ex_data.c
index 4af0a9d..3088889 100644
--- a/crypto/ex_data.c
+++ b/crypto/ex_data.c
@@ -251,7 +251,7 @@ int CRYPTO_get_ex_new_index(int class_index, long argl, void *argp,
          * "app_data" routines use ex_data index zero.  See RT 3710. */
         if (ip->meth == NULL
             || !sk_EX_CALLBACK_push(ip->meth, NULL)) {
-            CRYPTOerr(CRYPTO_F_GET_AND_LOCK, ERR_R_MALLOC_FAILURE);
+            CRYPTOerr(CRYPTO_F_CRYPTO_GET_EX_NEW_INDEX, ERR_R_MALLOC_FAILURE);
             goto err;
         }
     }