diff options
author | Ben Laurie <ben@openssl.org> | 2011-12-13 15:57:39 +0000 |
---|---|---|
committer | Ben Laurie <ben@openssl.org> | 2011-12-13 15:57:39 +0000 |
commit | 3c0ff9f93930e9b32bf1205958013bd8a41150bf (patch) | |
tree | 575a381342784a75acf42ada7dd9ea7b37bac5ca /ssl/t1_enc.c | |
parent | b9ef708e408ebd6ebb248d679efe416c46fb3f51 (diff) | |
download | openssl-3c0ff9f93930e9b32bf1205958013bd8a41150bf.zip openssl-3c0ff9f93930e9b32bf1205958013bd8a41150bf.tar.gz openssl-3c0ff9f93930e9b32bf1205958013bd8a41150bf.tar.bz2 |
Remove redundant TLS exporter.
Diffstat (limited to 'ssl/t1_enc.c')
-rw-r--r-- | ssl/t1_enc.c | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/ssl/t1_enc.c b/ssl/t1_enc.c index 1c6fe5d..5c1074e 100644 --- a/ssl/t1_enc.c +++ b/ssl/t1_enc.c @@ -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; - } |