diff options
| author | jsing <> | 2018-11-05 03:49:44 +0000 |
|---|---|---|
| committer | jsing <> | 2018-11-05 03:49:44 +0000 |
| commit | 4248d53deb162850abf1ed3e2cb99d6bd43824f2 (patch) | |
| tree | c72465402f2125bfc4bcab84c889fd61159a09aa /src/lib/libssl/ssl_cert.c | |
| parent | 0eead559f4aeef152329f93615c200f626c3ed44 (diff) | |
| download | openbsd-4248d53deb162850abf1ed3e2cb99d6bd43824f2.tar.gz openbsd-4248d53deb162850abf1ed3e2cb99d6bd43824f2.tar.bz2 openbsd-4248d53deb162850abf1ed3e2cb99d6bd43824f2.zip | |
Mop up ecdh_tmp, since it is no longer used.
ok bluhm@ tb@
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libssl/ssl_cert.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/src/lib/libssl/ssl_cert.c b/src/lib/libssl/ssl_cert.c index a01f484578..567d8ea21f 100644 --- a/src/lib/libssl/ssl_cert.c +++ b/src/lib/libssl/ssl_cert.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ssl_cert.c,v 1.67 2018/04/25 07:10:39 tb Exp $ */ | 1 | /* $OpenBSD: ssl_cert.c,v 1.68 2018/11/05 03:49:44 jsing Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -234,14 +234,6 @@ ssl_cert_dup(CERT *cert) | |||
| 234 | ret->dh_tmp_cb = cert->dh_tmp_cb; | 234 | ret->dh_tmp_cb = cert->dh_tmp_cb; |
| 235 | ret->dh_tmp_auto = cert->dh_tmp_auto; | 235 | ret->dh_tmp_auto = cert->dh_tmp_auto; |
| 236 | 236 | ||
| 237 | if (cert->ecdh_tmp) { | ||
| 238 | ret->ecdh_tmp = EC_KEY_dup(cert->ecdh_tmp); | ||
| 239 | if (ret->ecdh_tmp == NULL) { | ||
| 240 | SSLerrorx(ERR_R_EC_LIB); | ||
| 241 | goto err; | ||
| 242 | } | ||
| 243 | } | ||
| 244 | |||
| 245 | for (i = 0; i < SSL_PKEY_NUM; i++) { | 237 | for (i = 0; i < SSL_PKEY_NUM; i++) { |
| 246 | if (cert->pkeys[i].x509 != NULL) { | 238 | if (cert->pkeys[i].x509 != NULL) { |
| 247 | ret->pkeys[i].x509 = cert->pkeys[i].x509; | 239 | ret->pkeys[i].x509 = cert->pkeys[i].x509; |
| @@ -297,7 +289,6 @@ ssl_cert_dup(CERT *cert) | |||
| 297 | 289 | ||
| 298 | err: | 290 | err: |
| 299 | DH_free(ret->dh_tmp); | 291 | DH_free(ret->dh_tmp); |
| 300 | EC_KEY_free(ret->ecdh_tmp); | ||
| 301 | 292 | ||
| 302 | for (i = 0; i < SSL_PKEY_NUM; i++) { | 293 | for (i = 0; i < SSL_PKEY_NUM; i++) { |
| 303 | X509_free(ret->pkeys[i].x509); | 294 | X509_free(ret->pkeys[i].x509); |
| @@ -321,7 +312,6 @@ ssl_cert_free(CERT *c) | |||
| 321 | return; | 312 | return; |
| 322 | 313 | ||
| 323 | DH_free(c->dh_tmp); | 314 | DH_free(c->dh_tmp); |
| 324 | EC_KEY_free(c->ecdh_tmp); | ||
| 325 | 315 | ||
| 326 | for (i = 0; i < SSL_PKEY_NUM; i++) { | 316 | for (i = 0; i < SSL_PKEY_NUM; i++) { |
| 327 | X509_free(c->pkeys[i].x509); | 317 | X509_free(c->pkeys[i].x509); |
