diff options
Diffstat (limited to 'src/lib/libssl/d1_srvr.c')
| -rw-r--r-- | src/lib/libssl/d1_srvr.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/libssl/d1_srvr.c b/src/lib/libssl/d1_srvr.c index 1be0e4b596..f36d3f40cd 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.80 2017/01/26 05:31:25 jsing Exp $ */ | 1 | /* $OpenBSD: d1_srvr.c,v 1.81 2017/01/26 06:32:58 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. |
| @@ -522,9 +522,9 @@ dtls1_accept(SSL *s) | |||
| 522 | 522 | ||
| 523 | /* We need to get hashes here so if there is | 523 | /* We need to get hashes here so if there is |
| 524 | * a client cert, it can be verified */ | 524 | * a client cert, it can be verified */ |
| 525 | s->method->internal->ssl3_enc->cert_verify_mac(s, | 525 | tls1_cert_verify_mac(s, |
| 526 | NID_md5, &(S3I(s)->tmp.cert_verify_md[0])); | 526 | NID_md5, &(S3I(s)->tmp.cert_verify_md[0])); |
| 527 | s->method->internal->ssl3_enc->cert_verify_mac(s, | 527 | tls1_cert_verify_mac(s, |
| 528 | NID_sha1, | 528 | NID_sha1, |
| 529 | &(S3I(s)->tmp.cert_verify_md[MD5_DIGEST_LENGTH])); | 529 | &(S3I(s)->tmp.cert_verify_md[MD5_DIGEST_LENGTH])); |
| 530 | } | 530 | } |
| @@ -582,7 +582,7 @@ dtls1_accept(SSL *s) | |||
| 582 | case SSL3_ST_SW_CHANGE_B: | 582 | case SSL3_ST_SW_CHANGE_B: |
| 583 | 583 | ||
| 584 | s->session->cipher = S3I(s)->tmp.new_cipher; | 584 | s->session->cipher = S3I(s)->tmp.new_cipher; |
| 585 | if (!s->method->internal->ssl3_enc->setup_key_block(s)) { | 585 | if (!tls1_setup_key_block(s)) { |
| 586 | ret = -1; | 586 | ret = -1; |
| 587 | goto end; | 587 | goto end; |
| 588 | } | 588 | } |
| @@ -597,7 +597,7 @@ dtls1_accept(SSL *s) | |||
| 597 | s->internal->state = SSL3_ST_SW_FINISHED_A; | 597 | s->internal->state = SSL3_ST_SW_FINISHED_A; |
| 598 | s->internal->init_num = 0; | 598 | s->internal->init_num = 0; |
| 599 | 599 | ||
| 600 | if (!s->method->internal->ssl3_enc->change_cipher_state(s, | 600 | if (!tls1_change_cipher_state(s, |
| 601 | SSL3_CHANGE_CIPHER_SERVER_WRITE)) { | 601 | SSL3_CHANGE_CIPHER_SERVER_WRITE)) { |
| 602 | ret = -1; | 602 | ret = -1; |
| 603 | goto end; | 603 | goto end; |
| @@ -610,8 +610,8 @@ dtls1_accept(SSL *s) | |||
| 610 | case SSL3_ST_SW_FINISHED_B: | 610 | case SSL3_ST_SW_FINISHED_B: |
| 611 | ret = ssl3_send_finished(s, | 611 | ret = ssl3_send_finished(s, |
| 612 | SSL3_ST_SW_FINISHED_A, SSL3_ST_SW_FINISHED_B, | 612 | SSL3_ST_SW_FINISHED_A, SSL3_ST_SW_FINISHED_B, |
| 613 | s->method->internal->ssl3_enc->server_finished_label, | 613 | TLS_MD_SERVER_FINISH_CONST, |
| 614 | s->method->internal->ssl3_enc->server_finished_label_len); | 614 | TLS_MD_SERVER_FINISH_CONST_SIZE); |
| 615 | if (ret <= 0) | 615 | if (ret <= 0) |
| 616 | goto end; | 616 | goto end; |
| 617 | s->internal->state = SSL3_ST_SW_FLUSH; | 617 | s->internal->state = SSL3_ST_SW_FLUSH; |
