[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  46ddbcf2b4d6b7fd014cc40db578a5c3ed657149 (commit)
      from  6e8ac5087061350a5a98ddc24dad6ceef9baf991 (commit)


- Log -----------------------------------------------------------------
commit 46ddbcf2b4d6b7fd014cc40db578a5c3ed657149
Author: Matt Caswell <matt at openssl.org>
Date:   Sun Nov 22 00:01:55 2015 +0000

    Fix a rebase error
    
    During rebasing of the async changes some error codes ended up being
    duplicated so that "make errors" fails. This removes the duplication.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Stephen Henson <steve at openssl.org>

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

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

diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h
index cf0c7e1..14b8f6d 100644
--- a/include/openssl/ssl.h
+++ b/include/openssl/ssl.h
@@ -2033,7 +2033,7 @@ void ERR_load_SSL_strings(void);
 # define SSL_F_SSL3_SETUP_WRITE_BUFFER                    291
 # define SSL_F_SSL3_WRITE_BYTES                           158
 # define SSL_F_SSL3_WRITE_PENDING                         159
-# define SSL_F_SSL_ACCEPT                                 351
+# define SSL_F_SSL_ACCEPT                                 390
 # define SSL_F_SSL_ADD_CERT_CHAIN                         316
 # define SSL_F_SSL_ADD_CERT_TO_BUF                        319
 # define SSL_F_SSL_ADD_CLIENTHELLO_RENEGOTIATE_EXT        298
@@ -2124,7 +2124,7 @@ void ERR_load_SSL_strings(void);
 # define SSL_F_SSL_SET_WFD                                196
 # define SSL_F_SSL_SHUTDOWN                               224
 # define SSL_F_SSL_SRP_CTX_INIT                           313
-# define SSL_F_SSL_START_ASYNC_JOB                        388
+# define SSL_F_SSL_START_ASYNC_JOB                        389
 # define SSL_F_SSL_UNDEFINED_CONST_FUNCTION               243
 # define SSL_F_SSL_UNDEFINED_FUNCTION                     197
 # define SSL_F_SSL_UNDEFINED_VOID_FUNCTION                244