[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  de7058241083e9ec80c4ad27e7bb4f2bd79e36f2 (commit)
      from  ac722c9af058661671f8e63972eb52e2bf9de378 (commit)


- Log -----------------------------------------------------------------
commit de7058241083e9ec80c4ad27e7bb4f2bd79e36f2
Author: FdaSilvaYY <fdasilvayy at gmail.com>
Date:   Mon Mar 14 21:46:54 2016 +0100

    Fix error code
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Rich Salz <rsalz 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 3088889..6984a1f 100644
--- a/crypto/ex_data.c
+++ b/crypto/ex_data.c
@@ -153,7 +153,7 @@ static EX_CALLBACKS *get_and_lock(int class_index)
     EX_CALLBACKS *ip;
 
     if (class_index < 0 || class_index >= CRYPTO_EX_INDEX__COUNT) {
-        CRYPTOerr(CRYPTO_F_GET_AND_LOCK, ERR_R_MALLOC_FAILURE);
+        CRYPTOerr(CRYPTO_F_GET_AND_LOCK, ERR_R_PASSED_INVALID_ARGUMENT);
         return NULL;
     }