diff options
| author | David Benjamin <davidben@chromium.org> | 2014-12-11 09:46:01 +0300 |
|---|---|---|
| committer | Adam Langley <agl@google.com> | 2014-12-14 01:38:27 +0300 |
| commit | e99e912bea854910c56301985afc3e72dcfe0404 (patch) | |
| tree | f937c6fc72697ce4995515d76160b9c744ce11ab /ssl/d1_clnt.c | |
| parent | ceb6f2880feb600ff76604db6deae15dc2e93899 (diff) | |
Pull SSL3_ENC_METHOD out of SSL_METHOD.
SSL3_ENC_METHOD will remain version-specific while SSL_METHOD will become
protocol-specific. This finally removes all the version-specific portions of
SSL_METHOD but the version tag itself.
(SSL3_ENC_METHOD's version-specific bits themselves can probably be handled by
tracking a canonicalized protocol version. It would simplify version
comparisons anyway. The one catch is SSLv3 has a very different table. But
that's a cleanup for future. Then again, perhaps a version-specific method
table swap somewhere will be useful later for TLS 1.3.)
Much of this commit was generated with sed invocation:
s/method->ssl3_enc/enc_method/g
Change-Id: I2b192507876aadd4f9310240687e562e56e6c0b1
Reviewed-on: https://boringssl-review.googlesource.com/2581
Reviewed-by: Adam Langley <agl@google.com>
Diffstat (limited to 'ssl/d1_clnt.c')
| -rw-r--r-- | ssl/d1_clnt.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ssl/d1_clnt.c b/ssl/d1_clnt.c index c787167a..55b6aca2 100644 --- a/ssl/d1_clnt.c +++ b/ssl/d1_clnt.c @@ -376,13 +376,13 @@ int dtls1_connect(SSL *s) s->init_num=0; s->session->cipher=s->s3->tmp.new_cipher; - if (!s->method->ssl3_enc->setup_key_block(s)) + if (!s->enc_method->setup_key_block(s)) { ret= -1; goto end; } - if (!s->method->ssl3_enc->change_cipher_state(s, + if (!s->enc_method->change_cipher_state(s, SSL3_CHANGE_CIPHER_CLIENT_WRITE)) { ret= -1; @@ -398,8 +398,8 @@ int dtls1_connect(SSL *s) dtls1_start_timer(s); ret=ssl3_send_finished(s, SSL3_ST_CW_FINISHED_A,SSL3_ST_CW_FINISHED_B, - s->method->ssl3_enc->client_finished_label, - s->method->ssl3_enc->client_finished_label_len); + s->enc_method->client_finished_label, + s->enc_method->client_finished_label_len); if (ret <= 0) goto end; s->state=SSL3_ST_CW_FLUSH; |