summaryrefslogtreecommitdiff
path: root/src/lib/libssl/ssl_locl.h
diff options
context:
space:
mode:
authorbeck <>2019-01-23 18:24:40 +0000
committerbeck <>2019-01-23 18:24:40 +0000
commit03a77eef903481d4308502d32fca33a961c4bb3a (patch)
treec7932fb2fd1ea2ff0c3a210ddd7adf1eb94d4186 /src/lib/libssl/ssl_locl.h
parent811354ae1302b7cd68c86866b02f4ab4cf11322b (diff)
downloadopenbsd-03a77eef903481d4308502d32fca33a961c4bb3a.tar.gz
openbsd-03a77eef903481d4308502d32fca33a961c4bb3a.tar.bz2
openbsd-03a77eef903481d4308502d32fca33a961c4bb3a.zip
revert previous, accidentally contained another diff in addition
to the one I intended to commit
Diffstat (limited to 'src/lib/libssl/ssl_locl.h')
-rw-r--r--src/lib/libssl/ssl_locl.h10
1 files changed, 2 insertions, 8 deletions
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h
index e4b1341db5..7fd155648c 100644
--- a/src/lib/libssl/ssl_locl.h
+++ b/src/lib/libssl/ssl_locl.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl_locl.h,v 1.229 2019/01/23 16:46:04 beck Exp $ */ 1/* $OpenBSD: ssl_locl.h,v 1.230 2019/01/23 18:24:40 beck 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 *
@@ -429,9 +429,6 @@ typedef struct ssl_handshake_st {
429 /* key_block is the record-layer key block for TLS 1.2 and earlier. */ 429 /* key_block is the record-layer key block for TLS 1.2 and earlier. */
430 int key_block_len; 430 int key_block_len;
431 unsigned char *key_block; 431 unsigned char *key_block;
432
433 /* Extensions seen in this handshake. */
434 uint32_t extensions_seen;
435} SSL_HANDSHAKE; 432} SSL_HANDSHAKE;
436 433
437typedef struct ssl_handshake_tls13_st { 434typedef struct ssl_handshake_tls13_st {
@@ -448,9 +445,6 @@ typedef struct ssl_handshake_tls13_st {
448 uint8_t *x25519_peer_public; 445 uint8_t *x25519_peer_public;
449 446
450 struct tls13_secrets *secrets; 447 struct tls13_secrets *secrets;
451
452 uint8_t *cookie;
453 size_t cookie_len;
454} SSL_HANDSHAKE_TLS13; 448} SSL_HANDSHAKE_TLS13;
455 449
456typedef struct ssl_ctx_internal_st { 450typedef struct ssl_ctx_internal_st {
@@ -1319,7 +1313,7 @@ int tls1_process_ticket(SSL *s, const unsigned char *session_id,
1319 int session_id_len, CBS *ext_block, SSL_SESSION **ret); 1313 int session_id_len, CBS *ext_block, SSL_SESSION **ret);
1320 1314
1321long ssl_get_algorithm2(SSL *s); 1315long ssl_get_algorithm2(SSL *s);
1322int tls1_process_sigalgs(SSL *s, CBS *cbs, uint16_t *, size_t); 1316int tls1_process_sigalgs(SSL *s, CBS *cbs);
1323 1317
1324int tls1_check_ec_server_key(SSL *s); 1318int tls1_check_ec_server_key(SSL *s);
1325 1319