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

Move Channel ID initialization out of ssl3_new.

Browse Source 
Configuration data inherited from the ctx happens in SSL_new. (This also gets
in the way of using ssl3_free/ssl3_new to implement SSL_clear.)

Change-Id: I2773af91abf4e1edc0c1a324bc1e94088d7c2274
Reviewed-on: https://boringssl-review.googlesource.com/2821
Reviewed-by: Adam Langley <agl@google.com>
This commit is contained in:
David Benjamin 2015-01-11 13:09:11 -05:00 committed by Adam Langley
parent 95e18c52f2
commit 02ddbfdf46
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ssl/s3_lib.c
View File

@ -640,12 +640,6 @@ int ssl3_new(SSL *s) {
memset(s3->wrec.seq_num, 0, sizeof(s3->wrec.seq_num));
s->s3 = s3;
s->tlsext_channel_id_enabled = s->ctx->tlsext_channel_id_enabled;
if (s->ctx->tlsext_channel_id_private) {
s->tlsext_channel_id_private =
EVP_PKEY_dup(s->ctx->tlsext_channel_id_private);
}
s->method->ssl_clear(s);
return 1;

5
ssl/ssl_lib.c
View File

@ -329,6 +329,11 @@ SSL *SSL_new(SSL_CTX *ctx) {
s->psk_client_callback = ctx->psk_client_callback;
s->psk_server_callback = ctx->psk_server_callback;
s->tlsext_channel_id_enabled = ctx->tlsext_channel_id_enabled;
if (ctx->tlsext_channel_id_private) {
s->tlsext_channel_id_private = EVP_PKEY_dup(ctx->tlsext_channel_id_private);
}
s->signed_cert_timestamps_enabled = s->ctx->signed_cert_timestamps_enabled;
s->ocsp_stapling_enabled = s->ctx->ocsp_stapling_enabled;