diff options
author | Richard Levitte <levitte@openssl.org> | 2001-02-19 16:06:34 +0000 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2001-02-19 16:06:34 +0000 |
commit | cf1b7d96647d55e533f779e476e3d4371f40445a (patch) | |
tree | f7d6534cf77223190eaefe68d9e192d3d1246206 /crypto/err | |
parent | 649c5a2b096e89692b07dbbe19d2dbb12a9db075 (diff) | |
download | openssl-cf1b7d96647d55e533f779e476e3d4371f40445a.tar.gz |
Make all configuration macros available for application by making
sure they are available in opensslconf.h, by giving them names starting
with "OPENSSL_" to avoid conflicts with other packages and by making
sure e_os2.h will cover all platform-specific cases together with
opensslconf.h.
I've checked fairly well that nothing breaks with this (apart from
external software that will adapt if they have used something like
NO_KRB5), but I can't guarantee it completely, so a review of this
change would be a good thing.
Diffstat (limited to 'crypto/err')
-rw-r--r-- | crypto/err/Makefile.ssl | 43 | ||||
-rw-r--r-- | crypto/err/err.c | 4 | ||||
-rw-r--r-- | crypto/err/err.h | 14 | ||||
-rw-r--r-- | crypto/err/err_all.c | 14 | ||||
-rw-r--r-- | crypto/err/err_prn.c | 2 |
5 files changed, 39 insertions, 38 deletions
diff --git a/crypto/err/Makefile.ssl b/crypto/err/Makefile.ssl index 744c9148a6..6eaca151fa 100644 --- a/crypto/err/Makefile.ssl +++ b/crypto/err/Makefile.ssl @@ -11,7 +11,8 @@ INSTALL_PREFIX= OPENSSLDIR= /usr/local/ssl INSTALLTOP=/usr/local/ssl MAKE= make -f Makefile.ssl -MAKEDEPEND= $(TOP)/util/domd $(TOP) +MAKEDEPPROG= makedepend +MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) MAKEFILE= Makefile.ssl AR= ar r @@ -85,35 +86,35 @@ err.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h err.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h err.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -err.o: ../cryptlib.h +err.o: ../cryptlib.h err.c err_all.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h err_all.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h err_all.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h err_all.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h err_all.o: ../../include/openssl/des.h ../../include/openssl/dh.h err_all.o: ../../include/openssl/dsa.h ../../include/openssl/dso.h -err_all.o: ../../include/openssl/e_os.h ../../include/openssl/e_os.h -err_all.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h -err_all.o: ../../include/openssl/err.h ../../include/openssl/evp.h -err_all.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h -err_all.o: ../../include/openssl/md2.h ../../include/openssl/md4.h -err_all.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h -err_all.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -err_all.o: ../../include/openssl/ocsp.h ../../include/openssl/opensslconf.h -err_all.o: ../../include/openssl/opensslv.h ../../include/openssl/pem2.h -err_all.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h -err_all.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h -err_all.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h -err_all.o: ../../include/openssl/rd_fst.h ../../include/openssl/rijndael.h -err_all.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h -err_all.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -err_all.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -err_all.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -err_all.o: ../../include/openssl/x509v3.h +err_all.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h +err_all.o: ../../include/openssl/engine.h ../../include/openssl/err.h +err_all.o: ../../include/openssl/evp.h ../../include/openssl/idea.h +err_all.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h +err_all.o: ../../include/openssl/md4.h ../../include/openssl/md5.h +err_all.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h +err_all.o: ../../include/openssl/objects.h ../../include/openssl/ocsp.h +err_all.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +err_all.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs12.h +err_all.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h +err_all.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h +err_all.o: ../../include/openssl/rc5.h ../../include/openssl/rd_fst.h +err_all.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h +err_all.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h +err_all.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +err_all.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h +err_all.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h +err_all.o: err_all.c err_prn.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h err_prn.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h err_prn.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h err_prn.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h err_prn.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h err_prn.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -err_prn.o: ../cryptlib.h +err_prn.o: ../cryptlib.h err_prn.c diff --git a/crypto/err/err.c b/crypto/err/err.c index fdf7746948..de74b47890 100644 --- a/crypto/err/err.c +++ b/crypto/err/err.c @@ -135,7 +135,7 @@ static unsigned long get_error_values(int inc,const char **file,int *line, const char **data,int *flags); static void ERR_STATE_free(ERR_STATE *s); -#ifndef NO_ERR +#ifndef OPENSSL_NO_ERR static ERR_STRING_DATA ERR_str_libraries[]= { {ERR_PACK(ERR_LIB_NONE,0,0) ,"unknown library"}, @@ -306,7 +306,7 @@ void ERR_load_ERR_strings(void) } CRYPTO_w_unlock(CRYPTO_LOCK_ERR); -#ifndef NO_ERR +#ifndef OPENSSL_NO_ERR ERR_load_strings(0,ERR_str_libraries); ERR_load_strings(0,ERR_str_reasons); ERR_load_strings(ERR_LIB_SYS,ERR_str_functs); diff --git a/crypto/err/err.h b/crypto/err/err.h index b4ced575df..96a91c356b 100644 --- a/crypto/err/err.h +++ b/crypto/err/err.h @@ -59,15 +59,15 @@ #ifndef HEADER_ERR_H #define HEADER_ERR_H -#ifndef NO_FP_API +#ifndef OPENSSL_NO_FP_API #include <stdio.h> #include <stdlib.h> #endif -#ifndef NO_BIO +#ifndef OPENSSL_NO_BIO #include <openssl/bio.h> #endif -#ifndef NO_LHASH +#ifndef OPENSSL_NO_LHASH #include <openssl/lhash.h> #endif @@ -81,7 +81,7 @@ extern "C" { #define ERR_file_name __FILE__ -#ifndef NO_ERR +#ifndef OPENSSL_NO_ERR #define ERR_PUT_error(a,b,c,d,e) ERR_put_error(a,b,c,d,e) #else #define ERR_PUT_error(a,b,c,d,e) ERR_put_error(a,b,c,NULL,0) @@ -250,10 +250,10 @@ void ERR_error_string_n(unsigned long e, char *buf, size_t len); const char *ERR_lib_error_string(unsigned long e); const char *ERR_func_error_string(unsigned long e); const char *ERR_reason_error_string(unsigned long e); -#ifndef NO_FP_API +#ifndef OPENSSL_NO_FP_API void ERR_print_errors_fp(FILE *fp); #endif -#ifndef NO_BIO +#ifndef OPENSSL_NO_BIO void ERR_print_errors(BIO *bp); void ERR_add_error_data(int num, ...); #endif @@ -265,7 +265,7 @@ void ERR_free_strings(void); void ERR_remove_state(unsigned long pid); /* if zero we look it up */ ERR_STATE *ERR_get_state(void); -#ifndef NO_LHASH +#ifndef OPENSSL_NO_LHASH LHASH *ERR_get_string_table(void); LHASH *ERR_get_err_state_table(void); /* even less thread-safe than * ERR_get_string_table :-) */ diff --git a/crypto/err/err_all.c b/crypto/err/err_all.c index f465f260c2..2952113e97 100644 --- a/crypto/err/err_all.c +++ b/crypto/err/err_all.c @@ -61,16 +61,16 @@ #include <openssl/bn.h> #include <openssl/buffer.h> #include <openssl/bio.h> -#ifndef NO_RSA +#ifndef OPENSSL_NO_RSA #include <openssl/rsa.h> #endif #if 0 /* was: #ifdef RSAref */ #include <openssl/rsaref.h> #endif -#ifndef NO_DH +#ifndef OPENSSL_NO_DH #include <openssl/dh.h> #endif -#ifndef NO_DSA +#ifndef OPENSSL_NO_DSA #include <openssl/dsa.h> #endif #include <openssl/evp.h> @@ -92,23 +92,23 @@ void ERR_load_crypto_strings(void) if (done) return; done=1; -#ifndef NO_ERR +#ifndef OPENSSL_NO_ERR ERR_load_ASN1_strings(); ERR_load_BN_strings(); ERR_load_BUF_strings(); ERR_load_BIO_strings(); ERR_load_CONF_strings(); -#ifndef NO_RSA +#ifndef OPENSSL_NO_RSA #if 0 /* was: #ifdef RSAref */ ERR_load_RSAREF_strings(); #else ERR_load_RSA_strings(); #endif #endif -#ifndef NO_DH +#ifndef OPENSSL_NO_DH ERR_load_DH_strings(); #endif -#ifndef NO_DSA +#ifndef OPENSSL_NO_DSA ERR_load_DSA_strings(); #endif ERR_load_ERR_strings(); diff --git a/crypto/err/err_prn.c b/crypto/err/err_prn.c index 6f60b016c3..19aaa2891f 100644 --- a/crypto/err/err_prn.c +++ b/crypto/err/err_prn.c @@ -64,7 +64,7 @@ #include <openssl/err.h> #include <openssl/crypto.h> -#ifndef NO_FP_API +#ifndef OPENSSL_NO_FP_API void ERR_print_errors_fp(FILE *fp) { unsigned long l; |