summaryrefslogtreecommitdiff
path: root/src/lib/libssl/ssl_cert.c
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/lib/libssl/ssl_cert.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/libssl/ssl_cert.c b/src/lib/libssl/ssl_cert.c
index faa9886b90..173e217c8f 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.90 2022/01/07 15:56:33 jsing Exp $ */ 1/* $OpenBSD: ssl_cert.c,v 1.91 2022/01/07 16:45:06 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 *
@@ -195,15 +195,15 @@ ssl_cert_dup(CERT *cert)
195 ret->mask_k = cert->mask_k; 195 ret->mask_k = cert->mask_k;
196 ret->mask_a = cert->mask_a; 196 ret->mask_a = cert->mask_a;
197 197
198 if (cert->dh_tmp != NULL) { 198 if (cert->dhe_params != NULL) {
199 ret->dh_tmp = DHparams_dup(cert->dh_tmp); 199 ret->dhe_params = DHparams_dup(cert->dhe_params);
200 if (ret->dh_tmp == NULL) { 200 if (ret->dhe_params == NULL) {
201 SSLerrorx(ERR_R_DH_LIB); 201 SSLerrorx(ERR_R_DH_LIB);
202 goto err; 202 goto err;
203 } 203 }
204 } 204 }
205 ret->dh_tmp_cb = cert->dh_tmp_cb; 205 ret->dhe_params_cb = cert->dhe_params_cb;
206 ret->dh_tmp_auto = cert->dh_tmp_auto; 206 ret->dhe_params_auto = cert->dhe_params_auto;
207 207
208 for (i = 0; i < SSL_PKEY_NUM; i++) { 208 for (i = 0; i < SSL_PKEY_NUM; i++) {
209 if (cert->pkeys[i].x509 != NULL) { 209 if (cert->pkeys[i].x509 != NULL) {
@@ -256,7 +256,7 @@ ssl_cert_dup(CERT *cert)
256 return (ret); 256 return (ret);
257 257
258 err: 258 err:
259 DH_free(ret->dh_tmp); 259 DH_free(ret->dhe_params);
260 260
261 for (i = 0; i < SSL_PKEY_NUM; i++) { 261 for (i = 0; i < SSL_PKEY_NUM; i++) {
262 X509_free(ret->pkeys[i].x509); 262 X509_free(ret->pkeys[i].x509);
@@ -280,7 +280,7 @@ ssl_cert_free(CERT *c)
280 if (i > 0) 280 if (i > 0)
281 return; 281 return;
282 282
283 DH_free(c->dh_tmp); 283 DH_free(c->dhe_params);
284 284
285 for (i = 0; i < SSL_PKEY_NUM; i++) { 285 for (i = 0; i < SSL_PKEY_NUM; i++) {
286 X509_free(c->pkeys[i].x509); 286 X509_free(c->pkeys[i].x509);