diff options
author | Rich Salz <rsalz@openssl.org> | 2015-01-27 10:06:22 -0500 |
---|---|---|
committer | Rich Salz <rsalz@openssl.org> | 2015-01-27 10:06:22 -0500 |
commit | a00ae6c46e0d7907a7c9f9e85334e968aa5fd338 (patch) | |
tree | 79a0e748842c1a3ed15b3b4a1ab08ce29bab5280 /crypto/objects | |
parent | 109f1031a8d03a7c0a7c53c82314505ec5b7b207 (diff) |
OPENSSL_NO_xxx cleanup: many removals
The following compile options (#ifdef's) are removed:
OPENSSL_NO_BIO OPENSSL_NO_BUFFER OPENSSL_NO_CHAIN_VERIFY
OPENSSL_NO_EVP OPENSSL_NO_FIPS_ERR OPENSSL_NO_HASH_COMP
OPENSSL_NO_LHASH OPENSSL_NO_OBJECT OPENSSL_NO_SPEED OPENSSL_NO_STACK
OPENSSL_NO_X509 OPENSSL_NO_X509_VERIFY
This diff is big because of updating the indents on preprocessor lines.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'crypto/objects')
-rw-r--r-- | crypto/objects/obj_dat.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/crypto/objects/obj_dat.c b/crypto/objects/obj_dat.c index 0b06ea4a01..e7366af8dc 100644 --- a/crypto/objects/obj_dat.c +++ b/crypto/objects/obj_dat.c @@ -66,20 +66,7 @@ #include <openssl/bn.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 +#include "obj_dat.h" DECLARE_OBJ_BSEARCH_CMP_FN(const ASN1_OBJECT *, unsigned int, sn); DECLARE_OBJ_BSEARCH_CMP_FN(const ASN1_OBJECT *, unsigned int, ln); |