diff options
| author |   tb <tb@openbsd.org> | 2020-09-01 12:40:53 +0000 |
|---|---|---|
| committer | tb <tb@openbsd.org> | 2020-09-01 12:40:53 +0000 |
| commit | a4c79661a3826ee6a0afe7906e2001ec3c25318e (patch) | |
| tree | 9c018ab34e0dd6f6d313d1fdd8256b9e624e6448 /lib/libssl/ssl_locl.h | |
| parent | Fix build with -fno-common (default in clang 11) (diff) | |
| download | wireguard-openbsd-a4c79661a3826ee6a0afe7906e2001ec3c25318e.tar.xz wireguard-openbsd-a4c79661a3826ee6a0afe7906e2001ec3c25318e.zip | |
copy session id directly in ssl_get_prev_session
ssl_get_prev_session() hands the session id down to tls_decrypt_ticket()
which then copies it into the session pointer that it is about to return.
It's a lot simpler to retrieve the session pointer and copy the session id
inside ssl_get_prev_session().
Also, 'goto err' directly in TLS1_TICKET_NOT_DECRYPTED instead of skipping
a couple of long if clauses before doing so.
ok inoguchi jsing
Diffstat (limited to 'lib/libssl/ssl_locl.h')
| -rw-r--r-- | lib/libssl/ssl_locl.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/libssl/ssl_locl.h b/lib/libssl/ssl_locl.h index 2f8ba1fc091..bd210cdce52 100644 --- a/lib/libssl/ssl_locl.h +++ b/lib/libssl/ssl_locl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_locl.h,v 1.287 2020/09/01 05:32:11 tb Exp $ */ +/* $OpenBSD: ssl_locl.h,v 1.288 2020/09/01 12:40:53 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -1403,8 +1403,7 @@ int ssl_check_serverhello_tlsext(SSL *s); #define TLS1_TICKET_NOT_DECRYPTED 2 #define TLS1_TICKET_DECRYPTED 3 -int tls1_process_ticket(SSL *s, CBS *session_id, CBS *ext_block, - int *alert, SSL_SESSION **ret); +int tls1_process_ticket(SSL *s, CBS *ext_block, int *alert, SSL_SESSION **ret); long ssl_get_algorithm2(SSL *s); |