diff options
Diffstat (limited to 'src/lib/libcrypto/dso')
| -rw-r--r-- | src/lib/libcrypto/dso/dso.h | 250 | ||||
| -rw-r--r-- | src/lib/libcrypto/dso/dso_dlfcn.c | 276 | ||||
| -rw-r--r-- | src/lib/libcrypto/dso/dso_err.c | 128 | ||||
| -rw-r--r-- | src/lib/libcrypto/dso/dso_lib.c | 306 | ||||
| -rw-r--r-- | src/lib/libcrypto/dso/dso_null.c | 86 | ||||
| -rw-r--r-- | src/lib/libcrypto/dso/dso_openssl.c | 81 |
6 files changed, 0 insertions, 1127 deletions
diff --git a/src/lib/libcrypto/dso/dso.h b/src/lib/libcrypto/dso/dso.h deleted file mode 100644 index bed7c464a6..0000000000 --- a/src/lib/libcrypto/dso/dso.h +++ /dev/null | |||
| @@ -1,250 +0,0 @@ | |||
| 1 | /* dso.h */ | ||
| 2 | /* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL | ||
| 3 | * project 2000. | ||
| 4 | */ | ||
| 5 | /* ==================================================================== | ||
| 6 | * Copyright (c) 2000 The OpenSSL Project. All rights reserved. | ||
| 7 | * | ||
| 8 | * Redistribution and use in source and binary forms, with or without | ||
| 9 | * modification, are permitted provided that the following conditions | ||
| 10 | * are met: | ||
| 11 | * | ||
| 12 | * 1. Redistributions of source code must retain the above copyright | ||
| 13 | * notice, this list of conditions and the following disclaimer. | ||
| 14 | * | ||
| 15 | * 2. Redistributions in binary form must reproduce the above copyright | ||
| 16 | * notice, this list of conditions and the following disclaimer in | ||
| 17 | * the documentation and/or other materials provided with the | ||
| 18 | * distribution. | ||
| 19 | * | ||
| 20 | * 3. All advertising materials mentioning features or use of this | ||
| 21 | * software must display the following acknowledgment: | ||
| 22 | * "This product includes software developed by the OpenSSL Project | ||
| 23 | * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)" | ||
| 24 | * | ||
| 25 | * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to | ||
| 26 | * endorse or promote products derived from this software without | ||
| 27 | * prior written permission. For written permission, please contact | ||
| 28 | * licensing@OpenSSL.org. | ||
| 29 | * | ||
| 30 | * 5. Products derived from this software may not be called "OpenSSL" | ||
| 31 | * nor may "OpenSSL" appear in their names without prior written | ||
| 32 | * permission of the OpenSSL Project. | ||
| 33 | * | ||
| 34 | * 6. Redistributions of any form whatsoever must retain the following | ||
| 35 | * acknowledgment: | ||
| 36 | * "This product includes software developed by the OpenSSL Project | ||
| 37 | * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)" | ||
| 38 | * | ||
| 39 | * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY | ||
| 40 | * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| 41 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | ||
| 42 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR | ||
| 43 | * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
| 44 | * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
| 45 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
| 46 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
| 47 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, | ||
| 48 | * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
| 49 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED | ||
| 50 | * OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| 51 | * ==================================================================== | ||
| 52 | * | ||
| 53 | * This product includes cryptographic software written by Eric Young | ||
| 54 | * (eay@cryptsoft.com). This product includes software written by Tim | ||
| 55 | * Hudson (tjh@cryptsoft.com). | ||
| 56 | * | ||
| 57 | */ | ||
| 58 | |||
| 59 | #ifndef HEADER_DSO_H | ||
| 60 | #define HEADER_DSO_H | ||
| 61 | |||
| 62 | #include <openssl/crypto.h> | ||
| 63 | |||
| 64 | #ifdef __cplusplus | ||
| 65 | extern "C" { | ||
| 66 | #endif | ||
| 67 | |||
| 68 | /* These values are used as commands to DSO_ctrl() */ | ||
| 69 | #define DSO_CTRL_GET_FLAGS 1 | ||
| 70 | #define DSO_CTRL_SET_FLAGS 2 | ||
| 71 | #define DSO_CTRL_OR_FLAGS 3 | ||
| 72 | |||
| 73 | /* These flags control the translation of file-names from canonical to | ||
| 74 | * native. Eg. in the CryptoSwift support, the "dl" and "dlfcn" | ||
| 75 | * methods will translate "swift" -> "libswift.so" whereas the "win32" | ||
| 76 | * method will translate "swift" -> "swift.dll". NB: Until I can figure | ||
| 77 | * out how to be more "conventional" with this, the methods will only | ||
| 78 | * honour this flag if it looks like it was passed a file without any | ||
| 79 | * path and if the filename is small enough. | ||
| 80 | */ | ||
| 81 | #define DSO_FLAG_NAME_TRANSLATION 0x01 | ||
| 82 | |||
| 83 | /* The following flag controls the translation of symbol names to upper | ||
| 84 | * case. This is currently only being implemented for OpenVMS. | ||
| 85 | */ | ||
| 86 | #define DSO_FLAG_UPCASE_SYMBOL 0x02 | ||
| 87 | |||
| 88 | |||
| 89 | typedef void (*DSO_FUNC_TYPE)(void); | ||
| 90 | |||
| 91 | typedef struct dso_st DSO; | ||
| 92 | |||
| 93 | typedef struct dso_meth_st | ||
| 94 | { | ||
| 95 | const char *name; | ||
| 96 | /* Loads a shared library */ | ||
| 97 | int (*dso_load)(DSO *dso, const char *filename); | ||
| 98 | /* Unloads a shared library */ | ||
| 99 | int (*dso_unload)(DSO *dso); | ||
| 100 | /* Binds a variable */ | ||
| 101 | void *(*dso_bind_var)(DSO *dso, const char *symname); | ||
| 102 | /* Binds a function - assumes a return type of DSO_FUNC_TYPE. | ||
| 103 | * This should be cast to the real function prototype by the | ||
| 104 | * caller. Platforms that don't have compatible representations | ||
| 105 | * for different prototypes (this is possible within ANSI C) | ||
| 106 | * are highly unlikely to have shared libraries at all, let | ||
| 107 | * alone a DSO_METHOD implemented for them. */ | ||
| 108 | DSO_FUNC_TYPE (*dso_bind_func)(DSO *dso, const char *symname); | ||
| 109 | |||
| 110 | /* I don't think this would actually be used in any circumstances. */ | ||
| 111 | #if 0 | ||
| 112 | /* Unbinds a variable */ | ||
| 113 | int (*dso_unbind_var)(DSO *dso, char *symname, void *symptr); | ||
| 114 | /* Unbinds a function */ | ||
| 115 | int (*dso_unbind_func)(DSO *dso, char *symname, DSO_FUNC_TYPE symptr); | ||
| 116 | #endif | ||
| 117 | /* The generic (yuck) "ctrl()" function. NB: Negative return | ||
| 118 | * values (rather than zero) indicate errors. */ | ||
| 119 | long (*dso_ctrl)(DSO *dso, int cmd, long larg, void *parg); | ||
| 120 | |||
| 121 | /* [De]Initialisation handlers. */ | ||
| 122 | int (*init)(DSO *dso); | ||
| 123 | int (*finish)(DSO *dso); | ||
| 124 | } DSO_METHOD; | ||
| 125 | |||
| 126 | /**********************************************************************/ | ||
| 127 | /* The low-level handle type used to refer to a loaded shared library */ | ||
| 128 | |||
| 129 | struct dso_st | ||
| 130 | { | ||
| 131 | DSO_METHOD *meth; | ||
| 132 | /* Standard dlopen uses a (void *). Win32 uses a HANDLE. VMS | ||
| 133 | * doesn't use anything but will need to cache the filename | ||
| 134 | * for use in the dso_bind handler. All in all, let each | ||
| 135 | * method control its own destiny. "Handles" and such go in | ||
| 136 | * a STACK. */ | ||
| 137 | STACK *meth_data; | ||
| 138 | int references; | ||
| 139 | int flags; | ||
| 140 | /* For use by applications etc ... use this for your bits'n'pieces, | ||
| 141 | * don't touch meth_data! */ | ||
| 142 | CRYPTO_EX_DATA ex_data; | ||
| 143 | }; | ||
| 144 | |||
| 145 | |||
| 146 | DSO * DSO_new(void); | ||
| 147 | DSO * DSO_new_method(DSO_METHOD *method); | ||
| 148 | int DSO_free(DSO *dso); | ||
| 149 | int DSO_flags(DSO *dso); | ||
| 150 | int DSO_up(DSO *dso); | ||
| 151 | long DSO_ctrl(DSO *dso, int cmd, long larg, void *parg); | ||
| 152 | |||
| 153 | void DSO_set_default_method(DSO_METHOD *meth); | ||
| 154 | DSO_METHOD *DSO_get_default_method(void); | ||
| 155 | DSO_METHOD *DSO_get_method(DSO *dso); | ||
| 156 | DSO_METHOD *DSO_set_method(DSO *dso, DSO_METHOD *meth); | ||
| 157 | |||
| 158 | /* The all-singing all-dancing load function, you normally pass NULL | ||
| 159 | * for the first and third parameters. Use DSO_up and DSO_free for | ||
| 160 | * subsequent reference count handling. Any flags passed in will be set | ||
| 161 | * in the constructed DSO after its init() function but before the | ||
| 162 | * load operation. This will be done with; | ||
| 163 | * DSO_ctrl(dso, DSO_CTRL_SET_FLAGS, flags, NULL); */ | ||
| 164 | DSO *DSO_load(DSO *dso, const char *filename, DSO_METHOD *meth, int flags); | ||
| 165 | |||
| 166 | /* This function binds to a variable inside a shared library. */ | ||
| 167 | void *DSO_bind_var(DSO *dso, const char *symname); | ||
| 168 | |||
| 169 | /* This function binds to a function inside a shared library. */ | ||
| 170 | DSO_FUNC_TYPE DSO_bind_func(DSO *dso, const char *symname); | ||
| 171 | |||
| 172 | /* This method is the default, but will beg, borrow, or steal whatever | ||
| 173 | * method should be the default on any particular platform (including | ||
| 174 | * DSO_METH_null() if necessary). */ | ||
| 175 | DSO_METHOD *DSO_METHOD_openssl(void); | ||
| 176 | |||
| 177 | /* This method is defined for all platforms - if a platform has no | ||
| 178 | * DSO support then this will be the only method! */ | ||
| 179 | DSO_METHOD *DSO_METHOD_null(void); | ||
| 180 | |||
| 181 | /* If DSO_DLFCN is defined, the standard dlfcn.h-style functions | ||
| 182 | * (dlopen, dlclose, dlsym, etc) will be used and incorporated into | ||
| 183 | * this method. If not, this method will return NULL. */ | ||
| 184 | DSO_METHOD *DSO_METHOD_dlfcn(void); | ||
| 185 | |||
| 186 | /* If DSO_DL is defined, the standard dl.h-style functions (shl_load, | ||
| 187 | * shl_unload, shl_findsym, etc) will be used and incorporated into | ||
| 188 | * this method. If not, this method will return NULL. */ | ||
| 189 | DSO_METHOD *DSO_METHOD_dl(void); | ||
| 190 | |||
| 191 | /* If WIN32 is defined, use DLLs. If not, return NULL. */ | ||
| 192 | DSO_METHOD *DSO_METHOD_win32(void); | ||
| 193 | |||
| 194 | /* If VMS is defined, use shared images. If not, return NULL. */ | ||
| 195 | DSO_METHOD *DSO_METHOD_vms(void); | ||
| 196 | |||
| 197 | void ERR_load_DSO_strings(void); | ||
| 198 | |||
| 199 | /* BEGIN ERROR CODES */ | ||
| 200 | /* The following lines are auto generated by the script mkerr.pl. Any changes | ||
| 201 | * made after this point may be overwritten when the script is next run. | ||
| 202 | */ | ||
| 203 | |||
| 204 | /* Error codes for the DSO functions. */ | ||
| 205 | |||
| 206 | /* Function codes. */ | ||
| 207 | #define DSO_F_DLFCN_BIND_FUNC 100 | ||
| 208 | #define DSO_F_DLFCN_BIND_VAR 101 | ||
| 209 | #define DSO_F_DLFCN_CTRL 102 | ||
| 210 | #define DSO_F_DLFCN_LOAD 103 | ||
| 211 | #define DSO_F_DLFCN_UNLOAD 104 | ||
| 212 | #define DSO_F_DL_BIND_FUNC 105 | ||
| 213 | #define DSO_F_DL_BIND_VAR 106 | ||
| 214 | #define DSO_F_DL_CTRL 107 | ||
| 215 | #define DSO_F_DL_LOAD 108 | ||
| 216 | #define DSO_F_DL_UNLOAD 109 | ||
| 217 | #define DSO_F_DSO_BIND_FUNC 110 | ||
| 218 | #define DSO_F_DSO_BIND_VAR 111 | ||
| 219 | #define DSO_F_DSO_CTRL 112 | ||
| 220 | #define DSO_F_DSO_FREE 113 | ||
| 221 | #define DSO_F_DSO_LOAD 114 | ||
| 222 | #define DSO_F_DSO_NEW_METHOD 115 | ||
| 223 | #define DSO_F_DSO_UP 116 | ||
| 224 | #define DSO_F_VMS_BIND_VAR 122 | ||
| 225 | #define DSO_F_VMS_CTRL 123 | ||
| 226 | #define DSO_F_VMS_LOAD 124 | ||
| 227 | #define DSO_F_VMS_UNLOAD 125 | ||
| 228 | #define DSO_F_WIN32_BIND_FUNC 117 | ||
| 229 | #define DSO_F_WIN32_BIND_VAR 118 | ||
| 230 | #define DSO_F_WIN32_CTRL 119 | ||
| 231 | #define DSO_F_WIN32_LOAD 120 | ||
| 232 | #define DSO_F_WIN32_UNLOAD 121 | ||
| 233 | |||
| 234 | /* Reason codes. */ | ||
| 235 | #define DSO_R_CTRL_FAILED 100 | ||
| 236 | #define DSO_R_FILENAME_TOO_BIG 109 | ||
| 237 | #define DSO_R_FINISH_FAILED 101 | ||
| 238 | #define DSO_R_LOAD_FAILED 102 | ||
| 239 | #define DSO_R_NULL_HANDLE 103 | ||
| 240 | #define DSO_R_STACK_ERROR 104 | ||
| 241 | #define DSO_R_SYM_FAILURE 105 | ||
| 242 | #define DSO_R_UNKNOWN_COMMAND 106 | ||
| 243 | #define DSO_R_UNLOAD_FAILED 107 | ||
| 244 | #define DSO_R_UNSUPPORTED 108 | ||
| 245 | |||
| 246 | #ifdef __cplusplus | ||
| 247 | } | ||
| 248 | #endif | ||
| 249 | #endif | ||
| 250 | |||
diff --git a/src/lib/libcrypto/dso/dso_dlfcn.c b/src/lib/libcrypto/dso/dso_dlfcn.c deleted file mode 100644 index e709c721cc..0000000000 --- a/src/lib/libcrypto/dso/dso_dlfcn.c +++ /dev/null | |||
| @@ -1,276 +0,0 @@ | |||
| 1 | /* dso_dlfcn.c */ | ||
| 2 | /* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL | ||
| 3 | * project 2000. | ||
| 4 | */ | ||
| 5 | /* ==================================================================== | ||
| 6 | * Copyright (c) 2000 The OpenSSL Project. All rights reserved. | ||
| 7 | * | ||
| 8 | * Redistribution and use in source and binary forms, with or without | ||
| 9 | * modification, are permitted provided that the following conditions | ||
| 10 | * are met: | ||
| 11 | * | ||
| 12 | * 1. Redistributions of source code must retain the above copyright | ||
| 13 | * notice, this list of conditions and the following disclaimer. | ||
| 14 | * | ||
| 15 | * 2. Redistributions in binary form must reproduce the above copyright | ||
| 16 | * notice, this list of conditions and the following disclaimer in | ||
| 17 | * the documentation and/or other materials provided with the | ||
| 18 | * distribution. | ||
| 19 | * | ||
| 20 | * 3. All advertising materials mentioning features or use of this | ||
| 21 | * software must display the following acknowledgment: | ||
| 22 | * "This product includes software developed by the OpenSSL Project | ||
| 23 | * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)" | ||
| 24 | * | ||
| 25 | * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to | ||
| 26 | * endorse or promote products derived from this software without | ||
| 27 | * prior written permission. For written permission, please contact | ||
| 28 | * licensing@OpenSSL.org. | ||
| 29 | * | ||
| 30 | * 5. Products derived from this software may not be called "OpenSSL" | ||
| 31 | * nor may "OpenSSL" appear in their names without prior written | ||
| 32 | * permission of the OpenSSL Project. | ||
| 33 | * | ||
| 34 | * 6. Redistributions of any form whatsoever must retain the following | ||
| 35 | * acknowledgment: | ||
| 36 | * "This product includes software developed by the OpenSSL Project | ||
| 37 | * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)" | ||
| 38 | * | ||
| 39 | * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY | ||
| 40 | * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| 41 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | ||
| 42 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR | ||
| 43 | * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
| 44 | * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
| 45 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
| 46 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
| 47 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, | ||
| 48 | * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
| 49 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED | ||
| 50 | * OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| 51 | * ==================================================================== | ||
| 52 | * | ||
| 53 | * This product includes cryptographic software written by Eric Young | ||
| 54 | * (eay@cryptsoft.com). This product includes software written by Tim | ||
| 55 | * Hudson (tjh@cryptsoft.com). | ||
| 56 | * | ||
| 57 | */ | ||
| 58 | |||
| 59 | #include <stdio.h> | ||
| 60 | #include "cryptlib.h" | ||
| 61 | #include <openssl/dso.h> | ||
| 62 | |||
| 63 | #ifndef DSO_DLFCN | ||
| 64 | DSO_METHOD *DSO_METHOD_dlfcn(void) | ||
| 65 | { | ||
| 66 | return NULL; | ||
| 67 | } | ||
| 68 | #else | ||
| 69 | |||
| 70 | #ifdef HAVE_DLFCN_H | ||
| 71 | #include <dlfcn.h> | ||
| 72 | #endif | ||
| 73 | |||
| 74 | /* Part of the hack in "dlfcn_load" ... */ | ||
| 75 | #define DSO_MAX_TRANSLATED_SIZE 256 | ||
| 76 | |||
| 77 | static int dlfcn_load(DSO *dso, const char *filename); | ||
| 78 | static int dlfcn_unload(DSO *dso); | ||
| 79 | static void *dlfcn_bind_var(DSO *dso, const char *symname); | ||
| 80 | static DSO_FUNC_TYPE dlfcn_bind_func(DSO *dso, const char *symname); | ||
| 81 | #if 0 | ||
| 82 | static int dlfcn_unbind(DSO *dso, char *symname, void *symptr); | ||
| 83 | static int dlfcn_init(DSO *dso); | ||
| 84 | static int dlfcn_finish(DSO *dso); | ||
| 85 | #endif | ||
| 86 | static long dlfcn_ctrl(DSO *dso, int cmd, long larg, void *parg); | ||
| 87 | |||
| 88 | static DSO_METHOD dso_meth_dlfcn = { | ||
| 89 | "OpenSSL 'dlfcn' shared library method", | ||
| 90 | dlfcn_load, | ||
| 91 | dlfcn_unload, | ||
| 92 | dlfcn_bind_var, | ||
| 93 | dlfcn_bind_func, | ||
| 94 | /* For now, "unbind" doesn't exist */ | ||
| 95 | #if 0 | ||
| 96 | NULL, /* unbind_var */ | ||
| 97 | NULL, /* unbind_func */ | ||
| 98 | #endif | ||
| 99 | dlfcn_ctrl, | ||
| 100 | NULL, /* init */ | ||
| 101 | NULL /* finish */ | ||
| 102 | }; | ||
| 103 | |||
| 104 | DSO_METHOD *DSO_METHOD_dlfcn(void) | ||
| 105 | { | ||
| 106 | return(&dso_meth_dlfcn); | ||
| 107 | } | ||
| 108 | |||
| 109 | /* Prior to using the dlopen() function, we should decide on the flag | ||
| 110 | * we send. There's a few different ways of doing this and it's a | ||
| 111 | * messy venn-diagram to match up which platforms support what. So | ||
| 112 | * as we don't have autoconf yet, I'm implementing a hack that could | ||
| 113 | * be hacked further relatively easily to deal with cases as we find | ||
| 114 | * them. Initially this is to cope with OpenBSD. */ | ||
| 115 | #ifdef __OpenBSD__ | ||
| 116 | # ifdef DL_LAZY | ||
| 117 | # define DLOPEN_FLAG DL_LAZY | ||
| 118 | # else | ||
| 119 | # ifdef RTLD_NOW | ||
| 120 | # define DLOPEN_FLAG RTLD_NOW | ||
| 121 | # else | ||
| 122 | # define DLOPEN_FLAG 0 | ||
| 123 | # endif | ||
| 124 | # endif | ||
| 125 | #else | ||
| 126 | # define DLOPEN_FLAG RTLD_NOW /* Hope this works everywhere else */ | ||
| 127 | #endif | ||
| 128 | |||
| 129 | /* For this DSO_METHOD, our meth_data STACK will contain; | ||
| 130 | * (i) the handle (void*) returned from dlopen(). | ||
| 131 | */ | ||
| 132 | |||
| 133 | static int dlfcn_load(DSO *dso, const char *filename) | ||
| 134 | { | ||
| 135 | void *ptr; | ||
| 136 | char translated[DSO_MAX_TRANSLATED_SIZE]; | ||
| 137 | int len; | ||
| 138 | |||
| 139 | /* NB: This is a hideous hack, but I'm not yet sure what | ||
| 140 | * to replace it with. This attempts to convert any filename, | ||
| 141 | * that looks like it has no path information, into a | ||
| 142 | * translated form, e. "blah" -> "libblah.so" */ | ||
| 143 | len = strlen(filename); | ||
| 144 | if((dso->flags & DSO_FLAG_NAME_TRANSLATION) && | ||
| 145 | (len + 6 < DSO_MAX_TRANSLATED_SIZE) && | ||
| 146 | (strstr(filename, "/") == NULL)) | ||
| 147 | { | ||
| 148 | sprintf(translated, "lib%s.so", filename); | ||
| 149 | ptr = dlopen(translated, DLOPEN_FLAG); | ||
| 150 | } | ||
| 151 | else | ||
| 152 | { | ||
| 153 | ptr = dlopen(filename, DLOPEN_FLAG); | ||
| 154 | } | ||
| 155 | if(ptr == NULL) | ||
| 156 | { | ||
| 157 | DSOerr(DSO_F_DLFCN_LOAD,DSO_R_LOAD_FAILED); | ||
| 158 | return(0); | ||
| 159 | } | ||
| 160 | if(!sk_push(dso->meth_data, (char *)ptr)) | ||
| 161 | { | ||
| 162 | DSOerr(DSO_F_DLFCN_LOAD,DSO_R_STACK_ERROR); | ||
| 163 | dlclose(ptr); | ||
| 164 | return(0); | ||
| 165 | } | ||
| 166 | return(1); | ||
| 167 | } | ||
| 168 | |||
| 169 | static int dlfcn_unload(DSO *dso) | ||
| 170 | { | ||
| 171 | void *ptr; | ||
| 172 | if(dso == NULL) | ||
| 173 | { | ||
| 174 | DSOerr(DSO_F_DLFCN_UNLOAD,ERR_R_PASSED_NULL_PARAMETER); | ||
| 175 | return(0); | ||
| 176 | } | ||
| 177 | if(sk_num(dso->meth_data) < 1) | ||
| 178 | return(1); | ||
| 179 | ptr = (void *)sk_pop(dso->meth_data); | ||
| 180 | if(ptr == NULL) | ||
| 181 | { | ||
| 182 | DSOerr(DSO_F_DLFCN_UNLOAD,DSO_R_NULL_HANDLE); | ||
| 183 | /* Should push the value back onto the stack in | ||
| 184 | * case of a retry. */ | ||
| 185 | sk_push(dso->meth_data, (char *)ptr); | ||
| 186 | return(0); | ||
| 187 | } | ||
| 188 | /* For now I'm not aware of any errors associated with dlclose() */ | ||
| 189 | dlclose(ptr); | ||
| 190 | return(1); | ||
| 191 | } | ||
| 192 | |||
| 193 | static void *dlfcn_bind_var(DSO *dso, const char *symname) | ||
| 194 | { | ||
| 195 | void *ptr, *sym; | ||
| 196 | |||
| 197 | if((dso == NULL) || (symname == NULL)) | ||
| 198 | { | ||
| 199 | DSOerr(DSO_F_DLFCN_BIND_VAR,ERR_R_PASSED_NULL_PARAMETER); | ||
| 200 | return(NULL); | ||
| 201 | } | ||
| 202 | if(sk_num(dso->meth_data) < 1) | ||
| 203 | { | ||
| 204 | DSOerr(DSO_F_DLFCN_BIND_VAR,DSO_R_STACK_ERROR); | ||
| 205 | return(NULL); | ||
| 206 | } | ||
| 207 | ptr = (void *)sk_value(dso->meth_data, sk_num(dso->meth_data) - 1); | ||
| 208 | if(ptr == NULL) | ||
| 209 | { | ||
| 210 | DSOerr(DSO_F_DLFCN_BIND_VAR,DSO_R_NULL_HANDLE); | ||
| 211 | return(NULL); | ||
| 212 | } | ||
| 213 | sym = dlsym(ptr, symname); | ||
| 214 | if(sym == NULL) | ||
| 215 | { | ||
| 216 | DSOerr(DSO_F_DLFCN_BIND_VAR,DSO_R_SYM_FAILURE); | ||
| 217 | return(NULL); | ||
| 218 | } | ||
| 219 | return(sym); | ||
| 220 | } | ||
| 221 | |||
| 222 | static DSO_FUNC_TYPE dlfcn_bind_func(DSO *dso, const char *symname) | ||
| 223 | { | ||
| 224 | void *ptr; | ||
| 225 | DSO_FUNC_TYPE sym; | ||
| 226 | |||
| 227 | if((dso == NULL) || (symname == NULL)) | ||
| 228 | { | ||
| 229 | DSOerr(DSO_F_DLFCN_BIND_FUNC,ERR_R_PASSED_NULL_PARAMETER); | ||
| 230 | return(NULL); | ||
| 231 | } | ||
| 232 | if(sk_num(dso->meth_data) < 1) | ||
| 233 | { | ||
| 234 | DSOerr(DSO_F_DLFCN_BIND_FUNC,DSO_R_STACK_ERROR); | ||
| 235 | return(NULL); | ||
| 236 | } | ||
| 237 | ptr = (void *)sk_value(dso->meth_data, sk_num(dso->meth_data) - 1); | ||
| 238 | if(ptr == NULL) | ||
| 239 | { | ||
| 240 | DSOerr(DSO_F_DLFCN_BIND_FUNC,DSO_R_NULL_HANDLE); | ||
| 241 | return(NULL); | ||
| 242 | } | ||
| 243 | sym = (DSO_FUNC_TYPE)dlsym(ptr, symname); | ||
| 244 | if(sym == NULL) | ||
| 245 | { | ||
| 246 | DSOerr(DSO_F_DLFCN_BIND_FUNC,DSO_R_SYM_FAILURE); | ||
| 247 | return(NULL); | ||
| 248 | } | ||
| 249 | return(sym); | ||
| 250 | } | ||
| 251 | |||
| 252 | static long dlfcn_ctrl(DSO *dso, int cmd, long larg, void *parg) | ||
| 253 | { | ||
| 254 | if(dso == NULL) | ||
| 255 | { | ||
| 256 | DSOerr(DSO_F_DLFCN_CTRL,ERR_R_PASSED_NULL_PARAMETER); | ||
| 257 | return(-1); | ||
| 258 | } | ||
| 259 | switch(cmd) | ||
| 260 | { | ||
| 261 | case DSO_CTRL_GET_FLAGS: | ||
| 262 | return dso->flags; | ||
| 263 | case DSO_CTRL_SET_FLAGS: | ||
| 264 | dso->flags = (int)larg; | ||
| 265 | return(0); | ||
| 266 | case DSO_CTRL_OR_FLAGS: | ||
| 267 | dso->flags |= (int)larg; | ||
| 268 | return(0); | ||
| 269 | default: | ||
| 270 | break; | ||
| 271 | } | ||
| 272 | DSOerr(DSO_F_DLFCN_CTRL,DSO_R_UNKNOWN_COMMAND); | ||
| 273 | return(-1); | ||
| 274 | } | ||
| 275 | |||
| 276 | #endif /* DSO_DLFCN */ | ||
diff --git a/src/lib/libcrypto/dso/dso_err.c b/src/lib/libcrypto/dso/dso_err.c deleted file mode 100644 index a3d7321c9b..0000000000 --- a/src/lib/libcrypto/dso/dso_err.c +++ /dev/null | |||
| @@ -1,128 +0,0 @@ | |||
| 1 | /* crypto/dso/dso_err.c */ | ||
| 2 | /* ==================================================================== | ||
| 3 | * Copyright (c) 1999 The OpenSSL Project. All rights reserved. | ||
| 4 | * | ||
| 5 | * Redistribution and use in source and binary forms, with or without | ||
| 6 | * modification, are permitted provided that the following conditions | ||
| 7 | * are met: | ||
| 8 | * | ||
| 9 | * 1. Redistributions of source code must retain the above copyright | ||
| 10 | * notice, this list of conditions and the following disclaimer. | ||
| 11 | * | ||
| 12 | * 2. Redistributions in binary form must reproduce the above copyright | ||
| 13 | * notice, this list of conditions and the following disclaimer in | ||
| 14 | * the documentation and/or other materials provided with the | ||
| 15 | * distribution. | ||
| 16 | * | ||
| 17 | * 3. All advertising materials mentioning features or use of this | ||
| 18 | * software must display the following acknowledgment: | ||
| 19 | * "This product includes software developed by the OpenSSL Project | ||
| 20 | * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)" | ||
| 21 | * | ||
| 22 | * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to | ||
| 23 | * endorse or promote products derived from this software without | ||
| 24 | * prior written permission. For written permission, please contact | ||
| 25 | * openssl-core@OpenSSL.org. | ||
| 26 | * | ||
| 27 | * 5. Products derived from this software may not be called "OpenSSL" | ||
| 28 | * nor may "OpenSSL" appear in their names without prior written | ||
| 29 | * permission of the OpenSSL Project. | ||
| 30 | * | ||
| 31 | * 6. Redistributions of any form whatsoever must retain the following | ||
| 32 | * acknowledgment: | ||
| 33 | * "This product includes software developed by the OpenSSL Project | ||
| 34 | * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)" | ||
| 35 | * | ||
| 36 | * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY | ||
| 37 | * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| 38 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | ||
| 39 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR | ||
| 40 | * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
| 41 | * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
| 42 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
| 43 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
| 44 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, | ||
| 45 | * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
| 46 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED | ||
| 47 | * OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| 48 | * ==================================================================== | ||
| 49 | * | ||
| 50 | * This product includes cryptographic software written by Eric Young | ||
| 51 | * (eay@cryptsoft.com). This product includes software written by Tim | ||
| 52 | * Hudson (tjh@cryptsoft.com). | ||
| 53 | * | ||
| 54 | */ | ||
| 55 | |||
| 56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes | ||
| 57 | * made to it will be overwritten when the script next updates this file, | ||
| 58 | * only reason strings will be preserved. | ||
| 59 | */ | ||
| 60 | |||
| 61 | #include <stdio.h> | ||
| 62 | #include <openssl/err.h> | ||
| 63 | #include <openssl/dso.h> | ||
| 64 | |||
| 65 | /* BEGIN ERROR CODES */ | ||
| 66 | #ifndef NO_ERR | ||
| 67 | static ERR_STRING_DATA DSO_str_functs[]= | ||
| 68 | { | ||
| 69 | {ERR_PACK(0,DSO_F_DLFCN_BIND_FUNC,0), "DLFCN_BIND_FUNC"}, | ||
| 70 | {ERR_PACK(0,DSO_F_DLFCN_BIND_VAR,0), "DLFCN_BIND_VAR"}, | ||
| 71 | {ERR_PACK(0,DSO_F_DLFCN_CTRL,0), "DLFCN_CTRL"}, | ||
| 72 | {ERR_PACK(0,DSO_F_DLFCN_LOAD,0), "DLFCN_LOAD"}, | ||
| 73 | {ERR_PACK(0,DSO_F_DLFCN_UNLOAD,0), "DLFCN_UNLOAD"}, | ||
| 74 | {ERR_PACK(0,DSO_F_DL_BIND_FUNC,0), "DL_BIND_FUNC"}, | ||
| 75 | {ERR_PACK(0,DSO_F_DL_BIND_VAR,0), "DL_BIND_VAR"}, | ||
| 76 | {ERR_PACK(0,DSO_F_DL_CTRL,0), "DL_CTRL"}, | ||
| 77 | {ERR_PACK(0,DSO_F_DL_LOAD,0), "DL_LOAD"}, | ||
| 78 | {ERR_PACK(0,DSO_F_DL_UNLOAD,0), "DL_UNLOAD"}, | ||
| 79 | {ERR_PACK(0,DSO_F_DSO_BIND_FUNC,0), "DSO_bind_func"}, | ||
| 80 | {ERR_PACK(0,DSO_F_DSO_BIND_VAR,0), "DSO_bind_var"}, | ||
| 81 | {ERR_PACK(0,DSO_F_DSO_CTRL,0), "DSO_ctrl"}, | ||
| 82 | {ERR_PACK(0,DSO_F_DSO_FREE,0), "DSO_free"}, | ||
| 83 | {ERR_PACK(0,DSO_F_DSO_LOAD,0), "DSO_load"}, | ||
| 84 | {ERR_PACK(0,DSO_F_DSO_NEW_METHOD,0), "DSO_new_method"}, | ||
| 85 | {ERR_PACK(0,DSO_F_DSO_UP,0), "DSO_up"}, | ||
| 86 | {ERR_PACK(0,DSO_F_VMS_BIND_VAR,0), "VMS_BIND_VAR"}, | ||
| 87 | {ERR_PACK(0,DSO_F_VMS_CTRL,0), "VMS_CTRL"}, | ||
| 88 | {ERR_PACK(0,DSO_F_VMS_LOAD,0), "VMS_LOAD"}, | ||
| 89 | {ERR_PACK(0,DSO_F_VMS_UNLOAD,0), "VMS_UNLOAD"}, | ||
| 90 | {ERR_PACK(0,DSO_F_WIN32_BIND_FUNC,0), "WIN32_BIND_FUNC"}, | ||
| 91 | {ERR_PACK(0,DSO_F_WIN32_BIND_VAR,0), "WIN32_BIND_VAR"}, | ||
| 92 | {ERR_PACK(0,DSO_F_WIN32_CTRL,0), "WIN32_CTRL"}, | ||
| 93 | {ERR_PACK(0,DSO_F_WIN32_LOAD,0), "WIN32_LOAD"}, | ||
| 94 | {ERR_PACK(0,DSO_F_WIN32_UNLOAD,0), "WIN32_UNLOAD"}, | ||
| 95 | {0,NULL} | ||
| 96 | }; | ||
| 97 | |||
| 98 | static ERR_STRING_DATA DSO_str_reasons[]= | ||
| 99 | { | ||
| 100 | {DSO_R_CTRL_FAILED ,"control command failed"}, | ||
| 101 | {DSO_R_FILENAME_TOO_BIG ,"filename too big"}, | ||
| 102 | {DSO_R_FINISH_FAILED ,"cleanup method function failed"}, | ||
| 103 | {DSO_R_LOAD_FAILED ,"could not load the shared library"}, | ||
| 104 | {DSO_R_NULL_HANDLE ,"a null shared library handle was used"}, | ||
| 105 | {DSO_R_STACK_ERROR ,"the meth_data stack is corrupt"}, | ||
| 106 | {DSO_R_SYM_FAILURE ,"could not bind to the requested symbol name"}, | ||
| 107 | {DSO_R_UNKNOWN_COMMAND ,"unknown control command"}, | ||
| 108 | {DSO_R_UNLOAD_FAILED ,"could not unload the shared library"}, | ||
| 109 | {DSO_R_UNSUPPORTED ,"functionality not supported"}, | ||
| 110 | {0,NULL} | ||
| 111 | }; | ||
| 112 | |||
| 113 | #endif | ||
| 114 | |||
| 115 | void ERR_load_DSO_strings(void) | ||
| 116 | { | ||
| 117 | static int init=1; | ||
| 118 | |||
| 119 | if (init) | ||
| 120 | { | ||
| 121 | init=0; | ||
| 122 | #ifndef NO_ERR | ||
| 123 | ERR_load_strings(ERR_LIB_DSO,DSO_str_functs); | ||
| 124 | ERR_load_strings(ERR_LIB_DSO,DSO_str_reasons); | ||
| 125 | #endif | ||
| 126 | |||
| 127 | } | ||
| 128 | } | ||
diff --git a/src/lib/libcrypto/dso/dso_lib.c b/src/lib/libcrypto/dso/dso_lib.c deleted file mode 100644 index acd166697e..0000000000 --- a/src/lib/libcrypto/dso/dso_lib.c +++ /dev/null | |||
| @@ -1,306 +0,0 @@ | |||
| 1 | /* dso_lib.c */ | ||
| 2 | /* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL | ||
| 3 | * project 2000. | ||
| 4 | */ | ||
| 5 | /* ==================================================================== | ||
| 6 | * Copyright (c) 2000 The OpenSSL Project. All rights reserved. | ||
| 7 | * | ||
| 8 | * Redistribution and use in source and binary forms, with or without | ||
| 9 | * modification, are permitted provided that the following conditions | ||
| 10 | * are met: | ||
| 11 | * | ||
| 12 | * 1. Redistributions of source code must retain the above copyright | ||
| 13 | * notice, this list of conditions and the following disclaimer. | ||
| 14 | * | ||
| 15 | * 2. Redistributions in binary form must reproduce the above copyright | ||
| 16 | * notice, this list of conditions and the following disclaimer in | ||
| 17 | * the documentation and/or other materials provided with the | ||
| 18 | * distribution. | ||
| 19 | * | ||
| 20 | * 3. All advertising materials mentioning features or use of this | ||
| 21 | * software must display the following acknowledgment: | ||
| 22 | * "This product includes software developed by the OpenSSL Project | ||
| 23 | * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)" | ||
| 24 | * | ||
| 25 | * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to | ||
| 26 | * endorse or promote products derived from this software without | ||
| 27 | * prior written permission. For written permission, please contact | ||
| 28 | * licensing@OpenSSL.org. | ||
| 29 | * | ||
| 30 | * 5. Products derived from this software may not be called "OpenSSL" | ||
| 31 | * nor may "OpenSSL" appear in their names without prior written | ||
| 32 | * permission of the OpenSSL Project. | ||
| 33 | * | ||
| 34 | * 6. Redistributions of any form whatsoever must retain the following | ||
| 35 | * acknowledgment: | ||
| 36 | * "This product includes software developed by the OpenSSL Project | ||
| 37 | * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)" | ||
| 38 | * | ||
| 39 | * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY | ||
| 40 | * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| 41 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | ||
| 42 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR | ||
| 43 | * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
| 44 | * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
| 45 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
| 46 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
| 47 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, | ||
| 48 | * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
| 49 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED | ||
| 50 | * OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| 51 | * ==================================================================== | ||
| 52 | * | ||
| 53 | * This product includes cryptographic software written by Eric Young | ||
| 54 | * (eay@cryptsoft.com). This product includes software written by Tim | ||
| 55 | * Hudson (tjh@cryptsoft.com). | ||
| 56 | * | ||
| 57 | */ | ||
| 58 | |||
| 59 | #include <stdio.h> | ||
| 60 | #include <openssl/crypto.h> | ||
| 61 | #include "cryptlib.h" | ||
| 62 | #include <openssl/dso.h> | ||
| 63 | |||
| 64 | static DSO_METHOD *default_DSO_meth = NULL; | ||
| 65 | |||
| 66 | DSO *DSO_new(void) | ||
| 67 | { | ||
| 68 | return(DSO_new_method(NULL)); | ||
| 69 | } | ||
| 70 | |||
| 71 | void DSO_set_default_method(DSO_METHOD *meth) | ||
| 72 | { | ||
| 73 | default_DSO_meth = meth; | ||
| 74 | } | ||
| 75 | |||
| 76 | DSO_METHOD *DSO_get_default_method(void) | ||
| 77 | { | ||
| 78 | return(default_DSO_meth); | ||
| 79 | } | ||
| 80 | |||
| 81 | DSO_METHOD *DSO_get_method(DSO *dso) | ||
| 82 | { | ||
| 83 | return(dso->meth); | ||
| 84 | } | ||
| 85 | |||
| 86 | DSO_METHOD *DSO_set_method(DSO *dso, DSO_METHOD *meth) | ||
| 87 | { | ||
| 88 | DSO_METHOD *mtmp; | ||
| 89 | mtmp = dso->meth; | ||
| 90 | dso->meth = meth; | ||
| 91 | return(mtmp); | ||
| 92 | } | ||
| 93 | |||
| 94 | DSO *DSO_new_method(DSO_METHOD *meth) | ||
| 95 | { | ||
| 96 | DSO *ret; | ||
| 97 | |||
| 98 | if(default_DSO_meth == NULL) | ||
| 99 | /* We default to DSO_METH_openssl() which in turn defaults | ||
| 100 | * to stealing the "best available" method. Will fallback | ||
| 101 | * to DSO_METH_null() in the worst case. */ | ||
| 102 | default_DSO_meth = DSO_METHOD_openssl(); | ||
| 103 | ret = (DSO *)OPENSSL_malloc(sizeof(DSO)); | ||
| 104 | if(ret == NULL) | ||
| 105 | { | ||
| 106 | DSOerr(DSO_F_DSO_NEW_METHOD,ERR_R_MALLOC_FAILURE); | ||
| 107 | return(NULL); | ||
| 108 | } | ||
| 109 | memset(ret, 0, sizeof(DSO)); | ||
| 110 | ret->meth_data = sk_new_null(); | ||
| 111 | if((ret->meth_data = sk_new_null()) == NULL) | ||
| 112 | { | ||
| 113 | /* sk_new doesn't generate any errors so we do */ | ||
| 114 | DSOerr(DSO_F_DSO_NEW_METHOD,ERR_R_MALLOC_FAILURE); | ||
| 115 | OPENSSL_free(ret); | ||
| 116 | return(NULL); | ||
| 117 | } | ||
| 118 | if(meth == NULL) | ||
| 119 | ret->meth = default_DSO_meth; | ||
| 120 | else | ||
| 121 | ret->meth = meth; | ||
| 122 | ret->references = 1; | ||
| 123 | if((ret->meth->init != NULL) && !ret->meth->init(ret)) | ||
| 124 | { | ||
| 125 | OPENSSL_free(ret); | ||
| 126 | ret=NULL; | ||
| 127 | } | ||
| 128 | return(ret); | ||
| 129 | } | ||
| 130 | |||
| 131 | int DSO_free(DSO *dso) | ||
| 132 | { | ||
| 133 | int i; | ||
| 134 | |||
| 135 | if(dso == NULL) | ||
| 136 | { | ||
| 137 | DSOerr(DSO_F_DSO_FREE,ERR_R_PASSED_NULL_PARAMETER); | ||
| 138 | return(0); | ||
| 139 | } | ||
| 140 | |||
| 141 | i=CRYPTO_add(&dso->references,-1,CRYPTO_LOCK_DSO); | ||
| 142 | #ifdef REF_PRINT | ||
| 143 | REF_PRINT("DSO",dso); | ||
| 144 | #endif | ||
| 145 | if(i > 0) return(1); | ||
| 146 | #ifdef REF_CHECK | ||
| 147 | if(i < 0) | ||
| 148 | { | ||
| 149 | fprintf(stderr,"DSO_free, bad reference count\n"); | ||
| 150 | abort(); | ||
| 151 | } | ||
| 152 | #endif | ||
| 153 | |||
| 154 | if((dso->meth->dso_unload != NULL) && !dso->meth->dso_unload(dso)) | ||
| 155 | { | ||
| 156 | DSOerr(DSO_F_DSO_FREE,DSO_R_UNLOAD_FAILED); | ||
| 157 | return(0); | ||
| 158 | } | ||
| 159 | |||
| 160 | if((dso->meth->finish != NULL) && !dso->meth->finish(dso)) | ||
| 161 | { | ||
| 162 | DSOerr(DSO_F_DSO_FREE,DSO_R_FINISH_FAILED); | ||
| 163 | return(0); | ||
| 164 | } | ||
| 165 | |||
| 166 | sk_free(dso->meth_data); | ||
| 167 | |||
| 168 | OPENSSL_free(dso); | ||
| 169 | return(1); | ||
| 170 | } | ||
| 171 | |||
| 172 | int DSO_flags(DSO *dso) | ||
| 173 | { | ||
| 174 | return((dso == NULL) ? 0 : dso->flags); | ||
| 175 | } | ||
| 176 | |||
| 177 | |||
| 178 | int DSO_up(DSO *dso) | ||
| 179 | { | ||
| 180 | if (dso == NULL) | ||
| 181 | { | ||
| 182 | DSOerr(DSO_F_DSO_UP,ERR_R_PASSED_NULL_PARAMETER); | ||
| 183 | return(0); | ||
| 184 | } | ||
| 185 | |||
| 186 | CRYPTO_add(&dso->references,1,CRYPTO_LOCK_DSO); | ||
| 187 | return(1); | ||
| 188 | } | ||
| 189 | |||
| 190 | DSO *DSO_load(DSO *dso, const char *filename, DSO_METHOD *meth, int flags) | ||
| 191 | { | ||
| 192 | DSO *ret; | ||
| 193 | int allocated = 0; | ||
| 194 | |||
| 195 | if(filename == NULL) | ||
| 196 | { | ||
| 197 | DSOerr(DSO_F_DSO_LOAD,ERR_R_PASSED_NULL_PARAMETER); | ||
| 198 | return(NULL); | ||
| 199 | } | ||
| 200 | if(dso == NULL) | ||
| 201 | { | ||
| 202 | ret = DSO_new_method(meth); | ||
| 203 | if(ret == NULL) | ||
| 204 | { | ||
| 205 | DSOerr(DSO_F_DSO_LOAD,ERR_R_MALLOC_FAILURE); | ||
| 206 | return(NULL); | ||
| 207 | } | ||
| 208 | allocated = 1; | ||
| 209 | } | ||
| 210 | else | ||
| 211 | ret = dso; | ||
| 212 | /* Bleurgh ... have to check for negative return values for | ||
| 213 | * errors. <grimace> */ | ||
| 214 | if(DSO_ctrl(ret, DSO_CTRL_SET_FLAGS, flags, NULL) < 0) | ||
| 215 | { | ||
| 216 | DSOerr(DSO_F_DSO_LOAD,DSO_R_CTRL_FAILED); | ||
| 217 | if(allocated) | ||
| 218 | DSO_free(ret); | ||
| 219 | return(NULL); | ||
| 220 | } | ||
| 221 | if(ret->meth->dso_load == NULL) | ||
| 222 | { | ||
| 223 | DSOerr(DSO_F_DSO_LOAD,DSO_R_UNSUPPORTED); | ||
| 224 | if(allocated) | ||
| 225 | DSO_free(ret); | ||
| 226 | return(NULL); | ||
| 227 | } | ||
| 228 | if(!ret->meth->dso_load(ret, filename)) | ||
| 229 | { | ||
| 230 | DSOerr(DSO_F_DSO_LOAD,DSO_R_LOAD_FAILED); | ||
| 231 | if(allocated) | ||
| 232 | DSO_free(ret); | ||
| 233 | return(NULL); | ||
| 234 | } | ||
| 235 | /* Load succeeded */ | ||
| 236 | return(ret); | ||
| 237 | } | ||
| 238 | |||
| 239 | void *DSO_bind_var(DSO *dso, const char *symname) | ||
| 240 | { | ||
| 241 | void *ret = NULL; | ||
| 242 | |||
| 243 | if((dso == NULL) || (symname == NULL)) | ||
| 244 | { | ||
| 245 | DSOerr(DSO_F_DSO_BIND_VAR,ERR_R_PASSED_NULL_PARAMETER); | ||
| 246 | return(NULL); | ||
| 247 | } | ||
| 248 | if(dso->meth->dso_bind_var == NULL) | ||
| 249 | { | ||
| 250 | DSOerr(DSO_F_DSO_BIND_VAR,DSO_R_UNSUPPORTED); | ||
| 251 | return(NULL); | ||
| 252 | } | ||
| 253 | if((ret = dso->meth->dso_bind_var(dso, symname)) == NULL) | ||
| 254 | { | ||
| 255 | DSOerr(DSO_F_DSO_BIND_VAR,DSO_R_SYM_FAILURE); | ||
| 256 | return(NULL); | ||
| 257 | } | ||
| 258 | /* Success */ | ||
| 259 | return(ret); | ||
| 260 | } | ||
| 261 | |||
| 262 | DSO_FUNC_TYPE DSO_bind_func(DSO *dso, const char *symname) | ||
| 263 | { | ||
| 264 | DSO_FUNC_TYPE ret = NULL; | ||
| 265 | |||
| 266 | if((dso == NULL) || (symname == NULL)) | ||
| 267 | { | ||
| 268 | DSOerr(DSO_F_DSO_BIND_FUNC,ERR_R_PASSED_NULL_PARAMETER); | ||
| 269 | return(NULL); | ||
| 270 | } | ||
| 271 | if(dso->meth->dso_bind_func == NULL) | ||
| 272 | { | ||
| 273 | DSOerr(DSO_F_DSO_BIND_FUNC,DSO_R_UNSUPPORTED); | ||
| 274 | return(NULL); | ||
| 275 | } | ||
| 276 | if((ret = dso->meth->dso_bind_func(dso, symname)) == NULL) | ||
| 277 | { | ||
| 278 | DSOerr(DSO_F_DSO_BIND_FUNC,DSO_R_SYM_FAILURE); | ||
| 279 | return(NULL); | ||
| 280 | } | ||
| 281 | /* Success */ | ||
| 282 | return(ret); | ||
| 283 | } | ||
| 284 | |||
| 285 | /* I don't really like these *_ctrl functions very much to be perfectly | ||
| 286 | * honest. For one thing, I think I have to return a negative value for | ||
| 287 | * any error because possible DSO_ctrl() commands may return values | ||
| 288 | * such as "size"s that can legitimately be zero (making the standard | ||
| 289 | * "if(DSO_cmd(...))" form that works almost everywhere else fail at | ||
| 290 | * odd times. I'd prefer "output" values to be passed by reference and | ||
| 291 | * the return value as success/failure like usual ... but we conform | ||
| 292 | * when we must... :-) */ | ||
| 293 | long DSO_ctrl(DSO *dso, int cmd, long larg, void *parg) | ||
| 294 | { | ||
| 295 | if(dso == NULL) | ||
| 296 | { | ||
| 297 | DSOerr(DSO_F_DSO_CTRL,ERR_R_PASSED_NULL_PARAMETER); | ||
| 298 | return(-1); | ||
| 299 | } | ||
| 300 | if((dso->meth == NULL) || (dso->meth->dso_ctrl == NULL)) | ||
| 301 | { | ||
| 302 | DSOerr(DSO_F_DSO_CTRL,DSO_R_UNSUPPORTED); | ||
| 303 | return(-1); | ||
| 304 | } | ||
| 305 | return(dso->meth->dso_ctrl(dso,cmd,larg,parg)); | ||
| 306 | } | ||
diff --git a/src/lib/libcrypto/dso/dso_null.c b/src/lib/libcrypto/dso/dso_null.c deleted file mode 100644 index fa13a7cb0f..0000000000 --- a/src/lib/libcrypto/dso/dso_null.c +++ /dev/null | |||
| @@ -1,86 +0,0 @@ | |||
| 1 | /* dso_null.c */ | ||
| 2 | /* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL | ||
| 3 | * project 2000. | ||
| 4 | */ | ||
| 5 | /* ==================================================================== | ||
| 6 | * Copyright (c) 2000 The OpenSSL Project. All rights reserved. | ||
| 7 | * | ||
| 8 | * Redistribution and use in source and binary forms, with or without | ||
| 9 | * modification, are permitted provided that the following conditions | ||
| 10 | * are met: | ||
| 11 | * | ||
| 12 | * 1. Redistributions of source code must retain the above copyright | ||
| 13 | * notice, this list of conditions and the following disclaimer. | ||
| 14 | * | ||
| 15 | * 2. Redistributions in binary form must reproduce the above copyright | ||
| 16 | * notice, this list of conditions and the following disclaimer in | ||
| 17 | * the documentation and/or other materials provided with the | ||
| 18 | * distribution. | ||
| 19 | * | ||
| 20 | * 3. All advertising materials mentioning features or use of this | ||
| 21 | * software must display the following acknowledgment: | ||
| 22 | * "This product includes software developed by the OpenSSL Project | ||
| 23 | * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)" | ||
| 24 | * | ||
| 25 | * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to | ||
| 26 | * endorse or promote products derived from this software without | ||
| 27 | * prior written permission. For written permission, please contact | ||
| 28 | * licensing@OpenSSL.org. | ||
| 29 | * | ||
| 30 | * 5. Products derived from this software may not be called "OpenSSL" | ||
| 31 | * nor may "OpenSSL" appear in their names without prior written | ||
| 32 | * permission of the OpenSSL Project. | ||
| 33 | * | ||
| 34 | * 6. Redistributions of any form whatsoever must retain the following | ||
| 35 | * acknowledgment: | ||
| 36 | * "This product includes software developed by the OpenSSL Project | ||
| 37 | * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)" | ||
| 38 | * | ||
| 39 | * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY | ||
| 40 | * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| 41 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | ||
| 42 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR | ||
| 43 | * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
| 44 | * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
| 45 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
| 46 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
| 47 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, | ||
| 48 | * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
| 49 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED | ||
| 50 | * OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| 51 | * ==================================================================== | ||
| 52 | * | ||
| 53 | * This product includes cryptographic software written by Eric Young | ||
| 54 | * (eay@cryptsoft.com). This product includes software written by Tim | ||
| 55 | * Hudson (tjh@cryptsoft.com). | ||
| 56 | * | ||
| 57 | */ | ||
| 58 | |||
| 59 | /* This "NULL" method is provided as the fallback for systems that have | ||
| 60 | * no appropriate support for "shared-libraries". */ | ||
| 61 | |||
| 62 | #include <stdio.h> | ||
| 63 | #include "cryptlib.h" | ||
| 64 | #include <openssl/dso.h> | ||
| 65 | |||
| 66 | static DSO_METHOD dso_meth_null = { | ||
| 67 | "NULL shared library method", | ||
| 68 | NULL, /* load */ | ||
| 69 | NULL, /* unload */ | ||
| 70 | NULL, /* bind_var */ | ||
| 71 | NULL, /* bind_func */ | ||
| 72 | /* For now, "unbind" doesn't exist */ | ||
| 73 | #if 0 | ||
| 74 | NULL, /* unbind_var */ | ||
| 75 | NULL, /* unbind_func */ | ||
| 76 | #endif | ||
| 77 | NULL, /* ctrl */ | ||
| 78 | NULL, /* init */ | ||
| 79 | NULL /* finish */ | ||
| 80 | }; | ||
| 81 | |||
| 82 | DSO_METHOD *DSO_METHOD_null(void) | ||
| 83 | { | ||
| 84 | return(&dso_meth_null); | ||
| 85 | } | ||
| 86 | |||
diff --git a/src/lib/libcrypto/dso/dso_openssl.c b/src/lib/libcrypto/dso/dso_openssl.c deleted file mode 100644 index a4395ebffe..0000000000 --- a/src/lib/libcrypto/dso/dso_openssl.c +++ /dev/null | |||
| @@ -1,81 +0,0 @@ | |||
| 1 | /* dso_openssl.c */ | ||
| 2 | /* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL | ||
| 3 | * project 2000. | ||
| 4 | */ | ||
| 5 | /* ==================================================================== | ||
| 6 | * Copyright (c) 2000 The OpenSSL Project. All rights reserved. | ||
| 7 | * | ||
| 8 | * Redistribution and use in source and binary forms, with or without | ||
| 9 | * modification, are permitted provided that the following conditions | ||
| 10 | * are met: | ||
| 11 | * | ||
| 12 | * 1. Redistributions of source code must retain the above copyright | ||
| 13 | * notice, this list of conditions and the following disclaimer. | ||
| 14 | * | ||
| 15 | * 2. Redistributions in binary form must reproduce the above copyright | ||
| 16 | * notice, this list of conditions and the following disclaimer in | ||
| 17 | * the documentation and/or other materials provided with the | ||
| 18 | * distribution. | ||
| 19 | * | ||
| 20 | * 3. All advertising materials mentioning features or use of this | ||
| 21 | * software must display the following acknowledgment: | ||
| 22 | * "This product includes software developed by the OpenSSL Project | ||
| 23 | * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)" | ||
| 24 | * | ||
| 25 | * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to | ||
| 26 | * endorse or promote products derived from this software without | ||
| 27 | * prior written permission. For written permission, please contact | ||
| 28 | * licensing@OpenSSL.org. | ||
| 29 | * | ||
| 30 | * 5. Products derived from this software may not be called "OpenSSL" | ||
| 31 | * nor may "OpenSSL" appear in their names without prior written | ||
| 32 | * permission of the OpenSSL Project. | ||
| 33 | * | ||
| 34 | * 6. Redistributions of any form whatsoever must retain the following | ||
| 35 | * acknowledgment: | ||
| 36 | * "This product includes software developed by the OpenSSL Project | ||
| 37 | * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)" | ||
| 38 | * | ||
| 39 | * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY | ||
| 40 | * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| 41 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | ||
| 42 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR | ||
| 43 | * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
| 44 | * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
| 45 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
| 46 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
| 47 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, | ||
| 48 | * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
| 49 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED | ||
| 50 | * OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| 51 | * ==================================================================== | ||
| 52 | * | ||
| 53 | * This product includes cryptographic software written by Eric Young | ||
| 54 | * (eay@cryptsoft.com). This product includes software written by Tim | ||
| 55 | * Hudson (tjh@cryptsoft.com). | ||
| 56 | * | ||
| 57 | */ | ||
| 58 | |||
| 59 | #include <stdio.h> | ||
| 60 | #include "cryptlib.h" | ||
| 61 | #include <openssl/dso.h> | ||
| 62 | |||
| 63 | /* We just pinch the method from an appropriate "default" method. */ | ||
| 64 | |||
| 65 | DSO_METHOD *DSO_METHOD_openssl(void) | ||
| 66 | { | ||
| 67 | #ifdef DEF_DSO_METHOD | ||
| 68 | return(DEF_DSO_METHOD()); | ||
| 69 | #elif defined(DSO_DLFCN) | ||
| 70 | return(DSO_METHOD_dlfcn()); | ||
| 71 | #elif defined(DSO_DL) | ||
| 72 | return(DSO_METHOD_dl()); | ||
| 73 | #elif defined(DSO_WIN32) | ||
| 74 | return(DSO_METHOD_win32()); | ||
| 75 | #elif defined(DSO_VMS) | ||
| 76 | return(DSO_METHOD_vms()); | ||
| 77 | #else | ||
| 78 | return(DSO_METHOD_null()); | ||
| 79 | #endif | ||
| 80 | } | ||
| 81 | |||
