From 921de151d2052c794cf6ad82fe76da92717577f7 Mon Sep 17 00:00:00 2001 From: Rich Salz Date: Wed, 23 Mar 2016 08:54:52 -0400 Subject: [PATCH] Move dso.h to internal Reviewed-by: Richard Levitte --- crypto/asn1/asn_moid.c | 1 - crypto/comp/c_zlib.c | 2 +- crypto/conf/conf_mall.c | 1 - crypto/conf/conf_mod.c | 2 +- crypto/conf/conf_sap.c | 1 - crypto/dso/dso_err.c | 10 +++++----- crypto/dso/dso_locl.h | 2 +- crypto/engine/eng_dyn.c | 2 +- crypto/engine/eng_openssl.c | 1 - crypto/err/err_all.c | 2 +- crypto/err/openssl.ec | 2 +- crypto/evp/evp_cnf.c | 1 - engines/e_chil.c | 2 +- engines/e_padlock.c | 1 - include/{openssl => internal}/dso.h | 0 util/mkdef.pl | 2 +- 16 files changed, 13 insertions(+), 19 deletions(-) rename include/{openssl => internal}/dso.h (100%) diff --git a/crypto/asn1/asn_moid.c b/crypto/asn1/asn_moid.c index 168bc46bcf..8198874aa9 100644 --- a/crypto/asn1/asn_moid.c +++ b/crypto/asn1/asn_moid.c @@ -61,7 +61,6 @@ #include #include "internal/cryptlib.h" #include -#include #include #include "internal/asn1_int.h" diff --git a/crypto/comp/c_zlib.c b/crypto/comp/c_zlib.c index 138d686601..07c45d0dfc 100644 --- a/crypto/comp/c_zlib.c +++ b/crypto/comp/c_zlib.c @@ -123,7 +123,7 @@ static COMP_METHOD zlib_stateful_method = { * OPENSSL_SYS_WIN32) */ # ifdef ZLIB_SHARED -# include +# include "internal/dso.h" /* Function pointers */ typedef int (*compress_ft) (Bytef *dest, uLongf * destLen, diff --git a/crypto/conf/conf_mall.c b/crypto/conf/conf_mall.c index 8480c2f1c5..a5c961df02 100644 --- a/crypto/conf/conf_mall.c +++ b/crypto/conf/conf_mall.c @@ -60,7 +60,6 @@ #include #include "internal/cryptlib.h" #include -#include #include #include #include diff --git a/crypto/conf/conf_mod.c b/crypto/conf/conf_mod.c index d78396bbdf..aede656045 100644 --- a/crypto/conf/conf_mod.c +++ b/crypto/conf/conf_mod.c @@ -61,7 +61,7 @@ #include #include "internal/cryptlib.h" #include -#include +#include "internal/dso.h" #include #define DSO_mod_init_name "OPENSSL_init" diff --git a/crypto/conf/conf_sap.c b/crypto/conf/conf_sap.c index 9cc7a931f5..2198c2fe17 100644 --- a/crypto/conf/conf_sap.c +++ b/crypto/conf/conf_sap.c @@ -60,7 +60,6 @@ #include #include "internal/cryptlib.h" #include -#include #include #include #include diff --git a/crypto/dso/dso_err.c b/crypto/dso/dso_err.c index 750807c990..136c4fe5b4 100644 --- a/crypto/dso/dso_err.c +++ b/crypto/dso/dso_err.c @@ -1,5 +1,5 @@ /* ==================================================================== - * Copyright (c) 1999-2015 The OpenSSL Project. All rights reserved. + * Copyright (c) 1999-2016 The OpenSSL Project. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -58,7 +58,9 @@ * only reason strings will be preserved. */ -#include "dso_locl.h" +#include +#include +#include "internal/dso.h" /* BEGIN ERROR CODES */ #ifndef OPENSSL_NO_ERR @@ -85,16 +87,15 @@ static ERR_STRING_DATA DSO_str_functs[] = { {ERR_FUNC(DSO_F_DSO_GLOBAL_LOOKUP), "DSO_global_lookup"}, {ERR_FUNC(DSO_F_DSO_LOAD), "DSO_load"}, {ERR_FUNC(DSO_F_DSO_MERGE), "DSO_merge"}, + {ERR_FUNC(DSO_F_DSO_NEW_METHOD), "DSO_new_method"}, {ERR_FUNC(DSO_F_DSO_SET_FILENAME), "DSO_set_filename"}, {ERR_FUNC(DSO_F_DSO_UP_REF), "DSO_up_ref"}, - {ERR_FUNC(DSO_F_GLOBAL_LOOKUP_FUNC), "GLOBAL_LOOKUP_FUNC"}, {ERR_FUNC(DSO_F_VMS_BIND_SYM), "vms_bind_sym"}, {ERR_FUNC(DSO_F_VMS_LOAD), "vms_load"}, {ERR_FUNC(DSO_F_VMS_MERGER), "vms_merger"}, {ERR_FUNC(DSO_F_VMS_UNLOAD), "vms_unload"}, {ERR_FUNC(DSO_F_WIN32_BIND_FUNC), "win32_bind_func"}, {ERR_FUNC(DSO_F_WIN32_GLOBALLOOKUP), "win32_globallookup"}, - {ERR_FUNC(DSO_F_WIN32_GLOBALLOOKUP_FUNC), "WIN32_GLOBALLOOKUP_FUNC"}, {ERR_FUNC(DSO_F_WIN32_JOINER), "win32_joiner"}, {ERR_FUNC(DSO_F_WIN32_LOAD), "win32_load"}, {ERR_FUNC(DSO_F_WIN32_MERGER), "win32_merger"}, @@ -115,7 +116,6 @@ static ERR_STRING_DATA DSO_str_reasons[] = { {ERR_REASON(DSO_R_LOAD_FAILED), "could not load the shared library"}, {ERR_REASON(DSO_R_NAME_TRANSLATION_FAILED), "name translation failed"}, {ERR_REASON(DSO_R_NO_FILENAME), "no filename"}, - {ERR_REASON(DSO_R_NO_FILE_SPECIFICATION), "no file specification"}, {ERR_REASON(DSO_R_NULL_HANDLE), "a null shared library handle was used"}, {ERR_REASON(DSO_R_SET_FILENAME_FAILED), "set filename failed"}, {ERR_REASON(DSO_R_STACK_ERROR), "the meth_data stack is corrupt"}, diff --git a/crypto/dso/dso_locl.h b/crypto/dso/dso_locl.h index a4c54a7691..622e69ef83 100644 --- a/crypto/dso/dso_locl.h +++ b/crypto/dso/dso_locl.h @@ -8,7 +8,7 @@ */ #include #include "internal/cryptlib.h" -#include +#include "internal/dso.h" #include "internal/dso_conf.h" /**********************************************************************/ diff --git a/crypto/engine/eng_dyn.c b/crypto/engine/eng_dyn.c index bdfc00cce6..c7553e1c47 100644 --- a/crypto/engine/eng_dyn.c +++ b/crypto/engine/eng_dyn.c @@ -57,7 +57,7 @@ */ #include "eng_int.h" -#include +#include "internal/dso.h" #include /* diff --git a/crypto/engine/eng_openssl.c b/crypto/engine/eng_openssl.c index 2bf91b365f..fc0784f413 100644 --- a/crypto/engine/eng_openssl.c +++ b/crypto/engine/eng_openssl.c @@ -65,7 +65,6 @@ #include #include "internal/cryptlib.h" #include -#include #include #include #include diff --git a/crypto/err/err_all.c b/crypto/err/err_all.c index a79a84e544..25f7d411eb 100644 --- a/crypto/err/err_all.c +++ b/crypto/err/err_all.c @@ -74,7 +74,7 @@ #include #include #include -#include +#include "internal/dso.h" #include #include #include diff --git a/crypto/err/openssl.ec b/crypto/err/openssl.ec index 2e156600ad..a969d7a290 100644 --- a/crypto/err/openssl.ec +++ b/crypto/err/openssl.ec @@ -23,7 +23,7 @@ L PKCS7 include/openssl/pkcs7.h crypto/pkcs7/pkcs7err.c L X509V3 include/openssl/x509v3.h crypto/x509v3/v3err.c L PKCS12 include/openssl/pkcs12.h crypto/pkcs12/pk12err.c L RAND include/openssl/rand.h crypto/rand/rand_err.c -L DSO include/openssl/dso.h crypto/dso/dso_err.c +L DSO include/internal/dso.h crypto/dso/dso_err.c L ENGINE include/openssl/engine.h crypto/engine/eng_err.c L OCSP include/openssl/ocsp.h crypto/ocsp/ocsp_err.c L UI include/openssl/ui.h crypto/ui/ui_err.c diff --git a/crypto/evp/evp_cnf.c b/crypto/evp/evp_cnf.c index 7a365276e8..45e82c9246 100644 --- a/crypto/evp/evp_cnf.c +++ b/crypto/evp/evp_cnf.c @@ -61,7 +61,6 @@ #include #include "internal/cryptlib.h" #include -#include #include #include diff --git a/engines/e_chil.c b/engines/e_chil.c index 97eacfc31c..b09d5259a9 100644 --- a/engines/e_chil.c +++ b/engines/e_chil.c @@ -61,7 +61,7 @@ #include #include #include -#include +#include "internal/dso.h" #include #include #include diff --git a/engines/e_padlock.c b/engines/e_padlock.c index c5377b55bb..96e7483729 100644 --- a/engines/e_padlock.c +++ b/engines/e_padlock.c @@ -67,7 +67,6 @@ #include #include -#include #include #include #ifndef OPENSSL_NO_AES diff --git a/include/openssl/dso.h b/include/internal/dso.h similarity index 100% rename from include/openssl/dso.h rename to include/internal/dso.h diff --git a/util/mkdef.pl b/util/mkdef.pl index 129e6b46bd..80bc61ae82 100755 --- a/util/mkdef.pl +++ b/util/mkdef.pl @@ -269,7 +269,7 @@ $crypto.=" include/openssl/engine.h"; # unless $no_engine; $crypto.=" include/openssl/stack.h" ; # unless $no_stack; $crypto.=" include/openssl/buffer.h" ; # unless $no_buffer; $crypto.=" include/openssl/bio.h" ; # unless $no_bio; -$crypto.=" include/openssl/dso.h" ; # unless $no_dso; +$crypto.=" include/internal/dso.h" ; # unless $no_dso; $crypto.=" include/openssl/lhash.h" ; # unless $no_lhash; $crypto.=" include/openssl/conf.h"; $crypto.=" include/openssl/txt_db.h"; -- 2.34.1