Commit a0f443a0 authored by Rich Salz's avatar Rich Salz
Browse files

Increase CT_NUMBER values 



Also add build-time errors to keep them in sync.
Thanks to GitHub user YuDudysheva for reporting this.

Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6874)
(cherry picked from commit b5ee5177)
parent f48e0ef1

include/openssl/ssl3.h

+8 −2
Original line number Diff line number Diff line
@@ -252,9 +252,15 @@ extern "C" { 
# define SSL3_CT_FORTEZZA_DMS                    20

/*

 * SSL3_CT_NUMBER is used to size arrays and it must be large enough to

 * contain all of the cert types defined either for SSLv3 and TLSv1.

 * contain all of the cert types defined for *either* SSLv3 and TLSv1.

 */

# define SSL3_CT_NUMBER                  9

# define SSL3_CT_NUMBER                  10



# if defined(TLS_CT_NUMBER)

#  if TLS_CT_NUMBER != SSL3_CT_NUMBER

#    error "SSL/TLS CT_NUMBER values do not match"

#  endif

# endif



# define SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS       0x0001

include/openssl/tls1.h

+7 −1
Original line number Diff line number Diff line
@@ -883,7 +883,13 @@ SSL_CTX_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB,(void (*)(void))cb) 
 * when correcting this number, correct also SSL3_CT_NUMBER in ssl3.h (see

 * comment there)

 */

# define TLS_CT_NUMBER                   9

# define TLS_CT_NUMBER                   10



# if defined(SSL3_CT_NUMBER)

#  if TLS_CT_NUMBER != SSL3_CT_NUMBER

#    error "SSL/TLS CT_NUMBER values do not match"

#  endif

# endif



# define TLS1_FINISH_MAC_LENGTH          12