Move dso.h to internal

Reviewed-by: Richard Levitte <levitte@openssl.org>

diff --git a/crypto/asn1/asn_moid.c b/crypto/asn1/asn_moid.c
index 168bc46bcfe3c843058243a175812cb064bcbf8e..8198874aa92217fce6652332e6a1bc1cf26e29af 100644 (file)
--- a/crypto/asn1/asn_moid.c
+++ b/crypto/asn1/asn_moid.c
@@ -61,7 +61,6 @@
 #include <openssl/crypto.h>
 #include "internal/cryptlib.h"
 #include <openssl/conf.h>
-#include <openssl/dso.h>
 #include <openssl/x509.h>
 #include "internal/asn1_int.h"
 

diff --git a/crypto/comp/c_zlib.c b/crypto/comp/c_zlib.c
index 138d6866017810f93e5cf2711811a1da0c6ede2e..07c45d0dfc1d0e9d50e4ca51a25886bb6350a965 100644 (file)
--- 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 <openssl/dso.h>
+#  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 8480c2f1c5a3ff3ac15eae9418c73479913129b7..a5c961df02fe09f3e7b584e27c68d2a4de1d6abb 100644 (file)
--- a/crypto/conf/conf_mall.c
+++ b/crypto/conf/conf_mall.c
@@ -60,7 +60,6 @@
 #include <openssl/crypto.h>
 #include "internal/cryptlib.h"
 #include <openssl/conf.h>
-#include <openssl/dso.h>
 #include <openssl/x509.h>
 #include <openssl/asn1.h>
 #include <openssl/engine.h>

diff --git a/crypto/conf/conf_mod.c b/crypto/conf/conf_mod.c
index d78396bbdfeab9b0349743feebb4e7302f04b0c8..aede6560453615cd1dfa6e1e8716bdebeacd7f8d 100644 (file)
--- a/crypto/conf/conf_mod.c
+++ b/crypto/conf/conf_mod.c
@@ -61,7 +61,7 @@
 #include <openssl/crypto.h>
 #include "internal/cryptlib.h"
 #include <openssl/conf.h>
-#include <openssl/dso.h>
+#include "internal/dso.h"
 #include <openssl/x509.h>
 
 #define DSO_mod_init_name "OPENSSL_init"

diff --git a/crypto/conf/conf_sap.c b/crypto/conf/conf_sap.c
index 9cc7a931f5b1711be8d43869bcbab24eb8c17b53..2198c2fe170f4274542106f119b241809145cf83 100644 (file)
--- a/crypto/conf/conf_sap.c
+++ b/crypto/conf/conf_sap.c
@@ -60,7 +60,6 @@
 #include <openssl/crypto.h>
 #include "internal/cryptlib.h"
 #include <internal/conf.h>
-#include <openssl/dso.h>
 #include <openssl/x509.h>
 #include <openssl/asn1.h>
 #include <openssl/engine.h>

diff --git a/crypto/dso/dso_err.c b/crypto/dso/dso_err.c
index 750807c990e42a6c4078dc2475e8252c600ffdad..136c4fe5b41421bbbc2fa85f97da3ae0f500a2b1 100644 (file)
--- 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 <stdio.h>
+#include <openssl/err.h>
+#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 a4c54a769121492ebd79fcce91bb0c3809bfefb2..622e69ef83a23a1b0018ba05506b06e72e31cd89 100644 (file)
--- a/crypto/dso/dso_locl.h
+++ b/crypto/dso/dso_locl.h
@@ -8,7 +8,7 @@
  */
 #include <stdio.h>
 #include "internal/cryptlib.h"
-#include <openssl/dso.h>
+#include "internal/dso.h"
 #include "internal/dso_conf.h"
 
 /**********************************************************************/

diff --git a/crypto/engine/eng_dyn.c b/crypto/engine/eng_dyn.c
index bdfc00cce610639fea766b8762c028d9b8debcef..c7553e1c47bc21d7b635ae7d0d14571665d5c005 100644 (file)
--- a/crypto/engine/eng_dyn.c
+++ b/crypto/engine/eng_dyn.c
@@ -57,7 +57,7 @@
  */
 
 #include "eng_int.h"
-#include <openssl/dso.h>
+#include "internal/dso.h"
 #include <openssl/crypto.h>
 
 /*

diff --git a/crypto/engine/eng_openssl.c b/crypto/engine/eng_openssl.c
index 2bf91b365fcc7eaf894bef8bae0b03563063c9cf..fc0784f413a1fec312bdc111b9033ab303fcf764 100644 (file)
--- a/crypto/engine/eng_openssl.c
+++ b/crypto/engine/eng_openssl.c
@@ -65,7 +65,6 @@
 #include <openssl/crypto.h>
 #include "internal/cryptlib.h"
 #include <internal/engine.h>
-#include <openssl/dso.h>
 #include <openssl/pem.h>
 #include <openssl/evp.h>
 #include <openssl/rand.h>

diff --git a/crypto/err/err_all.c b/crypto/err/err_all.c
index a79a84e544708e39daa0960dc0f218b40153fb06..25f7d411eb24ec8ec135825bc21ce247fa3b0fbf 100644 (file)
--- a/crypto/err/err_all.c
+++ b/crypto/err/err_all.c
@@ -74,7 +74,7 @@
 #include <openssl/conf.h>
 #include <openssl/pkcs12.h>
 #include <openssl/rand.h>
-#include <openssl/dso.h>
+#include "internal/dso.h"
 #include <openssl/engine.h>
 #include <openssl/ui.h>
 #include <openssl/ocsp.h>

diff --git a/crypto/err/openssl.ec b/crypto/err/openssl.ec
index 2e156600adbcb74afccbde13d12490d6047ac676..a969d7a29083ba59a0eb89e089cacde7b4b97ffc 100644 (file)
--- 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 7a365276e84c63020b3f73c8528a082c906b2091..45e82c92462f363e6c67ca18d0c0c203303a0f53 100644 (file)
--- a/crypto/evp/evp_cnf.c
+++ b/crypto/evp/evp_cnf.c
@@ -61,7 +61,6 @@
 #include <openssl/crypto.h>
 #include "internal/cryptlib.h"
 #include <openssl/conf.h>
-#include <openssl/dso.h>
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
 

diff --git a/engines/e_chil.c b/engines/e_chil.c
index 97eacfc31ce378119833336d556e55344e28bc74..b09d5259a951c7f85ac48551c2ef355ec8c57385 100644 (file)
--- a/engines/e_chil.c
+++ b/engines/e_chil.c
@@ -61,7 +61,7 @@
 #include <string.h>
 #include <openssl/crypto.h>
 #include <openssl/pem.h>
-#include <openssl/dso.h>
+#include "internal/dso.h"
 #include <openssl/engine.h>
 #include <openssl/ui.h>
 #include <openssl/rand.h>

diff --git a/engines/e_padlock.c b/engines/e_padlock.c
index c5377b55bbf3a9c52a8d639db051ef83daf0e31b..96e7483729f742e9cb1bd5c94a9d42096c97911d 100644 (file)
--- a/engines/e_padlock.c
+++ b/engines/e_padlock.c
@@ -67,7 +67,6 @@
 
 #include <openssl/opensslconf.h>
 #include <openssl/crypto.h>
-#include <openssl/dso.h>
 #include <openssl/engine.h>
 #include <openssl/evp.h>
 #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 129e6b46bdb2fee5481fbf24334b8f4a4ce07720..80bc61ae82a707978b0299f9ac705fab30ed873a 100755 (executable)
--- 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";