SecBSD/src
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sync with OpenBSD -current

Browse source
This commit is contained in:
purplerain 2024-03-02 19:33:09 +00:00
parent efa57bf0d2
commit d178ff6848
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
153 changed files with 982 additions and 11182 deletions
Download patch file Download diff file Expand all files Collapse all files

23
lib/libcrypto/objects/obj_dat.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: obj_dat.c,v 1.86 2024/02/26 15:00:30 tb Exp $ */
/* $OpenBSD: obj_dat.c,v 1.89 2024/03/02 11:11:11 tb Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@ -71,6 +71,7 @@
#include <openssl/objects.h>
#include "asn1_local.h"
#include "lhash_local.h"
/* obj_dat.h is generated from objects.h by obj_dat.pl */
#include "obj_dat.h"
@ -208,7 +209,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 +259,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)
@ -436,23 +436,6 @@ OBJ_ln2nid(const char *ln)
}
LCRYPTO_ALIAS(OBJ_ln2nid);
const void *
OBJ_bsearch_(const void *key, const void *base, int num, int size,
int (*cmp)(const void *, const void *))
{
OBJerror(ERR_R_DISABLED);
return NULL;
}
LCRYPTO_ALIAS(OBJ_bsearch_);
const void *
OBJ_bsearch_ex_(const void *key, const void *base_, int num, int size,
int (*cmp)(const void *, const void *), int flags)
{
OBJerror(ERR_R_DISABLED);
return NULL;
}
/* Convert an object name into an ASN1_OBJECT
* if "noname" is not set then search for short and long names first.
* This will convert the "dotted" form into an object: unlike OBJ_txt2nid