[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  8eb33e4f088bd12f16afddb06d6a1692373a539e (commit)
      from  52c14c5454c75c4ec3d7929b3119e44f9844ab39 (commit)


- Log -----------------------------------------------------------------
commit 8eb33e4f088bd12f16afddb06d6a1692373a539e
Author: Todd Short <tshort at akamai.com>
Date:   Tue Mar 8 14:27:23 2016 -0500

    Fix SSL_CIPHER_get_auth_nid return
    
    Copy/paste error between SSL_CIPHER_get_kx_nid() and
    SSL_CIPHER_get_auth_nid(), wrong table was referenced
    
    Signed-off-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>

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

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

diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
index 352bab9..6f2d970 100644
--- a/ssl/ssl_ciph.c
+++ b/ssl/ssl_ciph.c
@@ -2052,7 +2052,7 @@ int SSL_CIPHER_get_auth_nid(const SSL_CIPHER *c)
 
     if (i == -1)
         return NID_undef;
-    return ssl_cipher_table_kx[i].nid;
+    return ssl_cipher_table_auth[i].nid;
 }
 
 int SSL_CIPHER_is_aead(const SSL_CIPHER *c)