Commit 3c0ff9f9 authored by Ben Laurie's avatar Ben Laurie
Browse files

Remove redundant TLS exporter.

parent b9ef708e

ssl/ssl.h

+0 −4
Original line number Diff line number Diff line
@@ -2028,10 +2028,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, unsigned char *label, int label_len,

                           unsigned char *context, int context_len,

                           unsigned char *out, int olen);



void SSL_CTX_set_not_resumable_session_callback(SSL_CTX *ctx,

	int (*cb)(SSL *ssl, int is_forward_secure));

ssl/t1_enc.c

+1 −25
Original line number Diff line number Diff line
@@ -1124,7 +1124,7 @@ int tls1_export_keying_material(SSL *s, unsigned char *out, unsigned int olen, 
         unsigned int contextlen, int use_context)

	{

	unsigned char *buff;

	unsigned char *val;

	unsigned char *val = NULL;

	unsigned int vallen, currentvalpos, rv;



#ifdef KSSL_DEBUG
@@ -1249,27 +1249,3 @@ int tls1_alert_code(int code) 
	default:			return(-1);

		}

	}
 


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(ssl_get_algorithm2(s),

			 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;

	}