From: Ben Laurie <ben@openssl.org>
Date: Tue, 13 Dec 2011 14:35:12 +0000 (+0000)
Subject: Remove redundant TLS exporter.
X-Git-Tag: OpenSSL_1_0_1-beta1~33
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=96fe35e7d420add39f572304b7b8bf175f7528fb;p=oweals%2Fopenssl.git

Remove redundant TLS exporter.
---

diff --git a/ssl/ssl.h b/ssl/ssl.h
index 2b57b1f909..a46d833a4c 100644
--- a/ssl/ssl.h
+++ b/ssl/ssl.h
@@ -2019,11 +2019,6 @@ int SSL_set_session_ticket_ext_cb(SSL *s, tls_session_ticket_ext_cb_fn cb,
 /* Pre-shared secret session resumption functions */
 int SSL_set_session_secret_cb(SSL *s, tls_session_secret_cb_fn tls_session_secret_cb, void *arg);
 
-int SSL_tls1_key_exporter(SSL *s,
-			  const unsigned char *label, int label_len,
-			  const unsigned char *context, int context_len,
-			  unsigned char *out, int olen);
-
 void SSL_set_debug(SSL *s, int debug);
 int SSL_cache_hit(SSL *s);
 	
diff --git a/ssl/t1_enc.c b/ssl/t1_enc.c
index 97e501ec83..f32393c56b 100644
--- a/ssl/t1_enc.c
+++ b/ssl/t1_enc.c
@@ -1249,36 +1249,3 @@ int tls1_alert_code(int code)
 	default:			return(-1);
 		}
 	}
-
-int SSL_tls1_key_exporter(SSL *s,
-			  const unsigned char *label, int label_len,
-			  const unsigned char *context, int context_len,
-			  unsigned char *out, int olen)
-	{
-	unsigned char *tmp;
-	int rv;
-	unsigned char context_len_16[2];
-
-	if (context_len > 0xffff)
-		return 0;
-
-	tmp = OPENSSL_malloc(olen);
-
-	if (!tmp)
-		return 0;
-
-	context_len_16[0] = context_len >> 8;
-	context_len_16[1] = context_len;
-	
-	rv = tls1_PRF(ssl_get_algorithm2(s),
-			 label, label_len,
-			 s->s3->client_random,SSL3_RANDOM_SIZE,
-			 s->s3->server_random,SSL3_RANDOM_SIZE,
-			 context_len_16, sizeof(context_len_16),
-			 context, context_len,
-			 s->session->master_key, s->session->master_key_length,
-			 out, tmp, olen);
-
-	OPENSSL_free(tmp);
-	return rv;
-	}