Save 48 bytes if SSLv3 is not defined

This commit is contained in:
Manuel Pégourié-Gonnard 2014-11-04 13:05:42 +01:00
parent 615e677c0b
commit 6186019d5d
2 changed files with 13 additions and 4 deletions

View file

@ -304,6 +304,15 @@
+ SSL_PADDING_ADD \ + SSL_PADDING_ADD \
) )
/*
* Length of the verify data for secure renegotiation
*/
#if defined(POLARSSL_SSL_PROTO_SSL3)
#define SSL_VERIFY_DATA_MAX_LEN 36
#else
#define SSL_VERIFY_DATA_MAX_LEN 12
#endif
/* /*
* Signaling ciphersuite values (SCSV) * Signaling ciphersuite values (SCSV)
*/ */
@ -867,8 +876,8 @@ struct _ssl_context
secure renegotiation */ secure renegotiation */
#if defined(POLARSSL_SSL_RENEGOTIATION) #if defined(POLARSSL_SSL_RENEGOTIATION)
size_t verify_data_len; /*!< length of verify data stored */ size_t verify_data_len; /*!< length of verify data stored */
char own_verify_data[36]; /*!< previous handshake verify data */ char own_verify_data[SSL_VERIFY_DATA_MAX_LEN]; /*!< previous handshake verify data */
char peer_verify_data[36]; /*!< previous handshake verify data */ char peer_verify_data[SSL_VERIFY_DATA_MAX_LEN]; /*!< previous handshake verify data */
#endif #endif
}; };

View file

@ -3476,8 +3476,8 @@ int ssl_session_reset( ssl_context *ssl )
ssl->renego_records_seen = 0; ssl->renego_records_seen = 0;
ssl->verify_data_len = 0; ssl->verify_data_len = 0;
memset( ssl->own_verify_data, 0, 36 ); memset( ssl->own_verify_data, 0, SSL_VERIFY_DATA_MAX_LEN );
memset( ssl->peer_verify_data, 0, 36 ); memset( ssl->peer_verify_data, 0, SSL_VERIFY_DATA_MAX_LEN );
#endif #endif
ssl->secure_renegotiation = SSL_LEGACY_RENEGOTIATION; ssl->secure_renegotiation = SSL_LEGACY_RENEGOTIATION;