diff options
| author | jsing <> | 2017-10-08 16:24:02 +0000 |
|---|---|---|
| committer | jsing <> | 2017-10-08 16:24:02 +0000 |
| commit | ba9ebd2e46ba795dd4f082910e89df705f1e264b (patch) | |
| tree | 3353b68b503515d359d87d0e023b6b9bc1e1453c /src/lib/libssl/d1_srvr.c | |
| parent | 7819e9da1462ce9c60996aaf73ca0c06f0a2424b (diff) | |
| download | openbsd-ba9ebd2e46ba795dd4f082910e89df705f1e264b.tar.gz openbsd-ba9ebd2e46ba795dd4f082910e89df705f1e264b.tar.bz2 openbsd-ba9ebd2e46ba795dd4f082910e89df705f1e264b.zip | |
Convert ssl3_send_change_cipher_spec() to use CBB and make it handle DTLS,
which allows us to drop dtls1_send_change_cipher_spec() entirely.
ok inoguchi@
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libssl/d1_srvr.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/lib/libssl/d1_srvr.c b/src/lib/libssl/d1_srvr.c index ae90ee2093..f0e59a8e00 100644 --- a/src/lib/libssl/d1_srvr.c +++ b/src/lib/libssl/d1_srvr.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: d1_srvr.c,v 1.88 2017/05/07 04:22:24 beck Exp $ */ | 1 | /* $OpenBSD: d1_srvr.c,v 1.89 2017/10/08 16:24:02 jsing Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * DTLS implementation written by Nagendra Modadugu | 3 | * DTLS implementation written by Nagendra Modadugu |
| 4 | * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. | 4 | * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. |
| @@ -596,9 +596,8 @@ dtls1_accept(SSL *s) | |||
| 596 | goto end; | 596 | goto end; |
| 597 | } | 597 | } |
| 598 | 598 | ||
| 599 | ret = dtls1_send_change_cipher_spec(s, | 599 | ret = ssl3_send_change_cipher_spec(s, |
| 600 | SSL3_ST_SW_CHANGE_A, SSL3_ST_SW_CHANGE_B); | 600 | SSL3_ST_SW_CHANGE_A, SSL3_ST_SW_CHANGE_B); |
| 601 | |||
| 602 | if (ret <= 0) | 601 | if (ret <= 0) |
| 603 | goto end; | 602 | goto end; |
| 604 | 603 | ||
