From: Dr. Stephen Henson <steve@openssl.org>
Date: Wed, 18 Sep 2013 00:02:35 +0000 (+0100)
Subject: Fix error code clashes.
X-Git-Tag: master-post-reformat~1170
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=96006022671b4db342a4dcfc3d96edbb3337bb4e;p=oweals%2Fopenssl.git

Fix error code clashes.
---

diff --git a/ssl/ssl.h b/ssl/ssl.h
index fdcacb972e..a5d6ed096c 100644
--- a/ssl/ssl.h
+++ b/ssl/ssl.h
@@ -2731,14 +2731,14 @@ void ERR_load_SSL_strings(void);
 #define SSL_F_TLS1_CHECK_SERVERHELLO_TLSEXT		 274
 #define SSL_F_TLS1_ENC					 210
 #define SSL_F_TLS1_EXPORT_KEYING_MATERIAL		 314
+#define SSL_F_TLS1_GET_CLIENT_SUPPLEMENTAL_DATA		 338
 #define SSL_F_TLS1_GET_SERVER_SUPPLEMENTAL_DATA		 326
-#define SSL_F_TLS1_GET_CLIENT_SUPPLEMENTAL_DATA		 336
 #define SSL_F_TLS1_HEARTBEAT				 315
 #define SSL_F_TLS1_PREPARE_CLIENTHELLO_TLSEXT		 275
 #define SSL_F_TLS1_PREPARE_SERVERHELLO_TLSEXT		 276
 #define SSL_F_TLS1_PRF					 284
+#define SSL_F_TLS1_SEND_CLIENT_SUPPLEMENTAL_DATA	 339
 #define SSL_F_TLS1_SEND_SERVER_SUPPLEMENTAL_DATA	 327
-#define SSL_F_TLS1_SEND_CLIENT_SUPPLEMENTAL_DATA	 333
 #define SSL_F_TLS1_SETUP_KEY_BLOCK			 211
 #define SSL_F_WRITE_PENDING				 212
 
diff --git a/ssl/ssl_err.c b/ssl/ssl_err.c
index 607c364e73..d295f43b47 100644
--- a/ssl/ssl_err.c
+++ b/ssl/ssl_err.c
@@ -292,14 +292,14 @@ static ERR_STRING_DATA SSL_str_functs[]=
 {ERR_FUNC(SSL_F_TLS1_CHECK_SERVERHELLO_TLSEXT),	"TLS1_CHECK_SERVERHELLO_TLSEXT"},
 {ERR_FUNC(SSL_F_TLS1_ENC),	"tls1_enc"},
 {ERR_FUNC(SSL_F_TLS1_EXPORT_KEYING_MATERIAL),	"tls1_export_keying_material"},
-{ERR_FUNC(SSL_F_TLS1_GET_SERVER_SUPPLEMENTAL_DATA),	"tls1_get_server_supplemental_data"},
 {ERR_FUNC(SSL_F_TLS1_GET_CLIENT_SUPPLEMENTAL_DATA),	"tls1_get_client_supplemental_data"},
+{ERR_FUNC(SSL_F_TLS1_GET_SERVER_SUPPLEMENTAL_DATA),	"tls1_get_server_supplemental_data"},
 {ERR_FUNC(SSL_F_TLS1_HEARTBEAT),	"tls1_heartbeat"},
 {ERR_FUNC(SSL_F_TLS1_PREPARE_CLIENTHELLO_TLSEXT),	"TLS1_PREPARE_CLIENTHELLO_TLSEXT"},
 {ERR_FUNC(SSL_F_TLS1_PREPARE_SERVERHELLO_TLSEXT),	"TLS1_PREPARE_SERVERHELLO_TLSEXT"},
 {ERR_FUNC(SSL_F_TLS1_PRF),	"tls1_prf"},
-{ERR_FUNC(SSL_F_TLS1_SEND_SERVER_SUPPLEMENTAL_DATA),	"tls1_send_server_supplemental_data"},
 {ERR_FUNC(SSL_F_TLS1_SEND_CLIENT_SUPPLEMENTAL_DATA),	"tls1_send_client_supplemental_data"},
+{ERR_FUNC(SSL_F_TLS1_SEND_SERVER_SUPPLEMENTAL_DATA),	"tls1_send_server_supplemental_data"},
 {ERR_FUNC(SSL_F_TLS1_SETUP_KEY_BLOCK),	"tls1_setup_key_block"},
 {ERR_FUNC(SSL_F_WRITE_PENDING),	"WRITE_PENDING"},
 {0,NULL}