diff options
| author | tb <> | 2023-11-29 21:35:57 +0000 |
|---|---|---|
| committer | tb <> | 2023-11-29 21:35:57 +0000 |
| commit | fc4faac9b396d551d0f7729a4dffa6ee31ac2d3e (patch) | |
| tree | 545e6a340462469cf3c04b8bfe5d2a0f9f885ddb /src/lib/libcrypto/dh | |
| parent | 0423d363b45d6891ba1e59c1ae770ef1443bf41c (diff) | |
| download | openbsd-fc4faac9b396d551d0f7729a4dffa6ee31ac2d3e.tar.gz openbsd-fc4faac9b396d551d0f7729a4dffa6ee31ac2d3e.tar.bz2 openbsd-fc4faac9b396d551d0f7729a4dffa6ee31ac2d3e.zip | |
Ignore ENGINE at the API boundary
This removes the remaining ENGINE members from various internal structs
and functions. Any ENGINE passed into a public API is now completely
ignored functions returning an ENGINE always return NULL.
ok jsing
Diffstat (limited to 'src/lib/libcrypto/dh')
| -rw-r--r-- | src/lib/libcrypto/dh/dh_lib.c | 4 | ||||
| -rw-r--r-- | src/lib/libcrypto/dh/dh_local.h | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/lib/libcrypto/dh/dh_lib.c b/src/lib/libcrypto/dh/dh_lib.c index 90ce7625c6..d8698859f0 100644 --- a/src/lib/libcrypto/dh/dh_lib.c +++ b/src/lib/libcrypto/dh/dh_lib.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: dh_lib.c,v 1.42 2023/11/19 15:46:09 tb Exp $ */ | 1 | /* $OpenBSD: dh_lib.c,v 1.43 2023/11/29 21:35:57 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 | * |
| @@ -230,7 +230,7 @@ LCRYPTO_ALIAS(DH_security_bits); | |||
| 230 | ENGINE * | 230 | ENGINE * |
| 231 | DH_get0_engine(DH *dh) | 231 | DH_get0_engine(DH *dh) |
| 232 | { | 232 | { |
| 233 | return dh->engine; | 233 | return NULL; |
| 234 | } | 234 | } |
| 235 | LCRYPTO_ALIAS(DH_get0_engine); | 235 | LCRYPTO_ALIAS(DH_get0_engine); |
| 236 | 236 | ||
diff --git a/src/lib/libcrypto/dh/dh_local.h b/src/lib/libcrypto/dh/dh_local.h index 928f2c0c8b..22e2256906 100644 --- a/src/lib/libcrypto/dh/dh_local.h +++ b/src/lib/libcrypto/dh/dh_local.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: dh_local.h,v 1.3 2022/01/14 08:25:44 tb Exp $ */ | 1 | /* $OpenBSD: dh_local.h,v 1.4 2023/11/29 21:35:57 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 | * |
| @@ -100,7 +100,6 @@ struct dh_st { | |||
| 100 | int references; | 100 | int references; |
| 101 | CRYPTO_EX_DATA ex_data; | 101 | CRYPTO_EX_DATA ex_data; |
| 102 | const DH_METHOD *meth; | 102 | const DH_METHOD *meth; |
| 103 | ENGINE *engine; | ||
| 104 | }; | 103 | }; |
| 105 | 104 | ||
| 106 | /* | 105 | /* |
