diff options
author | jsing <> | 2015-09-11 18:08:21 +0000 |
---|---|---|
committer | jsing <> | 2015-09-11 18:08:21 +0000 |
commit | c42e261f37ac3f2934dd92296a095be3cbe461c1 (patch) | |
tree | 378accab3864084b0135769f8d9117e86df41845 /src/lib/libssl/d1_srvr.c | |
parent | 63eec788b454a03bda0826cf41f02edb6771089c (diff) | |
download | openbsd-c42e261f37ac3f2934dd92296a095be3cbe461c1.tar.gz openbsd-c42e261f37ac3f2934dd92296a095be3cbe461c1.tar.bz2 openbsd-c42e261f37ac3f2934dd92296a095be3cbe461c1.zip |
Rename functions that moved to t1_enc.c, with a tls1_ prefix instead of a
ssl3_ prefix.
ok beck@
Diffstat (limited to 'src/lib/libssl/d1_srvr.c')
-rw-r--r-- | src/lib/libssl/d1_srvr.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/libssl/d1_srvr.c b/src/lib/libssl/d1_srvr.c index 66f79c3953..c0489adfa4 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.57 2015/09/11 16:28:37 jsing Exp $ */ | 1 | /* $OpenBSD: d1_srvr.c,v 1.58 2015/09/11 18:08:21 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. |
@@ -249,7 +249,7 @@ dtls1_accept(SSL *s) | |||
249 | goto end; | 249 | goto end; |
250 | } | 250 | } |
251 | 251 | ||
252 | if (!ssl3_init_finished_mac(s)) { | 252 | if (!tls1_init_finished_mac(s)) { |
253 | ret = -1; | 253 | ret = -1; |
254 | goto end; | 254 | goto end; |
255 | } | 255 | } |
@@ -278,7 +278,7 @@ dtls1_accept(SSL *s) | |||
278 | s->state = SSL3_ST_SW_FLUSH; | 278 | s->state = SSL3_ST_SW_FLUSH; |
279 | s->init_num = 0; | 279 | s->init_num = 0; |
280 | 280 | ||
281 | if (!ssl3_init_finished_mac(s)) { | 281 | if (!tls1_init_finished_mac(s)) { |
282 | ret = -1; | 282 | ret = -1; |
283 | goto end; | 283 | goto end; |
284 | } | 284 | } |
@@ -335,7 +335,7 @@ dtls1_accept(SSL *s) | |||
335 | s->s3->tmp.next_state = SSL3_ST_SR_CLNT_HELLO_A; | 335 | s->s3->tmp.next_state = SSL3_ST_SR_CLNT_HELLO_A; |
336 | 336 | ||
337 | /* HelloVerifyRequest resets Finished MAC */ | 337 | /* HelloVerifyRequest resets Finished MAC */ |
338 | if (!ssl3_init_finished_mac(s)) { | 338 | if (!tls1_init_finished_mac(s)) { |
339 | ret = -1; | 339 | ret = -1; |
340 | goto end; | 340 | goto end; |
341 | } | 341 | } |
@@ -602,7 +602,7 @@ dtls1_accept(SSL *s) | |||
602 | 602 | ||
603 | case SSL_ST_OK: | 603 | case SSL_ST_OK: |
604 | /* clean a few things up */ | 604 | /* clean a few things up */ |
605 | ssl3_cleanup_key_block(s); | 605 | tls1_cleanup_key_block(s); |
606 | 606 | ||
607 | /* remove buffering on output */ | 607 | /* remove buffering on output */ |
608 | ssl_free_wbio_buffer(s); | 608 | ssl_free_wbio_buffer(s); |