diff options
| author | Theo Buehler <tb@cvs.openbsd.org> | 2024-03-02 09:49:46 +0000 |
|---|---|---|
| committer | Theo Buehler <tb@cvs.openbsd.org> | 2024-03-02 09:49:46 +0000 |
| commit | 9f96ea40a9848785a42a40842cfc02c0e2bf38b6 (patch) | |
| tree | 4592ed9dfc54c7ed668501569c6a6d2dade7fcd7 | |
| parent | 4f9dcc362eb56d491f962c50f68e2469772ef26e (diff) | |
Make OBJ_add_object() static
This is another implementation detail that should never have leaked out
of the library. Only OBJ_create() ever used this.
ok jsing
| -rw-r--r-- | lib/libcrypto/Symbols.list | 1 | ||||
| -rw-r--r-- | lib/libcrypto/Symbols.namespace | 1 | ||||
| -rw-r--r-- | lib/libcrypto/hidden/openssl/objects.h | 3 | ||||
| -rw-r--r-- | lib/libcrypto/objects/obj_dat.c | 5 | ||||
| -rw-r--r-- | lib/libcrypto/objects/objects.h | 3 |
5 files changed, 4 insertions, 9 deletions
diff --git a/lib/libcrypto/Symbols.list b/lib/libcrypto/Symbols.list index ee69864df5c..11702722bcf 100644 --- a/lib/libcrypto/Symbols.list +++ b/lib/libcrypto/Symbols.list @@ -1688,7 +1688,6 @@ NOTICEREF_it NOTICEREF_new OBJ_NAME_do_all OBJ_NAME_do_all_sorted -OBJ_add_object OBJ_cleanup OBJ_cmp OBJ_create diff --git a/lib/libcrypto/Symbols.namespace b/lib/libcrypto/Symbols.namespace index b7d9e75569f..d63bb91c121 100644 --- a/lib/libcrypto/Symbols.namespace +++ b/lib/libcrypto/Symbols.namespace @@ -2409,7 +2409,6 @@ _libre_OBJ_ln2nid _libre_OBJ_sn2nid _libre_OBJ_cmp _libre_OBJ_new_nid -_libre_OBJ_add_object _libre_OBJ_create _libre_OBJ_cleanup _libre_OBJ_create_objects diff --git a/lib/libcrypto/hidden/openssl/objects.h b/lib/libcrypto/hidden/openssl/objects.h index 5b39cd8215d..c2db51a6c9f 100644 --- a/lib/libcrypto/hidden/openssl/objects.h +++ b/lib/libcrypto/hidden/openssl/objects.h @@ -1,4 +1,4 @@ -/* $OpenBSD: objects.h,v 1.4 2024/03/02 09:47:16 tb Exp $ */ +/* $OpenBSD: objects.h,v 1.5 2024/03/02 09:49:45 tb Exp $ */ /* * Copyright (c) 2023 Bob Beck <beck@openbsd.org> * @@ -39,7 +39,6 @@ LCRYPTO_USED(OBJ_ln2nid); LCRYPTO_USED(OBJ_sn2nid); LCRYPTO_USED(OBJ_cmp); LCRYPTO_USED(OBJ_new_nid); -LCRYPTO_USED(OBJ_add_object); LCRYPTO_USED(OBJ_create); LCRYPTO_USED(OBJ_cleanup); LCRYPTO_USED(OBJ_create_objects); diff --git a/lib/libcrypto/objects/obj_dat.c b/lib/libcrypto/objects/obj_dat.c index bfa9ba3cc89..626036264f5 100644 --- a/lib/libcrypto/objects/obj_dat.c +++ b/lib/libcrypto/objects/obj_dat.c @@ -1,4 +1,4 @@ -/* $OpenBSD: obj_dat.c,v 1.87 2024/03/02 09:47:16 tb Exp $ */ +/* $OpenBSD: obj_dat.c,v 1.88 2024/03/02 09:49:45 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -208,7 +208,7 @@ OBJ_new_nid(int num) } LCRYPTO_ALIAS(OBJ_new_nid); -int +static int OBJ_add_object(const ASN1_OBJECT *obj) { ASN1_OBJECT *o = NULL; @@ -258,7 +258,6 @@ OBJ_add_object(const ASN1_OBJECT *obj) ASN1_OBJECT_free(o); return (NID_undef); } -LCRYPTO_ALIAS(OBJ_add_object); ASN1_OBJECT * OBJ_nid2obj(int nid) diff --git a/lib/libcrypto/objects/objects.h b/lib/libcrypto/objects/objects.h index ef6fc233bf8..ab0c4023836 100644 --- a/lib/libcrypto/objects/objects.h +++ b/lib/libcrypto/objects/objects.h @@ -1,4 +1,4 @@ -/* $OpenBSD: objects.h,v 1.26 2024/03/02 09:47:16 tb Exp $ */ +/* $OpenBSD: objects.h,v 1.27 2024/03/02 09:49:45 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -108,7 +108,6 @@ int OBJ_sn2nid(const char *s); int OBJ_cmp(const ASN1_OBJECT *a, const ASN1_OBJECT *b); int OBJ_new_nid(int num); -int OBJ_add_object(const ASN1_OBJECT *obj); int OBJ_create(const char *oid, const char *sn, const char *ln); void OBJ_cleanup(void); int OBJ_create_objects(BIO *in); |