PR: 1830

Submitted By: Robin Seggelmann <seggelmann@fh-muenster.de>, Steve Henson

Support for RFC5705 key extractor.

1 files changed, 23 insertions, 0 deletions

diff --git a/ssl/t1_enc.c b/ssl/t1_enc.c
index 5446bb250d..3614b8a30e 100644
--- a/ssl/t1_enc.c
+++ b/ssl/t1_enc.c
@@ -1071,3 +1071,26 @@ int tls1_alert_code(int code)
 		}
 	}
 
+int SSL_tls1_key_exporter(SSL *s, unsigned char *label, int label_len,
+                           unsigned char *context, int context_len,
+                           unsigned char *out, int olen)
+	{
+	unsigned char *tmp;
+	int rv;
+
+	tmp = OPENSSL_malloc(olen);
+
+	if (!tmp)
+		return 0;
+	
+	rv = tls1_PRF(s->s3->tmp.new_cipher->algorithm2,
+			 label, label_len,
+			 s->s3->client_random,SSL3_RANDOM_SIZE,
+			 s->s3->server_random,SSL3_RANDOM_SIZE,
+			 context, context_len, NULL, 0,
+			 s->session->master_key, s->session->master_key_length,
+			 out, tmp, olen);
+
+	OPENSSL_free(tmp);
+	return rv;
+	}