diff options
| author | tb <> | 2024-01-13 11:55:31 +0000 |
|---|---|---|
| committer | tb <> | 2024-01-13 11:55:31 +0000 |
| commit | 5b5b63091409c538b39fa94900b1f0871adea0be (patch) | |
| tree | d123a927b79b922142d67475805b96d646e0ae32 /src/lib/libcrypto/objects/obj_dat.c | |
| parent | 3599ee1569abc65ae01fb33aaf6f4050d72b9dc6 (diff) | |
| download | openbsd-5b5b63091409c538b39fa94900b1f0871adea0be.tar.gz openbsd-5b5b63091409c538b39fa94900b1f0871adea0be.tar.bz2 openbsd-5b5b63091409c538b39fa94900b1f0871adea0be.zip | |
Garbage collect check_defer()
This was a mechanism to ensure that OBJ_cleanup() doesn't remove the
ASN1_OBJECT associated with a custom cipher or digest (that was added
with EVP_add_{cipher,digest}(), while the latter is still referenced
in the OBJ_NAME table.
It had the effect that OBJ_cleanup() wasn't actually called ever from
OPENSSL_cleanup() (it is only called if you load the OID conf module).
Oh, and of course it was once part of the public API. I fixed that two
years ago, almost exactly to the day. Still mentioned in OBJ_create.3.
Diffstat (limited to 'src/lib/libcrypto/objects/obj_dat.c')
| -rw-r--r-- | src/lib/libcrypto/objects/obj_dat.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/lib/libcrypto/objects/obj_dat.c b/src/lib/libcrypto/objects/obj_dat.c index e72598ef61..be80420702 100644 --- a/src/lib/libcrypto/objects/obj_dat.c +++ b/src/lib/libcrypto/objects/obj_dat.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: obj_dat.c,v 1.82 2023/12/15 01:51:23 tb Exp $ */ | 1 | /* $OpenBSD: obj_dat.c,v 1.83 2024/01/13 11:55:31 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 | * |
| @@ -191,13 +191,6 @@ static IMPLEMENT_LHASH_DOALL_FN(cleanup3, ADDED_OBJ) | |||
| 191 | int obj_cleanup_defer = 0; | 191 | int obj_cleanup_defer = 0; |
| 192 | 192 | ||
| 193 | void | 193 | void |
| 194 | check_defer(int nid) | ||
| 195 | { | ||
| 196 | if (!obj_cleanup_defer && nid >= NUM_NID) | ||
| 197 | obj_cleanup_defer = 1; | ||
| 198 | } | ||
| 199 | |||
| 200 | void | ||
| 201 | OBJ_cleanup(void) | 194 | OBJ_cleanup(void) |
| 202 | { | 195 | { |
| 203 | if (obj_cleanup_defer) { | 196 | if (obj_cleanup_defer) { |
