Move dso.h to internal
authorRich Salz <rsalz@openssl.org>
Wed, 23 Mar 2016 12:54:52 +0000 (08:54 -0400)
committerRich Salz <rsalz@openssl.org>
Wed, 23 Mar 2016 13:12:11 +0000 (09:12 -0400)
Reviewed-by: Richard Levitte <levitte@openssl.org>
16 files changed:
crypto/asn1/asn_moid.c
crypto/comp/c_zlib.c
crypto/conf/conf_mall.c
crypto/conf/conf_mod.c
crypto/conf/conf_sap.c
crypto/dso/dso_err.c
crypto/dso/dso_locl.h
crypto/engine/eng_dyn.c
crypto/engine/eng_openssl.c
crypto/err/err_all.c
crypto/err/openssl.ec
crypto/evp/evp_cnf.c
engines/e_chil.c
engines/e_padlock.c
include/internal/dso.h [moved from include/openssl/dso.h with 100% similarity]
util/mkdef.pl

index 168bc46..8198874 100644 (file)
@@ -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"
 
index 138d686..07c45d0 100644 (file)
@@ -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,
index 8480c2f..a5c961d 100644 (file)
@@ -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>
index d78396b..aede656 100644 (file)
@@ -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"
index 9cc7a93..2198c2f 100644 (file)
@@ -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>
index 750807c..136c4fe 100644 (file)
@@ -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"},
index a4c54a7..622e69e 100644 (file)
@@ -8,7 +8,7 @@
  */
 #include <stdio.h>
 #include "internal/cryptlib.h"
-#include <openssl/dso.h>
+#include "internal/dso.h"
 #include "internal/dso_conf.h"
 
 /**********************************************************************/
index bdfc00c..c7553e1 100644 (file)
@@ -57,7 +57,7 @@
  */
 
 #include "eng_int.h"
-#include <openssl/dso.h>
+#include "internal/dso.h"
 #include <openssl/crypto.h>
 
 /*
index 2bf91b3..fc0784f 100644 (file)
@@ -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>
index a79a84e..25f7d41 100644 (file)
@@ -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>
index 2e15660..a969d7a 100644 (file)
@@ -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
index 7a36527..45e82c9 100644 (file)
@@ -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>
 
index 97eacfc..b09d525 100644 (file)
@@ -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>
index c5377b5..96e7483 100644 (file)
@@ -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
similarity index 100%
rename from include/openssl/dso.h
rename to include/internal/dso.h
index 129e6b4..80bc61a 100755 (executable)
@@ -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";