diff options
| author | bcook <> | 2016-07-17 21:23:50 +0000 |
|---|---|---|
| committer | bcook <> | 2016-07-17 21:23:50 +0000 |
| commit | 45c9aa3806e0d3ab3751cd424acd1b069b6d54ee (patch) | |
| tree | 724f525f72e088f19cd1e84ce4a6d6b4c07366f3 /src/lib/libcrypto/objects/obj_dat.c | |
| parent | fdee4729e12ac97473d08c1a7e9d17c5468fe82c (diff) | |
| download | openbsd-45c9aa3806e0d3ab3751cd424acd1b069b6d54ee.tar.gz openbsd-45c9aa3806e0d3ab3751cd424acd1b069b6d54ee.tar.bz2 openbsd-45c9aa3806e0d3ab3751cd424acd1b069b6d54ee.zip | |
remove unused OPENSSL_NO_OBJECT case
ok tedu@
Diffstat (limited to 'src/lib/libcrypto/objects/obj_dat.c')
| -rw-r--r-- | src/lib/libcrypto/objects/obj_dat.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/src/lib/libcrypto/objects/obj_dat.c b/src/lib/libcrypto/objects/obj_dat.c index 627f3230a7..1ae38bc4e8 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.35 2015/10/14 21:54:10 tedu Exp $ */ | 1 | /* $OpenBSD: obj_dat.c,v 1.36 2016/07/17 21:23:50 bcook 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 | * |
| @@ -70,20 +70,7 @@ | |||
| 70 | #include <openssl/objects.h> | 70 | #include <openssl/objects.h> |
| 71 | 71 | ||
| 72 | /* obj_dat.h is generated from objects.h by obj_dat.pl */ | 72 | /* obj_dat.h is generated from objects.h by obj_dat.pl */ |
| 73 | #ifndef OPENSSL_NO_OBJECT | ||
| 74 | #include "obj_dat.h" | 73 | #include "obj_dat.h" |
| 75 | #else | ||
| 76 | /* You will have to load all the objects needed manually in the application */ | ||
| 77 | #define NUM_NID 0 | ||
| 78 | #define NUM_SN 0 | ||
| 79 | #define NUM_LN 0 | ||
| 80 | #define NUM_OBJ 0 | ||
| 81 | static const unsigned char lvalues[1]; | ||
| 82 | static const ASN1_OBJECT nid_objs[1]; | ||
| 83 | static const unsigned int sn_objs[1]; | ||
| 84 | static const unsigned int ln_objs[1]; | ||
| 85 | static const unsigned int obj_objs[1]; | ||
| 86 | #endif | ||
| 87 | 74 | ||
| 88 | DECLARE_OBJ_BSEARCH_CMP_FN(const ASN1_OBJECT *, unsigned int, sn); | 75 | DECLARE_OBJ_BSEARCH_CMP_FN(const ASN1_OBJECT *, unsigned int, sn); |
| 89 | DECLARE_OBJ_BSEARCH_CMP_FN(const ASN1_OBJECT *, unsigned int, ln); | 76 | DECLARE_OBJ_BSEARCH_CMP_FN(const ASN1_OBJECT *, unsigned int, ln); |
