diff options
Diffstat (limited to 'crypto')
-rw-r--r-- | crypto/bio/b_sock.c | 3 | ||||
-rw-r--r-- | crypto/bio/bio_cb.c | 4 | ||||
-rw-r--r-- | crypto/bio/bss_acpt.c | 6 | ||||
-rw-r--r-- | crypto/bio/bss_conn.c | 8 | ||||
-rw-r--r-- | crypto/bio/bss_file.c | 28 | ||||
-rw-r--r-- | crypto/bio/bss_log.c | 20 | ||||
-rw-r--r-- | crypto/bn/vms-helper.c | 2 | ||||
-rw-r--r-- | crypto/cryptlib.c | 2 | ||||
-rw-r--r-- | crypto/des/destest.c | 2 | ||||
-rw-r--r-- | crypto/des/read_pwd.c | 25 | ||||
-rw-r--r-- | crypto/dh/dhtest.c | 10 | ||||
-rw-r--r-- | crypto/dsa/dsatest.c | 10 | ||||
-rw-r--r-- | crypto/ecdh/ecdhtest.c | 10 | ||||
-rw-r--r-- | crypto/lock.c | 14 | ||||
-rw-r--r-- | crypto/rsa/rsa_sign.c | 2 | ||||
-rw-r--r-- | crypto/thr_id.c | 12 | ||||
-rw-r--r-- | crypto/threads/mttest.c | 1 | ||||
-rw-r--r-- | crypto/txt_db/txt_db.c | 6 | ||||
-rw-r--r-- | crypto/ui/ui_openssl.c | 23 |
19 files changed, 62 insertions, 126 deletions
diff --git a/crypto/bio/b_sock.c b/crypto/bio/b_sock.c index f13d2ac4b9..f7e95ee5c5 100644 --- a/crypto/bio/b_sock.c +++ b/crypto/bio/b_sock.c @@ -150,8 +150,7 @@ int BIO_get_host_ip(const char *str, unsigned char *ip) goto err; } - /* cast to short because of win16 winsock definition */ - if ((short)he->h_addrtype != AF_INET) + if (he->h_addrtype != AF_INET) { BIOerr(BIO_F_BIO_GET_HOST_IP,BIO_R_GETHOSTBYNAME_ADDR_IS_NOT_AF_INET); goto err; diff --git a/crypto/bio/bio_cb.c b/crypto/bio/bio_cb.c index 9bcbc321d9..dd21d02468 100644 --- a/crypto/bio/bio_cb.c +++ b/crypto/bio/bio_cb.c @@ -63,7 +63,7 @@ #include <openssl/bio.h> #include <openssl/err.h> -long MS_CALLBACK BIO_debug_callback(BIO *bio, int cmd, const char *argp, +long BIO_debug_callback(BIO *bio, int cmd, const char *argp, int argi, long argl, long ret) { BIO *b; @@ -135,7 +135,7 @@ long MS_CALLBACK BIO_debug_callback(BIO *bio, int cmd, const char *argp, b=(BIO *)bio->cb_arg; if (b != NULL) BIO_write(b,buf,strlen(buf)); -#if !defined(OPENSSL_NO_STDIO) && !defined(OPENSSL_SYS_WIN16) +#if !defined(OPENSSL_NO_STDIO) else fputs(buf,stderr); #endif diff --git a/crypto/bio/bss_acpt.c b/crypto/bio/bss_acpt.c index 0237c0fbc6..1dd6776695 100644 --- a/crypto/bio/bss_acpt.c +++ b/crypto/bio/bss_acpt.c @@ -64,12 +64,6 @@ #ifndef OPENSSL_NO_SOCK -#ifdef OPENSSL_SYS_WIN16 -#define SOCKET_PROTOCOL 0 /* more microsoft stupidity */ -#else -#define SOCKET_PROTOCOL IPPROTO_TCP -#endif - #if (defined(OPENSSL_SYS_VMS) && __VMS_VER < 70000000) /* FIONBIO used as a switch to enable ioctl, and that isn't in VMS < 7.0 */ #undef FIONBIO diff --git a/crypto/bio/bss_conn.c b/crypto/bio/bss_conn.c index d2c9695b70..511660427f 100644 --- a/crypto/bio/bss_conn.c +++ b/crypto/bio/bss_conn.c @@ -64,12 +64,6 @@ #ifndef OPENSSL_NO_SOCK -#ifdef OPENSSL_SYS_WIN16 -#define SOCKET_PROTOCOL 0 /* more microsoft stupidity */ -#else -#define SOCKET_PROTOCOL IPPROTO_TCP -#endif - #if (defined(OPENSSL_SYS_VMS) && __VMS_VER < 70000000) /* FIONBIO used as a switch to enable ioctl, and that isn't in VMS < 7.0 */ #undef FIONBIO @@ -209,7 +203,7 @@ static int conn_state(BIO *b, BIO_CONNECT *c) c->them.sin_addr.s_addr=htonl(l); c->state=BIO_CONN_S_CREATE_SOCKET; - ret=socket(AF_INET,SOCK_STREAM,SOCKET_PROTOCOL); + ret=socket(AF_INET,SOCK_STREAM,IPPROTO_TCP); if (ret == INVALID_SOCKET) { SYSerr(SYS_F_SOCKET,get_last_socket_error()); diff --git a/crypto/bio/bss_file.c b/crypto/bio/bss_file.c index b954fe7ebc..4a4e747bc7 100644 --- a/crypto/bio/bss_file.c +++ b/crypto/bio/bss_file.c @@ -95,13 +95,13 @@ #if !defined(OPENSSL_NO_STDIO) -static int MS_CALLBACK file_write(BIO *h, const char *buf, int num); -static int MS_CALLBACK file_read(BIO *h, char *buf, int size); -static int MS_CALLBACK file_puts(BIO *h, const char *str); -static int MS_CALLBACK file_gets(BIO *h, char *str, int size); -static long MS_CALLBACK file_ctrl(BIO *h, int cmd, long arg1, void *arg2); -static int MS_CALLBACK file_new(BIO *h); -static int MS_CALLBACK file_free(BIO *data); +static int file_write(BIO *h, const char *buf, int num); +static int file_read(BIO *h, char *buf, int size); +static int file_puts(BIO *h, const char *str); +static int file_gets(BIO *h, char *str, int size); +static long file_ctrl(BIO *h, int cmd, long arg1, void *arg2); +static int file_new(BIO *h); +static int file_free(BIO *data); static BIO_METHOD methods_filep= { BIO_TYPE_FILE, @@ -202,7 +202,7 @@ BIO_METHOD *BIO_s_file(void) return(&methods_filep); } -static int MS_CALLBACK file_new(BIO *bi) +static int file_new(BIO *bi) { bi->init=0; bi->num=0; @@ -211,7 +211,7 @@ static int MS_CALLBACK file_new(BIO *bi) return(1); } -static int MS_CALLBACK file_free(BIO *a) +static int file_free(BIO *a) { if (a == NULL) return(0); if (a->shutdown) @@ -230,7 +230,7 @@ static int MS_CALLBACK file_free(BIO *a) return(1); } -static int MS_CALLBACK file_read(BIO *b, char *out, int outl) +static int file_read(BIO *b, char *out, int outl) { int ret=0; @@ -250,7 +250,7 @@ static int MS_CALLBACK file_read(BIO *b, char *out, int outl) return(ret); } -static int MS_CALLBACK file_write(BIO *b, const char *in, int inl) +static int file_write(BIO *b, const char *in, int inl) { int ret=0; @@ -270,7 +270,7 @@ static int MS_CALLBACK file_write(BIO *b, const char *in, int inl) return(ret); } -static long MS_CALLBACK file_ctrl(BIO *b, int cmd, long num, void *ptr) +static long file_ctrl(BIO *b, int cmd, long num, void *ptr) { long ret=1; FILE *fp=(FILE *)b->ptr; @@ -440,7 +440,7 @@ static long MS_CALLBACK file_ctrl(BIO *b, int cmd, long num, void *ptr) return(ret); } -static int MS_CALLBACK file_gets(BIO *bp, char *buf, int size) +static int file_gets(BIO *bp, char *buf, int size) { int ret=0; @@ -461,7 +461,7 @@ static int MS_CALLBACK file_gets(BIO *bp, char *buf, int size) return(ret); } -static int MS_CALLBACK file_puts(BIO *bp, const char *str) +static int file_puts(BIO *bp, const char *str) { int n,ret; diff --git a/crypto/bio/bss_log.c b/crypto/bio/bss_log.c index 2227b2b52d..1cc413a916 100644 --- a/crypto/bio/bss_log.c +++ b/crypto/bio/bss_log.c @@ -122,11 +122,11 @@ #define LOG_DAEMON OPC$M_NM_NTWORK #endif -static int MS_CALLBACK slg_write(BIO *h, const char *buf, int num); -static int MS_CALLBACK slg_puts(BIO *h, const char *str); -static long MS_CALLBACK slg_ctrl(BIO *h, int cmd, long arg1, void *arg2); -static int MS_CALLBACK slg_new(BIO *h); -static int MS_CALLBACK slg_free(BIO *data); +static int slg_write(BIO *h, const char *buf, int num); +static int slg_puts(BIO *h, const char *str); +static long slg_ctrl(BIO *h, int cmd, long arg1, void *arg2); +static int slg_new(BIO *h); +static int slg_free(BIO *data); static void xopenlog(BIO* bp, char* name, int level); static void xsyslog(BIO* bp, int priority, const char* string); static void xcloselog(BIO* bp); @@ -149,7 +149,7 @@ BIO_METHOD *BIO_s_log(void) return(&methods_slg); } -static int MS_CALLBACK slg_new(BIO *bi) +static int slg_new(BIO *bi) { bi->init=1; bi->num=0; @@ -158,14 +158,14 @@ static int MS_CALLBACK slg_new(BIO *bi) return(1); } -static int MS_CALLBACK slg_free(BIO *a) +static int slg_free(BIO *a) { if (a == NULL) return(0); xcloselog(a); return(1); } -static int MS_CALLBACK slg_write(BIO *b, const char *in, int inl) +static int slg_write(BIO *b, const char *in, int inl) { int ret= inl; char* buf; @@ -218,7 +218,7 @@ static int MS_CALLBACK slg_write(BIO *b, const char *in, int inl) return(ret); } -static long MS_CALLBACK slg_ctrl(BIO *b, int cmd, long num, void *ptr) +static long slg_ctrl(BIO *b, int cmd, long num, void *ptr) { switch (cmd) { @@ -232,7 +232,7 @@ static long MS_CALLBACK slg_ctrl(BIO *b, int cmd, long num, void *ptr) return(0); } -static int MS_CALLBACK slg_puts(BIO *bp, const char *str) +static int slg_puts(BIO *bp, const char *str) { int n,ret; diff --git a/crypto/bn/vms-helper.c b/crypto/bn/vms-helper.c index 4b63149bf3..ca6e5ba2e0 100644 --- a/crypto/bn/vms-helper.c +++ b/crypto/bn/vms-helper.c @@ -60,7 +60,7 @@ bn_div_words_abort(int i) { #ifdef BN_DEBUG -#if !defined(OPENSSL_NO_STDIO) && !defined(OPENSSL_SYS_WIN16) +#if !defined(OPENSSL_NO_STDIO) fprintf(stderr,"Division would overflow (%d)\n",i); #endif abort(); diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c index 07f68e684e..00cb337835 100644 --- a/crypto/cryptlib.c +++ b/crypto/cryptlib.c @@ -117,7 +117,7 @@ #include "cryptlib.h" #include <openssl/safestack.h> -#if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_WIN16) +#if defined(OPENSSL_SYS_WIN32) static double SSLeay_MSVC5_hack=0.0; /* and for VC1.5 */ #endif diff --git a/crypto/des/destest.c b/crypto/des/destest.c index 31e01561b4..2cbfdb5f44 100644 --- a/crypto/des/destest.c +++ b/crypto/des/destest.c @@ -60,7 +60,7 @@ #include <stdlib.h> #include <openssl/e_os2.h> -#if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_WIN16) || defined(OPENSSL_SYS_WINDOWS) +#if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_WINDOWS) #ifndef OPENSSL_SYS_MSDOS #define OPENSSL_SYS_MSDOS #endif diff --git a/crypto/des/read_pwd.c b/crypto/des/read_pwd.c index 9ad8f51f2d..f5f10266a6 100644 --- a/crypto/des/read_pwd.c +++ b/crypto/des/read_pwd.c @@ -77,12 +77,6 @@ /* #define SIGACTION */ /* Define this if you have sigaction() */ -#ifdef WIN16TTY -#undef OPENSSL_SYS_WIN16 -#undef _WINDOWS -#include <graph.h> -#endif - /* 06-Apr-92 Luke Brennan Support for VMS */ #include "des_locl.h" #include "cryptlib.h" @@ -195,7 +189,7 @@ static void read_till_nl(FILE *); static void recsig(int); static void pushsig(void); static void popsig(void); -#if defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_WIN16) +#if defined(OPENSSL_SYS_MSDOS) static int noecho_fgets(char *buf, int size, FILE *tty); #endif #ifdef SIGACTION @@ -225,16 +219,7 @@ int des_read_pw(char *buf, char *buff, int size, const char *prompt, int verify) return(0); } -#elif defined(OPENSSL_SYS_WIN16) - -int des_read_pw(char *buf, char *buff, int size, char *prompt, int verify) - { - memset(buf,0,size); - memset(buff,0,size); - return(0); - } - -#else /* !OPENSSL_SYS_WINCE && !OPENSSL_SYS_WIN16 */ +#else /* !OPENSSL_SYS_WINCE */ static void read_till_nl(FILE *in) { @@ -473,11 +458,7 @@ static int noecho_fgets(char *buf, int size, FILE *tty) break; } size--; -#ifdef WIN16TTY - i=_inchar(); -#else i=getch(); -#endif if (i == '\r') i='\n'; *(p++)=i; if (i == '\n') @@ -501,4 +482,4 @@ static int noecho_fgets(char *buf, int size, FILE *tty) return(strlen(buf)); } #endif -#endif /* !OPENSSL_SYS_WINCE && !WIN16 */ +#endif /* !OPENSSL_SYS_WINCE */ diff --git a/crypto/dh/dhtest.c b/crypto/dh/dhtest.c index f4c2fd9cea..7452afbb5e 100644 --- a/crypto/dh/dhtest.c +++ b/crypto/dh/dhtest.c @@ -77,13 +77,7 @@ int main(int argc, char *argv[]) #else #include <openssl/dh.h> -#ifdef OPENSSL_SYS_WIN16 -#define MS_CALLBACK _far _loadds -#else -#define MS_CALLBACK -#endif - -static int MS_CALLBACK cb(int p, int n, BN_GENCB *arg); +static int cb(int p, int n, BN_GENCB *arg); static const char rnd_seed[] = "string to make the random number generator think it has entropy"; @@ -210,7 +204,7 @@ err: return(ret); } -static int MS_CALLBACK cb(int p, int n, BN_GENCB *arg) +static int cb(int p, int n, BN_GENCB *arg) { char c='*'; diff --git a/crypto/dsa/dsatest.c b/crypto/dsa/dsatest.c index 152205f1c0..2dac421970 100644 --- a/crypto/dsa/dsatest.c +++ b/crypto/dsa/dsatest.c @@ -79,13 +79,7 @@ int main(int argc, char *argv[]) #else #include <openssl/dsa.h> -#ifdef OPENSSL_SYS_WIN16 -#define MS_CALLBACK _far _loadds -#else -#define MS_CALLBACK -#endif - -static int MS_CALLBACK dsa_cb(int p, int n, BN_GENCB *arg); +static int dsa_cb(int p, int n, BN_GENCB *arg); /* seed, out_p, out_q, out_g are taken from the updated Appendix 5 to * FIPS PUB 186 and also appear in Appendix 5 to FIPS PIB 186-1 */ @@ -235,7 +229,7 @@ end: return(0); } -static int MS_CALLBACK dsa_cb(int p, int n, BN_GENCB *arg) +static int dsa_cb(int p, int n, BN_GENCB *arg) { char c='*'; static int ok=0,num=0; diff --git a/crypto/ecdh/ecdhtest.c b/crypto/ecdh/ecdhtest.c index e4c09455f1..30c3596caf 100644 --- a/crypto/ecdh/ecdhtest.c +++ b/crypto/ecdh/ecdhtest.c @@ -92,14 +92,8 @@ int main(int argc, char *argv[]) #include <openssl/ec.h> #include <openssl/ecdh.h> -#ifdef OPENSSL_SYS_WIN16 -#define MS_CALLBACK _far _loadds -#else -#define MS_CALLBACK -#endif - #if 0 -static void MS_CALLBACK cb(int p, int n, void *arg); +static void cb(int p, int n, void *arg); #endif static const char rnd_seed[] = "string to make the random number generator think it has entropy"; @@ -527,7 +521,7 @@ err: } #if 0 -static void MS_CALLBACK cb(int p, int n, void *arg) +static void cb(int p, int n, void *arg) { char c='*'; diff --git a/crypto/lock.c b/crypto/lock.c index b716708303..4e6b3b7e96 100644 --- a/crypto/lock.c +++ b/crypto/lock.c @@ -117,7 +117,7 @@ #include "cryptlib.h" #include <openssl/safestack.h> -#if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_WIN16) +#if defined(OPENSSL_SYS_WIN32) static double SSLeay_MSVC5_hack=0.0; /* and for VC1.5 */ #endif @@ -182,15 +182,15 @@ static STACK_OF(OPENSSL_STRING) *app_locks=NULL; static STACK_OF(CRYPTO_dynlock) *dyn_locks=NULL; -static void (MS_FAR *locking_callback)(int mode,int type, +static void (*locking_callback)(int mode,int type, const char *file,int line)=0; -static int (MS_FAR *add_lock_callback)(int *pointer,int amount, +static int (*add_lock_callback)(int *pointer,int amount, int type,const char *file,int line)=0; -static struct CRYPTO_dynlock_value *(MS_FAR *dynlock_create_callback) +static struct CRYPTO_dynlock_value *(*dynlock_create_callback) (const char *file,int line)=0; -static void (MS_FAR *dynlock_lock_callback)(int mode, +static void (*dynlock_lock_callback)(int mode, struct CRYPTO_dynlock_value *l, const char *file,int line)=0; -static void (MS_FAR *dynlock_destroy_callback)(struct CRYPTO_dynlock_value *l, +static void (*dynlock_destroy_callback)(struct CRYPTO_dynlock_value *l, const char *file,int line)=0; int CRYPTO_get_new_lockid(char *name) @@ -198,7 +198,7 @@ int CRYPTO_get_new_lockid(char *name) char *str; int i; -#if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_WIN16) +#if defined(OPENSSL_SYS_WIN32) /* A hack to make Visual C++ 5.0 work correctly when linking as * a DLL using /MT. Without this, the application cannot use * any floating point printf's. diff --git a/crypto/rsa/rsa_sign.c b/crypto/rsa/rsa_sign.c index 748292550d..031246055b 100644 --- a/crypto/rsa/rsa_sign.c +++ b/crypto/rsa/rsa_sign.c @@ -261,7 +261,7 @@ int int_rsa_verify(int dtype, const unsigned char *m, (sigtype == NID_md2WithRSAEncryption))) { /* ok, we will let it through */ -#if !defined(OPENSSL_NO_STDIO) && !defined(OPENSSL_SYS_WIN16) +#if !defined(OPENSSL_NO_STDIO) fprintf(stderr,"signature has problems, re-make with post SSLeay045\n"); #endif } diff --git a/crypto/thr_id.c b/crypto/thr_id.c index 8de903326f..76eb0f0aeb 100644 --- a/crypto/thr_id.c +++ b/crypto/thr_id.c @@ -117,9 +117,9 @@ #include "cryptlib.h" #ifndef OPENSSL_NO_DEPRECATED -static unsigned long (MS_FAR *id_callback)(void)=0; +static unsigned long (*id_callback)(void)=0; #endif -static void (MS_FAR *threadid_callback)(CRYPTO_THREADID *)=0; +static void (*threadid_callback)(CRYPTO_THREADID *)=0; /* the memset() here and in set_pointer() seem overkill, but for the sake of * CRYPTO_THREADID_cmp() this avoids any platform silliness that might cause two @@ -195,9 +195,7 @@ void CRYPTO_THREADID_current(CRYPTO_THREADID *id) } #endif /* Else pick a backup */ -#ifdef OPENSSL_SYS_WIN16 - CRYPTO_THREADID_set_numeric(id, (unsigned long)GetCurrentTask()); -#elif defined(OPENSSL_SYS_WIN32) +#if defined(OPENSSL_SYS_WIN32) CRYPTO_THREADID_set_numeric(id, (unsigned long)GetCurrentThreadId()); #else /* For everything else, default to using the address of 'errno' */ @@ -237,9 +235,7 @@ unsigned long CRYPTO_thread_id(void) if (id_callback == NULL) { -#ifdef OPENSSL_SYS_WIN16 - ret=(unsigned long)GetCurrentTask(); -#elif defined(OPENSSL_SYS_WIN32) +#if defined(OPENSSL_SYS_WIN32) ret=(unsigned long)GetCurrentThreadId(); #elif defined(GETPID_IS_MEANINGLESS) ret=1L; diff --git a/crypto/threads/mttest.c b/crypto/threads/mttest.c index 8de4ff0810..9decb751db 100644 --- a/crypto/threads/mttest.c +++ b/crypto/threads/mttest.c @@ -93,7 +93,6 @@ #include <openssl/rand.h> #ifdef OPENSSL_NO_FP_API -#define APPS_WIN16 #include "../buffer/bss_file.c" #endif diff --git a/crypto/txt_db/txt_db.c b/crypto/txt_db/txt_db.c index 6f2ce3b5a4..773589c412 100644 --- a/crypto/txt_db/txt_db.c +++ b/crypto/txt_db/txt_db.c @@ -156,7 +156,7 @@ TXT_DB *TXT_DB_read(BIO *in, int num) *(p++)='\0'; if ((n != num) || (*f != '\0')) { -#if !defined(OPENSSL_NO_STDIO) && !defined(OPENSSL_SYS_WIN16) /* temporary fix :-( */ +#if !defined(OPENSSL_NO_STDIO) /* temporary fix :-( */ fprintf(stderr,"wrong number of fields on line %ld (looking for field %d, got %d, '%s' left)\n",ln,num,n,f); #endif er=2; @@ -165,7 +165,7 @@ TXT_DB *TXT_DB_read(BIO *in, int num) pp[n]=p; if (!sk_OPENSSL_PSTRING_push(ret->data,pp)) { -#if !defined(OPENSSL_NO_STDIO) && !defined(OPENSSL_SYS_WIN16) /* temporary fix :-( */ +#if !defined(OPENSSL_NO_STDIO) /* temporary fix :-( */ fprintf(stderr,"failure in sk_push\n"); #endif er=2; @@ -177,7 +177,7 @@ err: BUF_MEM_free(buf); if (er) { -#if !defined(OPENSSL_NO_STDIO) && !defined(OPENSSL_SYS_WIN16) +#if !defined(OPENSSL_NO_STDIO) if (er == 1) fprintf(stderr,"OPENSSL_malloc failure\n"); #endif if (ret != NULL) diff --git a/crypto/ui/ui_openssl.c b/crypto/ui/ui_openssl.c index 72d85eefcd..2031b66518 100644 --- a/crypto/ui/ui_openssl.c +++ b/crypto/ui/ui_openssl.c @@ -155,13 +155,6 @@ # endif #endif -#ifdef WIN16TTY -# undef OPENSSL_SYS_WIN16 -# undef WIN16 -# undef _WINDOWS -# include <graph.h> -#endif - /* 06-Apr-92 Luke Brennan Support for VMS */ #include "ui_locl.h" #include "cryptlib.h" @@ -301,13 +294,13 @@ static FILE *tty_in, *tty_out; static int is_a_tty; /* Declare static functions */ -#if !defined(OPENSSL_SYS_WIN16) && !defined(OPENSSL_SYS_WINCE) +#if !defined(OPENSSL_SYS_WINCE) static int read_till_nl(FILE *); static void recsig(int); static void pushsig(void); static void popsig(void); #endif -#if defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_WIN16) +#if defined(OPENSSL_SYS_MSDOS) static int noecho_fgets(char *buf, int size, FILE *tty); #endif static int read_string_inner(UI *ui, UI_STRING *uis, int echo, int strip_nl); @@ -393,7 +386,7 @@ static int read_string(UI *ui, UI_STRING *uis) } -#if !defined(OPENSSL_SYS_WIN16) && !defined(OPENSSL_SYS_WINCE) +#if !defined(OPENSSL_SYS_WINCE) /* Internal functions to read a string without echoing */ static int read_till_nl(FILE *in) { @@ -416,7 +409,7 @@ static int read_string_inner(UI *ui, UI_STRING *uis, int echo, int strip_nl) int ok; char result[BUFSIZ]; int maxsize = BUFSIZ-1; -#if !defined(OPENSSL_SYS_WIN16) && !defined(OPENSSL_SYS_WINCE) +#if !defined(OPENSSL_SYS_WINCE) char *p; intr_signal=0; @@ -582,7 +575,7 @@ static int close_console(UI *ui) } -#if !defined(OPENSSL_SYS_WIN16) && !defined(OPENSSL_SYS_WINCE) +#if !defined(OPENSSL_SYS_WINCE) /* Internal functions to handle signals and act on them */ static void pushsig(void) { @@ -668,7 +661,7 @@ static void recsig(int i) #endif /* Internal functions specific for Windows */ -#if defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_WIN16) && !defined(OPENSSL_SYS_WINCE) +#if defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_WINCE) static int noecho_fgets(char *buf, int size, FILE *tty) { int i; @@ -683,9 +676,7 @@ static int noecho_fgets(char *buf, int size, FILE *tty) break; } size--; -#ifdef WIN16TTY - i=_inchar(); -#elif defined(_WIN32) +#if defined(_WIN32) i=_getch(); #else i=getch(); |