summaryrefslogtreecommitdiff
path: root/src/lib/libssl/d1_srvr.c
diff options
context:
space:
mode:
authorbeck <>2017-01-26 12:16:13 +0000
committerbeck <>2017-01-26 12:16:13 +0000
commit5ae189b08474853c519a12e66db1c17cfc3c9c8f (patch)
treeb95866f4795db86411300333c648e4ce8e941899 /src/lib/libssl/d1_srvr.c
parent10f32610e82e44521c0094ae91acbca090d36a58 (diff)
downloadopenbsd-5ae189b08474853c519a12e66db1c17cfc3c9c8f.tar.gz
openbsd-5ae189b08474853c519a12e66db1c17cfc3c9c8f.tar.bz2
openbsd-5ae189b08474853c519a12e66db1c17cfc3c9c8f.zip
Finish the fallout of the SSLerr->SSLerror cleanup to get rid of the ugly
line wraps that resulted
Diffstat (limited to 'src/lib/libssl/d1_srvr.c')
-rw-r--r--src/lib/libssl/d1_srvr.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/lib/libssl/d1_srvr.c b/src/lib/libssl/d1_srvr.c
index 80d7d639c3..fa860b8d5a 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.82 2017/01/26 10:40:21 beck Exp $ */ 1/* $OpenBSD: d1_srvr.c,v 1.83 2017/01/26 12:16:13 beck 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.
@@ -506,8 +506,7 @@ dtls1_accept(SSL *s)
506 * at this point and digest cached records. 506 * at this point and digest cached records.
507 */ 507 */
508 if (!S3I(s)->handshake_buffer) { 508 if (!S3I(s)->handshake_buffer) {
509 SSLerror( 509 SSLerror(ERR_R_INTERNAL_ERROR);
510 ERR_R_INTERNAL_ERROR);
511 ret = -1; 510 ret = -1;
512 goto end; 511 goto end;
513 } 512 }
@@ -706,8 +705,7 @@ dtls1_send_hello_verify_request(SSL *s)
706 if (s->ctx->internal->app_gen_cookie_cb == NULL || 705 if (s->ctx->internal->app_gen_cookie_cb == NULL ||
707 s->ctx->internal->app_gen_cookie_cb(s, 706 s->ctx->internal->app_gen_cookie_cb(s,
708 D1I(s)->cookie, &(D1I(s)->cookie_len)) == 0) { 707 D1I(s)->cookie, &(D1I(s)->cookie_len)) == 0) {
709 SSLerror( 708 SSLerror(ERR_R_INTERNAL_ERROR);
710 ERR_R_INTERNAL_ERROR);
711 return 0; 709 return 0;
712 } 710 }
713 711