diff options
author | Rich Salz <rsalz@openssl.org> | 2014-12-17 17:24:51 -0500 |
---|---|---|
committer | Rich Salz <rsalz@openssl.org> | 2014-12-17 17:24:51 -0500 |
commit | b317819b2e74f1f84925695596aa3c7487a2264d (patch) | |
tree | ea63fdae98feb3e02588d177d2b2d9897a14f473 /crypto | |
parent | 179f6b2f552adb2740f30634d75edc4448f516b5 (diff) | |
download | openssl-b317819b2e74f1f84925695596aa3c7487a2264d.tar.gz |
RT3548: Remove some obsolete platforms
This commit removes BEOS.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'crypto')
-rw-r--r-- | crypto/bio/b_sock.c | 4 | ||||
-rw-r--r-- | crypto/dso/Makefile | 12 | ||||
-rw-r--r-- | crypto/dso/dso_beos.c | 270 | ||||
-rw-r--r-- | crypto/dso/dso_openssl.c | 2 | ||||
-rw-r--r-- | crypto/rand/rand_egd.c | 2 | ||||
-rw-r--r-- | crypto/rand/rand_unix.c | 19 | ||||
-rw-r--r-- | crypto/thr_id.c | 4 | ||||
-rw-r--r-- | crypto/threads/mttest.c | 97 | ||||
-rw-r--r-- | crypto/ui/ui_openssl.c | 2 |
9 files changed, 5 insertions, 407 deletions
diff --git a/crypto/bio/b_sock.c b/crypto/bio/b_sock.c index a026b3e0b0..e96667d914 100644 --- a/crypto/bio/b_sock.c +++ b/crypto/bio/b_sock.c @@ -235,10 +235,6 @@ int BIO_sock_error(int sock) int j,i; union { size_t s; int i; } size; -#if defined(OPENSSL_SYS_BEOS_R5) - return 0; -#endif - /* heuristic way to adapt for platforms that expect 64-bit optlen */ size.s=0, size.i=sizeof(j); /* Note: under Windows the third parameter is of type (char *) diff --git a/crypto/dso/Makefile b/crypto/dso/Makefile index fb2709ed63..07f5d8d159 100644 --- a/crypto/dso/Makefile +++ b/crypto/dso/Makefile @@ -18,9 +18,9 @@ APPS= LIB=$(TOP)/libcrypto.a LIBSRC= dso_dl.c dso_dlfcn.c dso_err.c dso_lib.c dso_null.c \ - dso_openssl.c dso_win32.c dso_vms.c dso_beos.c + dso_openssl.c dso_win32.c dso_vms.c LIBOBJ= dso_dl.o dso_dlfcn.o dso_err.o dso_lib.o dso_null.o \ - dso_openssl.o dso_win32.o dso_vms.o dso_beos.o + dso_openssl.o dso_win32.o dso_vms.o SRC= $(LIBSRC) @@ -76,14 +76,6 @@ clean: # DO NOT DELETE THIS LINE -- make depend depends on it. -dso_beos.o: ../../e_os.h ../../include/openssl/bio.h -dso_beos.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -dso_beos.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h -dso_beos.o: ../../include/openssl/err.h ../../include/openssl/lhash.h -dso_beos.o: ../../include/openssl/opensslconf.h -dso_beos.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -dso_beos.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -dso_beos.o: ../../include/openssl/symhacks.h ../cryptlib.h dso_beos.c dso_dl.o: ../../e_os.h ../../include/openssl/bio.h dso_dl.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h dso_dl.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h diff --git a/crypto/dso/dso_beos.c b/crypto/dso/dso_beos.c deleted file mode 100644 index 553966e699..0000000000 --- a/crypto/dso/dso_beos.c +++ /dev/null @@ -1,270 +0,0 @@ -/* dso_beos.c */ -/* Written by Marcin Konicki (ahwayakchih@neoni.net) for the OpenSSL - * project 2000. - */ -/* ==================================================================== - * Copyright (c) 2000 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 - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. All advertising materials mentioning features or use of this - * software must display the following acknowledgment: - * "This product includes software developed by the OpenSSL Project - * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)" - * - * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to - * endorse or promote products derived from this software without - * prior written permission. For written permission, please contact - * licensing@OpenSSL.org. - * - * 5. Products derived from this software may not be called "OpenSSL" - * nor may "OpenSSL" appear in their names without prior written - * permission of the OpenSSL Project. - * - * 6. Redistributions of any form whatsoever must retain the following - * acknowledgment: - * "This product includes software developed by the OpenSSL Project - * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)" - * - * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY - * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. - * ==================================================================== - * - * This product includes cryptographic software written by Eric Young - * (eay@cryptsoft.com). This product includes software written by Tim - * Hudson (tjh@cryptsoft.com). - * - */ - -#include <stdio.h> -#include <string.h> -#include "cryptlib.h" -#include <openssl/dso.h> - -#if !defined(OPENSSL_SYS_BEOS) -DSO_METHOD *DSO_METHOD_beos(void) - { - return NULL; - } -#else - -#include <kernel/image.h> - -static int beos_load(DSO *dso); -static int beos_unload(DSO *dso); -static void *beos_bind_var(DSO *dso, const char *symname); -static DSO_FUNC_TYPE beos_bind_func(DSO *dso, const char *symname); -#if 0 -static int beos_unbind_var(DSO *dso, char *symname, void *symptr); -static int beos_unbind_func(DSO *dso, char *symname, DSO_FUNC_TYPE symptr); -static int beos_init(DSO *dso); -static int beos_finish(DSO *dso); -static long beos_ctrl(DSO *dso, int cmd, long larg, void *parg); -#endif -static char *beos_name_converter(DSO *dso, const char *filename); - -static DSO_METHOD dso_meth_beos = { - "OpenSSL 'beos' shared library method", - beos_load, - beos_unload, - beos_bind_var, - beos_bind_func, -/* For now, "unbind" doesn't exist */ -#if 0 - NULL, /* unbind_var */ - NULL, /* unbind_func */ -#endif - NULL, /* ctrl */ - beos_name_converter, - NULL, /* init */ - NULL /* finish */ - }; - -DSO_METHOD *DSO_METHOD_beos(void) - { - return(&dso_meth_beos); - } - -/* For this DSO_METHOD, our meth_data STACK will contain; - * (i) a pointer to the handle (image_id) returned from - * load_add_on(). - */ - -static int beos_load(DSO *dso) - { - image_id id; - /* See applicable comments from dso_dl.c */ - char *filename = DSO_convert_filename(dso, NULL); - - if(filename == NULL) - { - DSOerr(DSO_F_BEOS_LOAD,DSO_R_NO_FILENAME); - goto err; - } - id = load_add_on(filename); - if(id < 1) - { - DSOerr(DSO_F_BEOS_LOAD,DSO_R_LOAD_FAILED); - ERR_add_error_data(3, "filename(", filename, ")"); - goto err; - } - if(!sk_push(dso->meth_data, (char *)id)) - { - DSOerr(DSO_F_BEOS_LOAD,DSO_R_STACK_ERROR); - goto err; - } - /* Success */ - dso->loaded_filename = filename; - return(1); -err: - /* Cleanup !*/ - if(filename != NULL) - OPENSSL_free(filename); - if(id > 0) - unload_add_on(id); - return(0); - } - -static int beos_unload(DSO *dso) - { - image_id id; - if(dso == NULL) - { - DSOerr(DSO_F_BEOS_UNLOAD,ERR_R_PASSED_NULL_PARAMETER); - return(0); - } - if(sk_num(dso->meth_data) < 1) - return(1); - id = (image_id)sk_pop(dso->meth_data); - if(id < 1) - { - DSOerr(DSO_F_BEOS_UNLOAD,DSO_R_NULL_HANDLE); - return(0); - } - if(unload_add_on(id) != B_OK) - { - DSOerr(DSO_F_BEOS_UNLOAD,DSO_R_UNLOAD_FAILED); - /* We should push the value back onto the stack in - * case of a retry. */ - sk_push(dso->meth_data, (char *)id); - return(0); - } - return(1); - } - -static void *beos_bind_var(DSO *dso, const char *symname) - { - image_id id; - void *sym; - - if((dso == NULL) || (symname == NULL)) - { - DSOerr(DSO_F_BEOS_BIND_VAR,ERR_R_PASSED_NULL_PARAMETER); - return(NULL); - } - if(sk_num(dso->meth_data) < 1) - { - DSOerr(DSO_F_BEOS_BIND_VAR,DSO_R_STACK_ERROR); - return(NULL); - } - id = (image_id)sk_value(dso->meth_data, sk_num(dso->meth_data) - 1); - if(id < 1) - { - DSOerr(DSO_F_BEOS_BIND_VAR,DSO_R_NULL_HANDLE); - return(NULL); - } - if(get_image_symbol(id, symname, B_SYMBOL_TYPE_DATA, &sym) != B_OK) - { - DSOerr(DSO_F_BEOS_BIND_VAR,DSO_R_SYM_FAILURE); - ERR_add_error_data(3, "symname(", symname, ")"); - return(NULL); - } - return(sym); - } - -static DSO_FUNC_TYPE beos_bind_func(DSO *dso, const char *symname) - { - image_id id; - void *sym; - - if((dso == NULL) || (symname == NULL)) - { - DSOerr(DSO_F_BEOS_BIND_FUNC,ERR_R_PASSED_NULL_PARAMETER); - return(NULL); - } - if(sk_num(dso->meth_data) < 1) - { - DSOerr(DSO_F_BEOS_BIND_FUNC,DSO_R_STACK_ERROR); - return(NULL); - } - id = (image_id)sk_value(dso->meth_data, sk_num(dso->meth_data) - 1); - if(id < 1) - { - DSOerr(DSO_F_BEOS_BIND_FUNC,DSO_R_NULL_HANDLE); - return(NULL); - } - if(get_image_symbol(id, symname, B_SYMBOL_TYPE_TEXT, &sym) != B_OK) - { - DSOerr(DSO_F_BEOS_BIND_FUNC,DSO_R_SYM_FAILURE); - ERR_add_error_data(3, "symname(", symname, ")"); - return(NULL); - } - return((DSO_FUNC_TYPE)sym); - } - -/* This one is the same as the one in dlfcn */ -static char *beos_name_converter(DSO *dso, const char *filename) - { - char *translated; - int len, rsize, transform; - - len = strlen(filename); - rsize = len + 1; - transform = (strstr(filename, "/") == NULL); - if(transform) - { - /* We will convert this to "%s.so" or "lib%s.so" */ - rsize += 3; /* The length of ".so" */ - if ((DSO_flags(dso) & DSO_FLAG_NAME_TRANSLATION_EXT_ONLY) == 0) - rsize += 3; /* The length of "lib" */ - } - translated = OPENSSL_malloc(rsize); - if(translated == NULL) - { - DSOerr(DSO_F_BEOS_NAME_CONVERTER, - DSO_R_NAME_TRANSLATION_FAILED); - return(NULL); - } - if(transform) - { - if ((DSO_flags(dso) & DSO_FLAG_NAME_TRANSLATION_EXT_ONLY) == 0) - sprintf(translated, "lib%s.so", filename); - else - sprintf(translated, "%s.so", filename); - } - else - sprintf(translated, "%s", filename); - return(translated); - } - -#endif diff --git a/crypto/dso/dso_openssl.c b/crypto/dso/dso_openssl.c index b17e8e8e9e..a4395ebffe 100644 --- a/crypto/dso/dso_openssl.c +++ b/crypto/dso/dso_openssl.c @@ -74,8 +74,6 @@ DSO_METHOD *DSO_METHOD_openssl(void) return(DSO_METHOD_win32()); #elif defined(DSO_VMS) return(DSO_METHOD_vms()); -#elif defined(DSO_BEOS) - return(DSO_METHOD_beos()); #else return(DSO_METHOD_null()); #endif diff --git a/crypto/rand/rand_egd.c b/crypto/rand/rand_egd.c index 7351f4eade..0a74e40646 100644 --- a/crypto/rand/rand_egd.c +++ b/crypto/rand/rand_egd.c @@ -95,7 +95,7 @@ * RAND_egd() is a wrapper for RAND_egd_bytes() with numbytes=255. */ -#if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_VXWORKS) || defined(OPENSSL_SYS_NETWARE) || defined(OPENSSL_SYS_VOS) || defined(OPENSSL_SYS_BEOS) +#if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_VXWORKS) || defined(OPENSSL_SYS_NETWARE) || defined(OPENSSL_SYS_VOS) int RAND_query_egd_bytes(const char *path, unsigned char *buf, int bytes) { return(-1); diff --git a/crypto/rand/rand_unix.c b/crypto/rand/rand_unix.c index e3a65571c8..04fbc90b75 100644 --- a/crypto/rand/rand_unix.c +++ b/crypto/rand/rand_unix.c @@ -295,12 +295,7 @@ int RAND_poll(void) { int try_read = 0; -#if defined(OPENSSL_SYS_BEOS_R5) - /* select() is broken in BeOS R5, so we simply - * try to read something and snooze if we couldn't */ - try_read = 1; - -#elif defined(OPENSSL_SYS_LINUX) +#if defined(OPENSSL_SYS_LINUX) /* use poll() */ struct pollfd pset; @@ -347,10 +342,6 @@ int RAND_poll(void) r = read(fd,(unsigned char *)tmpbuf+n, ENTROPY_NEEDED-n); if (r > 0) n += r; -#if defined(OPENSSL_SYS_BEOS_R5) - if (r == 0) - snooze(t.tv_usec); -#endif } else r = -1; @@ -404,14 +395,6 @@ int RAND_poll(void) l=time(NULL); RAND_add(&l,sizeof(l),0.0); -#if defined(OPENSSL_SYS_BEOS) - { - system_info sysInfo; - get_system_info(&sysInfo); - RAND_add(&sysInfo,sizeof(sysInfo),0); - } -#endif - #if defined(DEVRANDOM) || defined(DEVRANDOM_EGD) return 1; #else diff --git a/crypto/thr_id.c b/crypto/thr_id.c index adad72e7d3..8de903326f 100644 --- a/crypto/thr_id.c +++ b/crypto/thr_id.c @@ -199,8 +199,6 @@ void CRYPTO_THREADID_current(CRYPTO_THREADID *id) CRYPTO_THREADID_set_numeric(id, (unsigned long)GetCurrentTask()); #elif defined(OPENSSL_SYS_WIN32) CRYPTO_THREADID_set_numeric(id, (unsigned long)GetCurrentThreadId()); -#elif defined(OPENSSL_SYS_BEOS) - CRYPTO_THREADID_set_numeric(id, (unsigned long)find_thread(NULL)); #else /* For everything else, default to using the address of 'errno' */ CRYPTO_THREADID_set_pointer(id, (void*)&errno); @@ -245,8 +243,6 @@ unsigned long CRYPTO_thread_id(void) ret=(unsigned long)GetCurrentThreadId(); #elif defined(GETPID_IS_MEANINGLESS) ret=1L; -#elif defined(OPENSSL_SYS_BEOS) - ret=(unsigned long)find_thread(NULL); #else ret=(unsigned long)getpid(); #endif diff --git a/crypto/threads/mttest.c b/crypto/threads/mttest.c index da2707ef7a..fc686dde3f 100644 --- a/crypto/threads/mttest.c +++ b/crypto/threads/mttest.c @@ -1209,100 +1209,3 @@ unsigned long netware_thread_id(void) return(ret); } #endif /* NETWARE */ - -#ifdef BEOS_THREADS - -#include <Locker.h> - -static BLocker** lock_cs; -static long* lock_count; - -void thread_setup(void) - { - int i; - - lock_cs=(BLocker**)OPENSSL_malloc(CRYPTO_num_locks() * sizeof(BLocker*)); - lock_count=(long*)OPENSSL_malloc(CRYPTO_num_locks() * sizeof(long)); - for (i=0; i<CRYPTO_num_locks(); i++) - { - lock_count[i]=0; - lock_cs[i] = new BLocker(CRYPTO_get_lock_name(i)); - } - - CRYPTO_set_id_callback((unsigned long (*)())beos_thread_id); - CRYPTO_set_locking_callback(beos_locking_callback); - } - -void thread_cleanup(void) - { - int i; - - CRYPTO_set_locking_callback(NULL); - fprintf(stderr,"cleanup\n"); - for (i=0; i<CRYPTO_num_locks(); i++) - { - delete lock_cs[i]; - fprintf(stderr,"%8ld:%s\n",lock_count[i], - CRYPTO_get_lock_name(i)); - } - OPENSSL_free(lock_cs); - OPENSSL_free(lock_count); - - fprintf(stderr,"done cleanup\n"); - } - -void beos_locking_callback(int mode, int type, const char *file, int line) - { -#if 0 - fprintf(stderr,"thread=%4d mode=%s lock=%s %s:%d\n", - CRYPTO_thread_id(), - (mode&CRYPTO_LOCK)?"l":"u", - (type&CRYPTO_READ)?"r":"w",file,line); -#endif - if (mode & CRYPTO_LOCK) - { - lock_cs[type]->Lock(); - lock_count[type]++; - } - else - { - lock_cs[type]->Unlock(); - } - } - -void do_threads(SSL_CTX *s_ctx, SSL_CTX *c_ctx) - { - SSL_CTX *ssl_ctx[2]; - thread_id thread_ctx[MAX_THREAD_NUMBER]; - int i; - - ssl_ctx[0]=s_ctx; - ssl_ctx[1]=c_ctx; - - for (i=0; i<thread_number; i++) - { - thread_ctx[i] = spawn_thread((thread_func)ndoit, - NULL, B_NORMAL_PRIORITY, (void *)ssl_ctx); - resume_thread(thread_ctx[i]); - } - - printf("waiting...\n"); - for (i=0; i<thread_number; i++) - { - status_t result; - wait_for_thread(thread_ctx[i], &result); - } - - printf("beos threads done (%d,%d)\n", - s_ctx->references,c_ctx->references); - } - -unsigned long beos_thread_id(void) - { - unsigned long ret; - - ret=(unsigned long)find_thread(NULL); - return(ret); - } - -#endif /* BEOS_THREADS */ diff --git a/crypto/ui/ui_openssl.c b/crypto/ui/ui_openssl.c index 6d4c4e147d..46128fec0e 100644 --- a/crypto/ui/ui_openssl.c +++ b/crypto/ui/ui_openssl.c @@ -484,7 +484,7 @@ static int open_console(UI *ui) CRYPTO_w_lock(CRYPTO_LOCK_UI); is_a_tty = 1; -#if defined(OPENSSL_SYS_VXWORKS) || defined(OPENSSL_SYS_NETWARE) || defined(OPENSSL_SYS_BEOS) +#if defined(OPENSSL_SYS_VXWORKS) || defined(OPENSSL_SYS_NETWARE) tty_in=stdin; tty_out=stderr; #else |