kris/boringssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove old 'prepare' extensions functions.

Browse Source 
These are no-ops now.

Change-Id: Ib842d512571a06a45e52f30fe4bb8e98e9c37cf9
Reviewed-on: https://boringssl-review.googlesource.com/5481
Reviewed-by: Adam Langley <agl@google.com>
This commit is contained in:
David Benjamin 2015-07-21 21:06:39 -04:00 committed by Adam Langley
parent 422fe08672
commit 821464e45f
4 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ssl/internal.h
View File

@ -1077,8 +1077,6 @@ uint8_t *ssl_add_serverhello_tlsext(SSL *s, uint8_t *const buf,
uint8_t *const limit); uint8_t *const limit);
int ssl_parse_clienthello_tlsext(SSL *s, CBS *cbs); int ssl_parse_clienthello_tlsext(SSL *s, CBS *cbs);
int ssl_parse_serverhello_tlsext(SSL *s, CBS *cbs); int ssl_parse_serverhello_tlsext(SSL *s, CBS *cbs);
int ssl_prepare_clienthello_tlsext(SSL *s);
int ssl_prepare_serverhello_tlsext(SSL *s);
#define tlsext_tick_md EVP_sha256 #define tlsext_tick_md EVP_sha256

5
ssl/s3_clnt.c
View File

@ -693,11 +693,6 @@ int ssl3_send_client_hello(SSL *s) {
*(p++) = 0; /* Add the NULL method */ *(p++) = 0; /* Add the NULL method */
/* TLS extensions*/ /* TLS extensions*/
if (ssl_prepare_clienthello_tlsext(s) <= 0) {
OPENSSL_PUT_ERROR(SSL, SSL_R_CLIENTHELLO_TLSEXT);
goto err;
}
p = ssl_add_clienthello_tlsext(s, p, buf + SSL3_RT_MAX_PLAIN_LENGTH, p = ssl_add_clienthello_tlsext(s, p, buf + SSL3_RT_MAX_PLAIN_LENGTH,
p - buf); p - buf);
if (p == NULL) { if (p == NULL) {

5
ssl/s3_srvr.c
View File

@ -1207,10 +1207,7 @@ int ssl3_send_server_hello(SSL *s) {
/* put the compression method */ /* put the compression method */
*(p++) = 0; *(p++) = 0;
if (ssl_prepare_serverhello_tlsext(s) <= 0) {
OPENSSL_PUT_ERROR(SSL, SSL_R_SERVERHELLO_TLSEXT);
return -1;
}
p = ssl_add_serverhello_tlsext(s, p, buf + SSL3_RT_MAX_PLAIN_LENGTH); p = ssl_add_serverhello_tlsext(s, p, buf + SSL3_RT_MAX_PLAIN_LENGTH);
if (p == NULL) { if (p == NULL) {
OPENSSL_PUT_ERROR(SSL, ERR_R_INTERNAL_ERROR); OPENSSL_PUT_ERROR(SSL, ERR_R_INTERNAL_ERROR);

4
ssl/t1_lib.c
View File

@ -2535,10 +2535,6 @@ static int ssl_scan_serverhello_tlsext(SSL *s, CBS *cbs, int *out_alert) {
return 1; return 1;
} }
int ssl_prepare_clienthello_tlsext(SSL *s) { return 1; }
int ssl_prepare_serverhello_tlsext(SSL *s) { return 1; }
static int ssl_check_clienthello_tlsext(SSL *s) { static int ssl_check_clienthello_tlsext(SSL *s) {
int ret = SSL_TLSEXT_ERR_NOACK; int ret = SSL_TLSEXT_ERR_NOACK;
int al = SSL_AD_UNRECOGNIZED_NAME; int al = SSL_AD_UNRECOGNIZED_NAME;