diff options
| author | Trevor Perrin <unsafe@trevp.net> | 2013-09-13 18:31:48 -0700 |
|---|---|---|
| committer | Ben Laurie <ben@links.org> | 2013-09-16 17:28:57 +0100 |
| commit | 92acab0b6a540fb2990ced45815f56072ef66d20 (patch) | |
| tree | 63dfb35e09e4dd9e94445d51c5a3445c03b32ed9 /ssl | |
| parent | 4dc836773e042806235bd724acc711f0cb9b049b (diff) | |
Redo deletion of some serverinfo code that supplemental data code mistakenly reinstated.
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/ssl_rsa.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/ssl/ssl_rsa.c b/ssl/ssl_rsa.c index 41878776ec..b6765a30e1 100644 --- a/ssl/ssl_rsa.c +++ b/ssl/ssl_rsa.c @@ -459,15 +459,6 @@ static int ssl_set_cert(CERT *c, X509 *x) X509_free(c->pkeys[i].x509); CRYPTO_add(&x->references,1,CRYPTO_LOCK_X509); c->pkeys[i].x509=x; -#ifndef OPENSSL_NO_TLSEXT - /* Free the old serverinfo data, if it exists. */ - if (c->pkeys[i].serverinfo != NULL) - { - OPENSSL_free(c->pkeys[i].serverinfo); - c->pkeys[i].serverinfo = NULL; - c->pkeys[i].serverinfo_length = 0; - } -#endif c->key= &(c->pkeys[i]); c->valid=0; |