Commit be0477a8 authored by Emilia Kasper's avatar Emilia Kasper
Browse files

RT 3060: amend patch 



Use existing error code SSL_R_RECORD_TOO_SMALL for too many empty records.

For ease of backporting the patch to release branches.

Reviewed-by: default avatarBodo Moeller <bodo@openssl.org>
parent bc46db60

ssl/s3_pkt.c

+1 −1
Original line number Diff line number Diff line
@@ -574,7 +574,7 @@ printf("\n"); 
		if (empty_record_count > MAX_EMPTY_RECORDS)

			{

			al=SSL_AD_UNEXPECTED_MESSAGE;

			SSLerr(SSL_F_SSL3_GET_RECORD,SSL_R_TOO_MANY_EMPTY_FRAGMENTS);

			SSLerr(SSL_F_SSL3_GET_RECORD,SSL_R_RECORD_TOO_SMALL);

			goto f_err;

			}

		goto again;

ssl/ssl.h

+0 −1
Original line number Diff line number Diff line
@@ -3072,7 +3072,6 @@ void ERR_load_SSL_strings(void); 
#define SSL_R_TLS_INVALID_ECPOINTFORMAT_LIST		 157

#define SSL_R_TLS_PEER_DID_NOT_RESPOND_WITH_CERTIFICATE_LIST 233

#define SSL_R_TLS_RSA_ENCRYPTED_VALUE_LENGTH_IS_WRONG	 234

#define SSL_R_TOO_MANY_EMPTY_FRAGMENTS			 393

#define SSL_R_TRIED_TO_USE_UNSUPPORTED_CIPHER		 235

#define SSL_R_UNABLE_TO_DECODE_DH_CERTS			 236

#define SSL_R_UNABLE_TO_DECODE_ECDH_CERTS		 313

ssl/ssl_err.c

+0 −1
Original line number Diff line number Diff line
@@ -581,7 +581,6 @@ static ERR_STRING_DATA SSL_str_reasons[]= 
{ERR_REASON(SSL_R_TLS_INVALID_ECPOINTFORMAT_LIST),"tls invalid ecpointformat list"},

{ERR_REASON(SSL_R_TLS_PEER_DID_NOT_RESPOND_WITH_CERTIFICATE_LIST),"tls peer did not respond with certificate list"},

{ERR_REASON(SSL_R_TLS_RSA_ENCRYPTED_VALUE_LENGTH_IS_WRONG),"tls rsa encrypted value length is wrong"},

{ERR_REASON(SSL_R_TOO_MANY_EMPTY_FRAGMENTS),"too many empty fragments"},

{ERR_REASON(SSL_R_TRIED_TO_USE_UNSUPPORTED_CIPHER),"tried to use unsupported cipher"},

{ERR_REASON(SSL_R_UNABLE_TO_DECODE_DH_CERTS),"unable to decode dh certs"},

{ERR_REASON(SSL_R_UNABLE_TO_DECODE_ECDH_CERTS),"unable to decode ecdh certs"},