diff options
| author |   beck <beck@openbsd.org> | 2019-01-23 18:24:40 +0000 |
|---|---|---|
| committer | beck <beck@openbsd.org> | 2019-01-23 18:24:40 +0000 |
| commit | 174eabd668f4b74e79dba920baae32fa1a58847c (patch) | |
| tree | 20ed8a8882c1feb5f9b1b110a83c8b9d8061628e /lib/libssl/ssl_locl.h | |
| parent | Modify sigalgs extension processing for TLS 1.3. (diff) | |
| download | wireguard-openbsd-174eabd668f4b74e79dba920baae32fa1a58847c.tar.xz wireguard-openbsd-174eabd668f4b74e79dba920baae32fa1a58847c.zip | |
revert previous, accidentally contained another diff in addition
to the one I intended to commit
Diffstat (limited to 'lib/libssl/ssl_locl.h')
| -rw-r--r-- | lib/libssl/ssl_locl.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/lib/libssl/ssl_locl.h b/lib/libssl/ssl_locl.h index e4b1341db5a..7fd155648c3 100644 --- a/lib/libssl/ssl_locl.h +++ b/lib/libssl/ssl_locl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_locl.h,v 1.229 2019/01/23 16:46:04 beck Exp $ */ +/* $OpenBSD: ssl_locl.h,v 1.230 2019/01/23 18:24:40 beck Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -429,9 +429,6 @@ typedef struct ssl_handshake_st { /* key_block is the record-layer key block for TLS 1.2 and earlier. */ int key_block_len; unsigned char *key_block; - - /* Extensions seen in this handshake. */ - uint32_t extensions_seen; } SSL_HANDSHAKE; typedef struct ssl_handshake_tls13_st { @@ -448,9 +445,6 @@ typedef struct ssl_handshake_tls13_st { uint8_t *x25519_peer_public; struct tls13_secrets *secrets; - - uint8_t *cookie; - size_t cookie_len; } SSL_HANDSHAKE_TLS13; typedef struct ssl_ctx_internal_st { @@ -1319,7 +1313,7 @@ int tls1_process_ticket(SSL *s, const unsigned char *session_id, int session_id_len, CBS *ext_block, SSL_SESSION **ret); long ssl_get_algorithm2(SSL *s); -int tls1_process_sigalgs(SSL *s, CBS *cbs, uint16_t *, size_t); +int tls1_process_sigalgs(SSL *s, CBS *cbs); int tls1_check_ec_server_key(SSL *s); |