diff options
Diffstat (limited to 'src/lib/libcrypto/dso')
| -rw-r--r-- | src/lib/libcrypto/dso/dso.h | 12 | ||||
| -rw-r--r-- | src/lib/libcrypto/dso/dso_dlfcn.c | 8 |
2 files changed, 2 insertions, 18 deletions
diff --git a/src/lib/libcrypto/dso/dso.h b/src/lib/libcrypto/dso/dso.h index 52d391c0a4..42de08089e 100644 --- a/src/lib/libcrypto/dso/dso.h +++ b/src/lib/libcrypto/dso/dso.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: dso.h,v 1.10 2014/08/14 17:55:28 tobias Exp $ */ | 1 | /* $OpenBSD: dso.h,v 1.11 2015/02/07 13:19:15 doug Exp $ */ |
| 2 | /* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL | 2 | /* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL |
| 3 | * project 2000. | 3 | * project 2000. |
| 4 | */ | 4 | */ |
| @@ -149,13 +149,6 @@ typedef struct dso_meth_st { | |||
| 149 | * alone a DSO_METHOD implemented for them. */ | 149 | * alone a DSO_METHOD implemented for them. */ |
| 150 | DSO_FUNC_TYPE (*dso_bind_func)(DSO *dso, const char *symname); | 150 | DSO_FUNC_TYPE (*dso_bind_func)(DSO *dso, const char *symname); |
| 151 | 151 | ||
| 152 | /* I don't think this would actually be used in any circumstances. */ | ||
| 153 | #if 0 | ||
| 154 | /* Unbinds a variable */ | ||
| 155 | int (*dso_unbind_var)(DSO *dso, char *symname, void *symptr); | ||
| 156 | /* Unbinds a function */ | ||
| 157 | int (*dso_unbind_func)(DSO *dso, char *symname, DSO_FUNC_TYPE symptr); | ||
| 158 | #endif | ||
| 159 | /* The generic (yuck) "ctrl()" function. NB: Negative return | 152 | /* The generic (yuck) "ctrl()" function. NB: Negative return |
| 160 | * values (rather than zero) indicate errors. */ | 153 | * values (rather than zero) indicate errors. */ |
| 161 | long (*dso_ctrl)(DSO *dso, int cmd, long larg, void *parg); | 154 | long (*dso_ctrl)(DSO *dso, int cmd, long larg, void *parg); |
| @@ -309,9 +302,6 @@ int DSO_pathbyaddr(void *addr, char *path, int sz); | |||
| 309 | * itself or libsocket. */ | 302 | * itself or libsocket. */ |
| 310 | void *DSO_global_lookup(const char *name); | 303 | void *DSO_global_lookup(const char *name); |
| 311 | 304 | ||
| 312 | /* If BeOS is defined, use shared images. If not, return NULL. */ | ||
| 313 | DSO_METHOD *DSO_METHOD_beos(void); | ||
| 314 | |||
| 315 | /* BEGIN ERROR CODES */ | 305 | /* BEGIN ERROR CODES */ |
| 316 | /* The following lines are auto generated by the script mkerr.pl. Any changes | 306 | /* The following lines are auto generated by the script mkerr.pl. Any changes |
| 317 | * made after this point may be overwritten when the script is next run. | 307 | * made after this point may be overwritten when the script is next run. |
diff --git a/src/lib/libcrypto/dso/dso_dlfcn.c b/src/lib/libcrypto/dso/dso_dlfcn.c index b75c9e23e0..f22e641bab 100644 --- a/src/lib/libcrypto/dso/dso_dlfcn.c +++ b/src/lib/libcrypto/dso/dso_dlfcn.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: dso_dlfcn.c,v 1.27 2014/07/11 08:44:48 jsing Exp $ */ | 1 | /* $OpenBSD: dso_dlfcn.c,v 1.28 2015/02/07 13:19:15 doug Exp $ */ |
| 2 | /* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL | 2 | /* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL |
| 3 | * project 2000. | 3 | * project 2000. |
| 4 | */ | 4 | */ |
| @@ -82,12 +82,6 @@ static int dlfcn_load(DSO *dso); | |||
| 82 | static int dlfcn_unload(DSO *dso); | 82 | static int dlfcn_unload(DSO *dso); |
| 83 | static void *dlfcn_bind_var(DSO *dso, const char *symname); | 83 | static void *dlfcn_bind_var(DSO *dso, const char *symname); |
| 84 | static DSO_FUNC_TYPE dlfcn_bind_func(DSO *dso, const char *symname); | 84 | static DSO_FUNC_TYPE dlfcn_bind_func(DSO *dso, const char *symname); |
| 85 | #if 0 | ||
| 86 | static int dlfcn_unbind(DSO *dso, char *symname, void *symptr); | ||
| 87 | static int dlfcn_init(DSO *dso); | ||
| 88 | static int dlfcn_finish(DSO *dso); | ||
| 89 | static long dlfcn_ctrl(DSO *dso, int cmd, long larg, void *parg); | ||
| 90 | #endif | ||
| 91 | static char *dlfcn_name_converter(DSO *dso, const char *filename); | 85 | static char *dlfcn_name_converter(DSO *dso, const char *filename); |
| 92 | static char *dlfcn_merger(DSO *dso, const char *filespec1, | 86 | static char *dlfcn_merger(DSO *dso, const char *filespec1, |
| 93 | const char *filespec2); | 87 | const char *filespec2); |
