summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/objects
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libcrypto/objects')
-rw-r--r--src/lib/libcrypto/objects/obj_dat.c19
-rw-r--r--src/lib/libcrypto/objects/objects.h14
2 files changed, 2 insertions, 31 deletions
diff --git a/src/lib/libcrypto/objects/obj_dat.c b/src/lib/libcrypto/objects/obj_dat.c
index 1719cc73e2..bfa9ba3cc8 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.86 2024/02/26 15:00:30 tb Exp $ */ 1/* $OpenBSD: obj_dat.c,v 1.87 2024/03/02 09:47:16 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 *
@@ -436,23 +436,6 @@ OBJ_ln2nid(const char *ln)
436} 436}
437LCRYPTO_ALIAS(OBJ_ln2nid); 437LCRYPTO_ALIAS(OBJ_ln2nid);
438 438
439const void *
440OBJ_bsearch_(const void *key, const void *base, int num, int size,
441 int (*cmp)(const void *, const void *))
442{
443 OBJerror(ERR_R_DISABLED);
444 return NULL;
445}
446LCRYPTO_ALIAS(OBJ_bsearch_);
447
448const void *
449OBJ_bsearch_ex_(const void *key, const void *base_, int num, int size,
450 int (*cmp)(const void *, const void *), int flags)
451{
452 OBJerror(ERR_R_DISABLED);
453 return NULL;
454}
455
456/* Convert an object name into an ASN1_OBJECT 439/* Convert an object name into an ASN1_OBJECT
457 * if "noname" is not set then search for short and long names first. 440 * if "noname" is not set then search for short and long names first.
458 * This will convert the "dotted" form into an object: unlike OBJ_txt2nid 441 * This will convert the "dotted" form into an object: unlike OBJ_txt2nid
diff --git a/src/lib/libcrypto/objects/objects.h b/src/lib/libcrypto/objects/objects.h
index 2d3aa986d5..ef6fc233bf 100644
--- a/src/lib/libcrypto/objects/objects.h
+++ b/src/lib/libcrypto/objects/objects.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: objects.h,v 1.25 2024/03/02 09:43:10 tb Exp $ */ 1/* $OpenBSD: objects.h,v 1.26 2024/03/02 09:47:16 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 *
@@ -77,10 +77,6 @@
77 77
78#define OBJ_NAME_ALIAS 0x8000 78#define OBJ_NAME_ALIAS 0x8000
79 79
80#define OBJ_BSEARCH_VALUE_ON_NOMATCH 0x01
81#define OBJ_BSEARCH_FIRST_VALUE_ON_MATCH 0x02
82
83
84#ifdef __cplusplus 80#ifdef __cplusplus
85extern "C" { 81extern "C" {
86#endif 82#endif
@@ -111,14 +107,6 @@ int OBJ_ln2nid(const char *s);
111int OBJ_sn2nid(const char *s); 107int OBJ_sn2nid(const char *s);
112int OBJ_cmp(const ASN1_OBJECT *a, const ASN1_OBJECT *b); 108int OBJ_cmp(const ASN1_OBJECT *a, const ASN1_OBJECT *b);
113 109
114#if defined(LIBRESSL_INTERNAL)
115const void * OBJ_bsearch_(const void *key, const void *base, int num,
116 int size, int (*cmp)(const void *, const void *));
117const void * OBJ_bsearch_ex_(const void *key, const void *base, int num,
118 int size, int (*cmp)(const void *, const void *),
119 int flags);
120#endif
121
122int OBJ_new_nid(int num); 110int OBJ_new_nid(int num);
123int OBJ_add_object(const ASN1_OBJECT *obj); 111int OBJ_add_object(const ASN1_OBJECT *obj);
124int OBJ_create(const char *oid, const char *sn, const char *ln); 112int OBJ_create(const char *oid, const char *sn, const char *ln);