diff options
Diffstat (limited to 'src/lib/libssl/ssl_locl.h')
-rw-r--r-- | src/lib/libssl/ssl_locl.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h index a9cab69ee0..c55dada70f 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.338 2021/04/25 13:15:22 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_locl.h,v 1.339 2021/04/30 19:26:44 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 | * |
@@ -1379,8 +1379,6 @@ int tls1_PRF(SSL *s, const unsigned char *secret, size_t secret_len, | |||
1379 | void tls1_cleanup_key_block(SSL *s); | 1379 | void tls1_cleanup_key_block(SSL *s); |
1380 | int tls1_change_cipher_state(SSL *s, int which); | 1380 | int tls1_change_cipher_state(SSL *s, int which); |
1381 | int tls1_setup_key_block(SSL *s); | 1381 | int tls1_setup_key_block(SSL *s); |
1382 | int tls1_generate_master_secret(SSL *s, unsigned char *out, | ||
1383 | unsigned char *p, int len); | ||
1384 | int tls1_export_keying_material(SSL *s, unsigned char *out, size_t olen, | 1382 | int tls1_export_keying_material(SSL *s, unsigned char *out, size_t olen, |
1385 | const char *label, size_t llen, const unsigned char *p, size_t plen, | 1383 | const char *label, size_t llen, const unsigned char *p, size_t plen, |
1386 | int use_context); | 1384 | int use_context); |
@@ -1389,6 +1387,8 @@ int ssl_ok(SSL *s); | |||
1389 | 1387 | ||
1390 | int tls12_derive_finished(SSL *s); | 1388 | int tls12_derive_finished(SSL *s); |
1391 | int tls12_derive_peer_finished(SSL *s); | 1389 | int tls12_derive_peer_finished(SSL *s); |
1390 | int tls12_derive_master_secret(SSL *s, uint8_t *premaster_secret, | ||
1391 | size_t premaster_secret_len); | ||
1392 | 1392 | ||
1393 | int ssl_using_ecc_cipher(SSL *s); | 1393 | int ssl_using_ecc_cipher(SSL *s); |
1394 | int ssl_check_srvr_ecc_cert_and_alg(X509 *x, SSL *s); | 1394 | int ssl_check_srvr_ecc_cert_and_alg(X509 *x, SSL *s); |