summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authortb <>2020-09-01 17:30:45 +0000
committertb <>2020-09-01 17:30:45 +0000
commitffbcd0732f74e90e2d18b4addc2b7b9f0c6d79de (patch)
tree893e4156534f34e12801490896150022ec2cbad1 /src/lib
parenta528105b51540c5edf59368d36bf78b914cd2899 (diff)
downloadopenbsd-ffbcd0732f74e90e2d18b4addc2b7b9f0c6d79de.tar.gz
openbsd-ffbcd0732f74e90e2d18b4addc2b7b9f0c6d79de.tar.bz2
openbsd-ffbcd0732f74e90e2d18b4addc2b7b9f0c6d79de.zip
In the explanatory comment of ssl_get_prev_session fix the spelling of
the function name, document alert and make it fit into 80 columns.
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/libssl/ssl_sess.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/lib/libssl/ssl_sess.c b/src/lib/libssl/ssl_sess.c
index 327164da25..be00c8a6ad 100644
--- a/src/lib/libssl/ssl_sess.c
+++ b/src/lib/libssl/ssl_sess.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl_sess.c,v 1.93 2020/09/01 17:25:17 tb Exp $ */ 1/* $OpenBSD: ssl_sess.c,v 1.94 2020/09/01 17:30:45 tb Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -492,13 +492,14 @@ ssl_session_by_id(SSL *s, CBS *session_id)
492} 492}
493 493
494/* 494/*
495 * ssl_get_prev attempts to find an SSL_SESSION to be used to resume this 495 * ssl_get_prev_session attempts to find an SSL_SESSION to be used to resume
496 * connection. It is only called by servers. 496 * this connection. It is only called by servers.
497 * 497 *
498 * session_id: points at the session ID in the ClientHello. This code will 498 * session_id: points at the session ID in the ClientHello. This code will
499 * read past the end of this in order to parse out the session ticket 499 * read past the end of this in order to parse out the session ticket
500 * extension, if any. 500 * extension, if any.
501 * ext_block: a CBS for the ClientHello extensions block. 501 * ext_block: a CBS for the ClientHello extensions block.
502 * alert: alert that the caller should send in case of failure.
502 * 503 *
503 * Returns: 504 * Returns:
504 * -1: error 505 * -1: error
@@ -508,8 +509,8 @@ ssl_session_by_id(SSL *s, CBS *session_id)
508 * - If a session is found then s->session is pointed at it (after freeing 509 * - If a session is found then s->session is pointed at it (after freeing
509 * an existing session if need be) and s->verify_result is set from the 510 * an existing session if need be) and s->verify_result is set from the
510 * session. 511 * session.
511 * - Both for new and resumed sessions, s->internal->tlsext_ticket_expected is set 512 * - For both new and resumed sessions, s->internal->tlsext_ticket_expected
512 * to 1 if the server should issue a new session ticket (to 0 otherwise). 513 * indicates whether the server should issue a new session ticket or not.
513 */ 514 */
514int 515int
515ssl_get_prev_session(SSL *s, CBS *session_id, CBS *ext_block, int *alert) 516ssl_get_prev_session(SSL *s, CBS *session_id, CBS *ext_block, int *alert)