summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/dh
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libcrypto/dh')
-rw-r--r--src/lib/libcrypto/dh/dh.h9
-rw-r--r--src/lib/libcrypto/dh/dh_depr.c4
2 files changed, 6 insertions, 7 deletions
diff --git a/src/lib/libcrypto/dh/dh.h b/src/lib/libcrypto/dh/dh.h
index 7b226a70c8..402ef6e17b 100644
--- a/src/lib/libcrypto/dh/dh.h
+++ b/src/lib/libcrypto/dh/dh.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: dh.h,v 1.35 2022/07/12 14:42:49 kn Exp $ */ 1/* $OpenBSD: dh.h,v 1.36 2023/04/09 19:10:23 tb 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 *
@@ -162,11 +162,12 @@ void DH_set_flags(DH *dh, int flags);
162long DH_get_length(const DH *dh); 162long DH_get_length(const DH *dh);
163int DH_set_length(DH *dh, long length); 163int DH_set_length(DH *dh, long length);
164 164
165/* Deprecated version */ 165/*
166#ifndef OPENSSL_NO_DEPRECATED 166 * Wrapped in OPENSSL_NO_DEPRECATED in 0.9.8, added to rust-openssl in 2020,
167 * for "advanced DH support".
168 */
167DH * DH_generate_parameters(int prime_len,int generator, 169DH * DH_generate_parameters(int prime_len,int generator,
168 void (*callback)(int,int,void *),void *cb_arg); 170 void (*callback)(int,int,void *),void *cb_arg);
169#endif /* !defined(OPENSSL_NO_DEPRECATED) */
170 171
171/* New version */ 172/* New version */
172int DH_generate_parameters_ex(DH *dh, int prime_len,int generator, BN_GENCB *cb); 173int DH_generate_parameters_ex(DH *dh, int prime_len,int generator, BN_GENCB *cb);
diff --git a/src/lib/libcrypto/dh/dh_depr.c b/src/lib/libcrypto/dh/dh_depr.c
index 3c4804a133..b8a3dd2ff7 100644
--- a/src/lib/libcrypto/dh/dh_depr.c
+++ b/src/lib/libcrypto/dh/dh_depr.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: dh_depr.c,v 1.8 2022/11/26 16:08:51 tb Exp $ */ 1/* $OpenBSD: dh_depr.c,v 1.9 2023/04/09 19:10:23 tb Exp $ */
2/* ==================================================================== 2/* ====================================================================
3 * Copyright (c) 1998-2002 The OpenSSL Project. All rights reserved. 3 * Copyright (c) 1998-2002 The OpenSSL Project. All rights reserved.
4 * 4 *
@@ -64,7 +64,6 @@
64 64
65#include "bn_local.h" 65#include "bn_local.h"
66 66
67#ifndef OPENSSL_NO_DEPRECATED
68DH * 67DH *
69DH_generate_parameters(int prime_len, int generator, 68DH_generate_parameters(int prime_len, int generator,
70 void (*callback)(int, int, void *), void *cb_arg) 69 void (*callback)(int, int, void *), void *cb_arg)
@@ -82,4 +81,3 @@ DH_generate_parameters(int prime_len, int generator,
82 DH_free(ret); 81 DH_free(ret);
83 return NULL; 82 return NULL;
84} 83}
85#endif