[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  d485806092ec0ac583ac0cf59ce74dd1d2ece929 (commit)
      from  e8e36da67687a78919a72bf2d8dfa9e892a4f0cf (commit)


- Log -----------------------------------------------------------------
commit d485806092ec0ac583ac0cf59ce74dd1d2ece929
Author: Rich Salz <rsalz at openssl.org>
Date:   Sat Jun 4 12:28:08 2016 -0400

    Fix re-used function code
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 include/openssl/ssl.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h
index a156061..9989b7e 100644
--- a/include/openssl/ssl.h
+++ b/include/openssl/ssl.h
@@ -2049,7 +2049,7 @@ void ERR_load_SSL_strings(void);
 # define SSL_F_SSL3_GENERATE_KEY_BLOCK                    238
 # define SSL_F_SSL3_GENERATE_MASTER_SECRET                388
 # define SSL_F_SSL3_GET_RECORD                            143
-# define SSL_F_SSL3_INIT_FINISHED_MAC                     339
+# define SSL_F_SSL3_INIT_FINISHED_MAC                     397
 # define SSL_F_SSL3_OUTPUT_CERT_CHAIN                     147
 # define SSL_F_SSL3_READ_BYTES                            148
 # define SSL_F_SSL3_READ_N                                149