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/dsa | |
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/dsa')
-rw-r--r-- | src/lib/libcrypto/dsa/dsa_lib.c | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/dsa/dsa_local.h | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/lib/libcrypto/dsa/dsa_lib.c b/src/lib/libcrypto/dsa/dsa_lib.c index 5c01c20255..65eb65288d 100644 --- a/src/lib/libcrypto/dsa/dsa_lib.c +++ b/src/lib/libcrypto/dsa/dsa_lib.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: dsa_lib.c,v 1.45 2023/11/19 15:46:09 tb Exp $ */ | 1 | /* $OpenBSD: dsa_lib.c,v 1.46 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 | * |
@@ -397,7 +397,7 @@ LCRYPTO_ALIAS(DSA_set_flags); | |||
397 | ENGINE * | 397 | ENGINE * |
398 | DSA_get0_engine(DSA *d) | 398 | DSA_get0_engine(DSA *d) |
399 | { | 399 | { |
400 | return d->engine; | 400 | return NULL; |
401 | } | 401 | } |
402 | LCRYPTO_ALIAS(DSA_get0_engine); | 402 | LCRYPTO_ALIAS(DSA_get0_engine); |
403 | 403 | ||
diff --git a/src/lib/libcrypto/dsa/dsa_local.h b/src/lib/libcrypto/dsa/dsa_local.h index a413db9747..3e688b8ce6 100644 --- a/src/lib/libcrypto/dsa/dsa_local.h +++ b/src/lib/libcrypto/dsa/dsa_local.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: dsa_local.h,v 1.2 2023/03/04 20:54:52 tb Exp $ */ | 1 | /* $OpenBSD: dsa_local.h,v 1.3 2023/11/29 21:35:57 tb Exp $ */ |
2 | /* ==================================================================== | 2 | /* ==================================================================== |
3 | * Copyright (c) 2007 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 2007 The OpenSSL Project. All rights reserved. |
4 | * | 4 | * |
@@ -106,8 +106,6 @@ struct dsa_st { | |||
106 | int references; | 106 | int references; |
107 | CRYPTO_EX_DATA ex_data; | 107 | CRYPTO_EX_DATA ex_data; |
108 | const DSA_METHOD *meth; | 108 | const DSA_METHOD *meth; |
109 | /* functional reference if 'meth' is ENGINE-provided */ | ||
110 | ENGINE *engine; | ||
111 | } /* DSA */; | 109 | } /* DSA */; |
112 | 110 | ||
113 | int dsa_builtin_paramgen(DSA *ret, size_t bits, size_t qbits, | 111 | int dsa_builtin_paramgen(DSA *ret, size_t bits, size_t qbits, |