summaryrefslogtreecommitdiff
path: root/lib/libssl
diff options
context:
space:
mode:
authorBrent Cook <bcook@cvs.openbsd.org>2016-07-17 21:23:51 +0000
committerBrent Cook <bcook@cvs.openbsd.org>2016-07-17 21:23:51 +0000
commitc38cab9844ec31df5abfebd4239e57bf5363f409 (patch)
treeb6e41ae14c46061a0cb544aeabccde2d0601d003 /lib/libssl
parente71d6d376ad3cf10de3dec5576cb74f3b9868919 (diff)
remove unused OPENSSL_NO_OBJECT case
ok tedu@
Diffstat (limited to 'lib/libssl')
-rw-r--r--lib/libssl/src/crypto/objects/obj_dat.c15
1 files changed, 1 insertions, 14 deletions
diff --git a/lib/libssl/src/crypto/objects/obj_dat.c b/lib/libssl/src/crypto/objects/obj_dat.c
index 627f3230a7c..1ae38bc4e8e 100644
--- a/lib/libssl/src/crypto/objects/obj_dat.c
+++ b/lib/libssl/src/crypto/objects/obj_dat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: obj_dat.c,v 1.35 2015/10/14 21:54:10 tedu Exp $ */
+/* $OpenBSD: obj_dat.c,v 1.36 2016/07/17 21:23:50 bcook Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -70,20 +70,7 @@
#include <openssl/objects.h>
/* obj_dat.h is generated from objects.h by obj_dat.pl */
-#ifndef OPENSSL_NO_OBJECT
#include "obj_dat.h"
-#else
-/* You will have to load all the objects needed manually in the application */
-#define NUM_NID 0
-#define NUM_SN 0
-#define NUM_LN 0
-#define NUM_OBJ 0
-static const unsigned char lvalues[1];
-static const ASN1_OBJECT nid_objs[1];
-static const unsigned int sn_objs[1];
-static const unsigned int ln_objs[1];
-static const unsigned int obj_objs[1];
-#endif
DECLARE_OBJ_BSEARCH_CMP_FN(const ASN1_OBJECT *, unsigned int, sn);
DECLARE_OBJ_BSEARCH_CMP_FN(const ASN1_OBJECT *, unsigned int, ln);