diff options
author | jsing <> | 2022-11-07 11:58:45 +0000 |
---|---|---|
committer | jsing <> | 2022-11-07 11:58:45 +0000 |
commit | 9b1a5502ac166e7ddd3da7c143bb65686a035ac4 (patch) | |
tree | bfa8daa6e7b625129ae066d13e602b42c3262e43 /src/lib/libssl/ssl_locl.h | |
parent | 7aa564fe60027590616687055794c45960ec44dd (diff) | |
download | openbsd-9b1a5502ac166e7ddd3da7c143bb65686a035ac4.tar.gz openbsd-9b1a5502ac166e7ddd3da7c143bb65686a035ac4.tar.bz2 openbsd-9b1a5502ac166e7ddd3da7c143bb65686a035ac4.zip |
Rewrite TLSv1.2 key exporter.
Replace the grotty TLSv1.2 key exporter with a cleaner version that uses
CBB and CBS.
ok tb@
Diffstat (limited to 'src/lib/libssl/ssl_locl.h')
-rw-r--r-- | src/lib/libssl/ssl_locl.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h index 42ae429074..64cf6a60f9 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.429 2022/10/20 15:22:51 tb Exp $ */ | 1 | /* $OpenBSD: ssl_locl.h,v 1.430 2022/11/07 11:58:45 jsing 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 | * |
@@ -1463,9 +1463,6 @@ int tls1_change_read_cipher_state(SSL *s); | |||
1463 | int tls1_change_write_cipher_state(SSL *s); | 1463 | int tls1_change_write_cipher_state(SSL *s); |
1464 | int tls1_setup_key_block(SSL *s); | 1464 | int tls1_setup_key_block(SSL *s); |
1465 | int tls1_generate_key_block(SSL *s, uint8_t *key_block, size_t key_block_len); | 1465 | int tls1_generate_key_block(SSL *s, uint8_t *key_block, size_t key_block_len); |
1466 | int tls1_export_keying_material(SSL *s, unsigned char *out, size_t olen, | ||
1467 | const char *label, size_t llen, const unsigned char *p, size_t plen, | ||
1468 | int use_context); | ||
1469 | int ssl_ok(SSL *s); | 1466 | int ssl_ok(SSL *s); |
1470 | 1467 | ||
1471 | int tls12_derive_finished(SSL *s); | 1468 | int tls12_derive_finished(SSL *s); |