[openssl-commits] [openssl] master update

[Kurt Roeckx]

The branch master has been updated
       via  7e999d5101d7f59ecdb4ddd12ff910ff92c6ac3a (commit)
      from  4ee7d3f94590d3766c28eed03b969f338ddf96dc (commit)


- Log -----------------------------------------------------------------
commit 7e999d5101d7f59ecdb4ddd12ff910ff92c6ac3a
Author: Kurt Roeckx <kurt at roeckx.be>
Date:   Thu Feb 23 23:10:01 2017 +0100

    Fix duplicate error codes
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    GH: #2732

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

Summary of changes:
 include/openssl/ssl.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h
index b85ccc5..40c58c5 100644
--- a/include/openssl/ssl.h
+++ b/include/openssl/ssl.h
@@ -2244,10 +2244,10 @@ int ERR_load_SSL_strings(void);
 # define SSL_F_SSL_PARSE_SERVERHELLO_USE_SRTP_EXT         311
 # define SSL_F_SSL_PEEK                                   270
 # define SSL_F_SSL_PEEK_EX                                432
-# define SSL_F_SSL_PEEK_INTERNAL                          521
+# define SSL_F_SSL_PEEK_INTERNAL                          522
 # define SSL_F_SSL_READ                                   223
 # define SSL_F_SSL_READ_EX                                434
-# define SSL_F_SSL_READ_INTERNAL                          519
+# define SSL_F_SSL_READ_INTERNAL                          523
 # define SSL_F_SSL_RENEGOTIATE                            516
 # define SSL_F_SSL_SCAN_CLIENTHELLO_TLSEXT                320
 # define SSL_F_SSL_SCAN_SERVERHELLO_TLSEXT                321
@@ -2286,7 +2286,7 @@ int ERR_load_SSL_strings(void);
 # define SSL_F_SSL_VERIFY_CERT_CHAIN                      207
 # define SSL_F_SSL_WRITE                                  208
 # define SSL_F_SSL_WRITE_EX                               433
-# define SSL_F_SSL_WRITE_INTERNAL                         520
+# define SSL_F_SSL_WRITE_INTERNAL                         524
 # define SSL_F_STATE_MACHINE                              353
 # define SSL_F_TLS12_CHECK_PEER_SIGALG                    333
 # define SSL_F_TLS13_CHANGE_CIPHER_STATE                  440