summaryrefslogtreecommitdiff
path: root/src/lib/libssl/t1_enc.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libssl/t1_enc.c')
-rw-r--r--src/lib/libssl/t1_enc.c19
1 files changed, 1 insertions, 18 deletions
diff --git a/src/lib/libssl/t1_enc.c b/src/lib/libssl/t1_enc.c
index 3f93bcecf5..642c210900 100644
--- a/src/lib/libssl/t1_enc.c
+++ b/src/lib/libssl/t1_enc.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: t1_enc.c,v 1.139 2021/04/25 13:15:22 jsing Exp $ */ 1/* $OpenBSD: t1_enc.c,v 1.140 2021/04/30 19:26: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 *
@@ -466,23 +466,6 @@ tls1_setup_key_block(SSL *s)
466} 466}
467 467
468int 468int
469tls1_generate_master_secret(SSL *s, unsigned char *out, unsigned char *p,
470 int len)
471{
472 if (len < 0)
473 return 0;
474
475 if (!tls1_PRF(s, p, len,
476 TLS_MD_MASTER_SECRET_CONST, TLS_MD_MASTER_SECRET_CONST_SIZE,
477 s->s3->client_random, SSL3_RANDOM_SIZE, NULL, 0,
478 s->s3->server_random, SSL3_RANDOM_SIZE, NULL, 0,
479 s->session->master_key, SSL_MAX_MASTER_KEY_LENGTH))
480 return 0;
481
482 return (SSL_MAX_MASTER_KEY_LENGTH);
483}
484
485int
486tls1_export_keying_material(SSL *s, unsigned char *out, size_t olen, 469tls1_export_keying_material(SSL *s, unsigned char *out, size_t olen,
487 const char *label, size_t llen, const unsigned char *context, 470 const char *label, size_t llen, const unsigned char *context,
488 size_t contextlen, int use_context) 471 size_t contextlen, int use_context)