mischief/openbsd-src
1
0
Fork 0
mirror of https://github.com/openbsd/src.git synced 2025-01-10 06:47:55 -08:00
Code

revert "Move struct ssl_handshake_tls13_st definition", i.e., move

Browse Source 
SSL_HANDSHAKE_TLS13 back to ssl_locl.h.

discussed with jsing and inoguchi
This commit is contained in:
tb 2019-02-25 19:40:05 +00:00
parent 1911097321
commit 696c451cf6
2 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/libssl/ssl_locl.h
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssl_locl.h,v 1.237 2019/02/25 14:36:25 inoguchi Exp $ */
/* $OpenBSD: ssl_locl.h,v 1.238 2019/02/25 19:40:05 tb Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@ -434,6 +434,29 @@ typedef struct ssl_handshake_st {
uint32_t extensions_seen;
} SSL_HANDSHAKE;
typedef struct ssl_handshake_tls13_st {
uint16_t min_version;
uint16_t max_version;
uint16_t version;
/* Version proposed by peer server. */
uint16_t server_version;
/* X25519 key share. */
uint8_t *x25519_public;
uint8_t *x25519_private;
uint8_t *x25519_peer_public;
struct tls13_secrets *secrets;
uint8_t *cookie;
size_t cookie_len;
/* Preserved transcript hash. */
uint8_t transcript_hash[EVP_MAX_MD_SIZE];
size_t transcript_hash_len;
} SSL_HANDSHAKE_TLS13;
typedef struct ssl_ctx_internal_st {
uint16_t min_version;
uint16_t max_version;

25
lib/libssl/tls13_internal.h
View File

@ -1,4 +1,4 @@
/* $OpenBSD: tls13_internal.h,v 1.22 2019/02/25 16:46:17 jsing Exp $ */
/* $OpenBSD: tls13_internal.h,v 1.23 2019/02/25 19:40:05 tb Exp $ */
/*
* Copyright (c) 2018 Bob Beck <beck@openbsd.org>
* Copyright (c) 2018 Theo Buehler <tb@openbsd.org>
@ -149,28 +149,7 @@ struct tls13_handshake_stage {
uint8_t message_number;
};
typedef struct ssl_handshake_tls13_st {
uint16_t min_version;
uint16_t max_version;
uint16_t version;
/* Version proposed by peer server. */
uint16_t server_version;
/* X25519 key share. */
uint8_t *x25519_public;
uint8_t *x25519_private;
uint8_t *x25519_peer_public;
struct tls13_secrets *secrets;
uint8_t *cookie;
size_t cookie_len;
/* Preserved transcript hash. */
uint8_t transcript_hash[EVP_MAX_MD_SIZE];
size_t transcript_hash_len;
} SSL_HANDSHAKE_TLS13;
typedef struct ssl_handshake_tls13_st SSL_HANDSHAKE_TLS13;
struct tls13_ctx {
SSL *ssl;