From be7b4458f226a9c8052efa4bb7b61dc4fc0c5353 Mon Sep 17 00:00:00 2001 From: Andy Polyakov Date: Sun, 18 Dec 2005 19:11:37 +0000 Subject: Keep disclaiming 16-bit platform support. For now remove WIN16 references from .h files... --- crypto/bf/blowfish.h | 2 +- crypto/bio/bio.h | 34 +--------------------------------- crypto/bio/bss_file.c | 2 +- crypto/conf/conf_api.c | 4 ++-- crypto/des/des_locl.h | 2 +- crypto/md4/md4.h | 2 +- crypto/md5/md5.h | 2 +- crypto/pem/pem.h | 4 +--- crypto/ripemd/ripemd.h | 2 +- crypto/sha/sha.h | 2 +- crypto/symhacks.h | 2 +- crypto/x509/by_dir.c | 2 +- crypto/x509/by_file.c | 2 +- e_os.h | 24 ++---------------------- ssl/ssl3.h | 6 ------ 15 files changed, 16 insertions(+), 76 deletions(-) diff --git a/crypto/bf/blowfish.h b/crypto/bf/blowfish.h index cd49e85ab2..b97e76f9a3 100644 --- a/crypto/bf/blowfish.h +++ b/crypto/bf/blowfish.h @@ -79,7 +79,7 @@ extern "C" { * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */ -#if defined(OPENSSL_SYS_WIN16) || defined(__LP32__) +#if defined(__LP32__) #define BF_LONG unsigned long #elif defined(OPENSSL_SYS_CRAY) || defined(__ILP64__) #define BF_LONG unsigned long diff --git a/crypto/bio/bio.h b/crypto/bio/bio.h index 07333cf0b3..d1c522a412 100644 --- a/crypto/bio/bio.h +++ b/crypto/bio/bio.h @@ -257,7 +257,6 @@ typedef struct bio_st BIO; typedef void bio_info_cb(struct bio_st *, int, const char *, int, long, long); -#ifndef OPENSSL_SYS_WIN16 typedef struct bio_method_st { int type; @@ -271,21 +270,6 @@ typedef struct bio_method_st int (*destroy)(BIO *); long (*callback_ctrl)(BIO *, int, bio_info_cb *); } BIO_METHOD; -#else -typedef struct bio_method_st - { - int type; - const char *name; - int (_far *bwrite)(); - int (_far *bread)(); - int (_far *bputs)(); - int (_far *bgets)(); - long (_far *ctrl)(); - int (_far *create)(); - int (_far *destroy)(); - long (_far *callback_ctrl)(); - } BIO_METHOD; -#endif struct bio_st { @@ -549,21 +533,10 @@ unsigned long BIO_number_read(BIO *bio); unsigned long BIO_number_written(BIO *bio); # ifndef OPENSSL_NO_FP_API -# if defined(OPENSSL_SYS_WIN16) && defined(_WINDLL) -BIO_METHOD *BIO_s_file_internal(void); -BIO *BIO_new_file_internal(char *filename, char *mode); -BIO *BIO_new_fp_internal(FILE *stream, int close_flag); -# define BIO_s_file BIO_s_file_internal -# define BIO_new_file BIO_new_file_internal -# define BIO_new_fp BIO_new_fp_internal -# else /* FP_API */ BIO_METHOD *BIO_s_file(void ); BIO *BIO_new_file(const char *filename, const char *mode); BIO *BIO_new_fp(FILE *stream, int close_flag); -# define BIO_s_file_internal BIO_s_file -# define BIO_new_file_internal BIO_new_file -# define BIO_new_fp_internal BIO_s_file -# endif /* FP_API */ +# define BIO_s_file_internal BIO_s_file # endif BIO * BIO_new(BIO_METHOD *type); int BIO_set(BIO *a,BIO_METHOD *type); @@ -592,13 +565,8 @@ int BIO_nread(BIO *bio, char **buf, int num); int BIO_nwrite0(BIO *bio, char **buf); int BIO_nwrite(BIO *bio, char **buf, int num); -#ifndef OPENSSL_SYS_WIN16 long BIO_debug_callback(BIO *bio,int cmd,const char *argp,int argi, long argl,long ret); -#else -long _far _loadds BIO_debug_callback(BIO *bio,int cmd,const char *argp,int argi, - long argl,long ret); -#endif BIO_METHOD *BIO_s_mem(void); BIO *BIO_new_mem_buf(void *buf, int len); diff --git a/crypto/bio/bss_file.c b/crypto/bio/bss_file.c index 93727685cf..9e161b17f5 100644 --- a/crypto/bio/bss_file.c +++ b/crypto/bio/bss_file.c @@ -127,7 +127,7 @@ BIO *BIO_new_file(const char *filename, const char *mode) BIOerr(BIO_F_BIO_NEW_FILE,ERR_R_SYS_LIB); return(NULL); } - if ((ret=BIO_new(BIO_s_file_internal())) == NULL) + if ((ret=BIO_new(BIO_s_file())) == NULL) return(NULL); BIO_clear_flags(ret,BIO_FLAGS_UPLINK); /* we did fopen -> we disengage UPLINK */ diff --git a/crypto/conf/conf_api.c b/crypto/conf/conf_api.c index 0032baa711..a708235834 100644 --- a/crypto/conf/conf_api.c +++ b/crypto/conf/conf_api.c @@ -145,7 +145,7 @@ char *_CONF_get_string(const CONF *conf, const char *section, const char *name) if (v != NULL) return(v->value); if (strcmp(section,"ENV") == 0) { - p=Getenv(name); + p=getenv(name); if (p != NULL) return(p); } } @@ -158,7 +158,7 @@ char *_CONF_get_string(const CONF *conf, const char *section, const char *name) return(NULL); } else - return(Getenv(name)); + return(getenv(name)); } #if 0 /* There's no way to provide error checking with this function, so diff --git a/crypto/des/des_locl.h b/crypto/des/des_locl.h index f7ed6ae19a..a3b512e9b0 100644 --- a/crypto/des/des_locl.h +++ b/crypto/des/des_locl.h @@ -61,7 +61,7 @@ #include -#if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_WIN16) +#if defined(OPENSSL_SYS_WIN32) #ifndef OPENSSL_SYS_MSDOS #define OPENSSL_SYS_MSDOS #endif diff --git a/crypto/md4/md4.h b/crypto/md4/md4.h index b080cbdc21..d289d287cb 100644 --- a/crypto/md4/md4.h +++ b/crypto/md4/md4.h @@ -76,7 +76,7 @@ extern "C" { * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */ -#if defined(OPENSSL_SYS_WIN16) || defined(__LP32__) +#if defined(__LP32__) #define MD4_LONG unsigned long #elif defined(OPENSSL_SYS_CRAY) || defined(__ILP64__) #define MD4_LONG unsigned long diff --git a/crypto/md5/md5.h b/crypto/md5/md5.h index 6d283fe9da..d8c52345de 100644 --- a/crypto/md5/md5.h +++ b/crypto/md5/md5.h @@ -76,7 +76,7 @@ extern "C" { * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */ -#if defined(OPENSSL_SYS_WIN16) || defined(__LP32__) +#if defined(__LP32__) #define MD5_LONG unsigned long #elif defined(OPENSSL_SYS_CRAY) || defined(__ILP64__) #define MD5_LONG unsigned long diff --git a/crypto/pem/pem.h b/crypto/pem/pem.h index dbdd576755..6ccb14e3b6 100644 --- a/crypto/pem/pem.h +++ b/crypto/pem/pem.h @@ -319,7 +319,7 @@ int PEM_write_bio_##name(BIO *bp, type *x, const EVP_CIPHER *enc, \ /* These are the same except they are for the declarations */ -#if defined(OPENSSL_SYS_WIN16) || defined(OPENSSL_NO_FP_API) +#if defined(OPENSSL_NO_FP_API) #define DECLARE_PEM_read_fp(name, type) /**/ #define DECLARE_PEM_write_fp(name, type) /**/ @@ -558,7 +558,6 @@ int PEM_X509_INFO_write_bio(BIO *bp,X509_INFO *xi, EVP_CIPHER *enc, unsigned char *kstr, int klen, pem_password_cb *cd, void *u); #endif -#ifndef OPENSSL_SYS_WIN16 int PEM_read(FILE *fp, char **name, char **header, unsigned char **data,long *len); int PEM_write(FILE *fp,char *name,char *hdr,unsigned char *data,long len); @@ -569,7 +568,6 @@ int PEM_ASN1_write(i2d_of_void *i2d,const char *name,FILE *fp, int klen,pem_password_cb *callback, void *u); STACK_OF(X509_INFO) * PEM_X509_INFO_read(FILE *fp, STACK_OF(X509_INFO) *sk, pem_password_cb *cb, void *u); -#endif int PEM_SealInit(PEM_ENCODE_SEAL_CTX *ctx, EVP_CIPHER *type, EVP_MD *md_type, unsigned char **ek, int *ekl, diff --git a/crypto/ripemd/ripemd.h b/crypto/ripemd/ripemd.h index 06bd67183b..dea1f18211 100644 --- a/crypto/ripemd/ripemd.h +++ b/crypto/ripemd/ripemd.h @@ -69,7 +69,7 @@ extern "C" { #error RIPEMD is disabled. #endif -#if defined(OPENSSL_SYS_WIN16) || defined(__LP32__) +#if defined(__LP32__) #define RIPEMD160_LONG unsigned long #elif defined(OPENSSL_SYS_CRAY) || defined(__ILP64__) #define RIPEMD160_LONG unsigned long diff --git a/crypto/sha/sha.h b/crypto/sha/sha.h index a83bd3cace..b7773d6c21 100644 --- a/crypto/sha/sha.h +++ b/crypto/sha/sha.h @@ -80,7 +80,7 @@ extern "C" { * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */ -#if defined(OPENSSL_SYS_WIN16) || defined(__LP32__) +#if defined(__LP32__) #define SHA_LONG unsigned long #elif defined(OPENSSL_SYS_CRAY) || defined(__ILP64__) #define SHA_LONG unsigned long diff --git a/crypto/symhacks.h b/crypto/symhacks.h index 7e3602d2ea..db91bc562d 100644 --- a/crypto/symhacks.h +++ b/crypto/symhacks.h @@ -346,7 +346,7 @@ /* Case insensiteve linking causes problems.... */ -#if defined(OPENSSL_SYS_WIN16) || defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_OS2) +#if defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_OS2) #undef ERR_load_CRYPTO_strings #define ERR_load_CRYPTO_strings ERR_load_CRYPTOlib_strings #undef OCSP_crlID_new diff --git a/crypto/x509/by_dir.c b/crypto/x509/by_dir.c index 5290970c76..6398d35a0a 100644 --- a/crypto/x509/by_dir.c +++ b/crypto/x509/by_dir.c @@ -121,7 +121,7 @@ static int dir_ctrl(X509_LOOKUP *ctx, int cmd, const char *argp, long argl, case X509_L_ADD_DIR: if (argl == X509_FILETYPE_DEFAULT) { - dir=(char *)Getenv(X509_get_default_cert_dir_env()); + dir=(char *)getenv(X509_get_default_cert_dir_env()); if (dir) ret=add_cert_dir(ld,dir,X509_FILETYPE_PEM); else diff --git a/crypto/x509/by_file.c b/crypto/x509/by_file.c index a5e0d4aefa..57b08ee094 100644 --- a/crypto/x509/by_file.c +++ b/crypto/x509/by_file.c @@ -100,7 +100,7 @@ static int by_file_ctrl(X509_LOOKUP *ctx, int cmd, const char *argp, long argl, case X509_L_FILE_LOAD: if (argl == X509_FILETYPE_DEFAULT) { - file = (char *)Getenv(X509_get_default_cert_file_env()); + file = (char *)getenv(X509_get_default_cert_file_env()); if (file) ok = (X509_load_cert_crl_file(ctx,file, X509_FILETYPE_PEM) != 0); diff --git a/e_os.h b/e_os.h index 8f991a9b3a..df72c7454a 100644 --- a/e_os.h +++ b/e_os.h @@ -123,9 +123,6 @@ extern "C" { #if defined(OPENSSL_SYS_WIN32) && !defined(WIN32) # define WIN32 #endif -#if defined(OPENSSL_SYS_WIN16) && !defined(WIN16) -# define WIN16 -#endif #if defined(OPENSSL_SYS_WINDOWS) && !defined(WINDOWS) # define WINDOWS #endif @@ -203,7 +200,7 @@ extern "C" { #define writesocket(s,b,n) write((s),(b),(n)) #endif -#ifdef WIN16 +#ifdef WIN16 /* never the case */ # define MS_CALLBACK _far _loadds # define MS_FAR _far #else @@ -295,12 +292,7 @@ static unsigned int _strlen31(const char *str) # define _kbhit kbhit # endif -# if defined(WIN16) && defined(SSLEAY) && defined(_WINEXITNOPERSIST) -# define EXIT(n) _wsetexit(_WINEXITNOPERSIST) -# define OPENSSL_EXIT(n) do { if (n == 0) EXIT(n); return(n); } while(0) -# else -# define EXIT(n) exit(n) -# endif +# define EXIT(n) exit(n) # define LIST_SEPARATOR_CHAR ';' # ifndef X_OK # define X_OK 0 @@ -592,18 +584,6 @@ extern char *sys_errlist[]; extern int sys_nerr; /***********************************************/ -/* do we need to do this for getenv. - * Just define getenv for use under windows */ - -#ifdef WIN16 -/* How to do this needs to be thought out a bit more.... */ -/*char *GETENV(char *); -#define Getenv GETENV*/ -#define Getenv getenv -#else -#define Getenv getenv -#endif - #define DG_GCC_BUG /* gcc < 2.6.3 on DGUX */ #ifdef sgi diff --git a/ssl/ssl3.h b/ssl/ssl3.h index 2c6c79bf66..6475d82af4 100644 --- a/ssl/ssl3.h +++ b/ssl/ssl3.h @@ -256,13 +256,7 @@ extern "C" { #define SSL_RT_MAX_CIPHER_BLOCK_SIZE 16 -/* Due to MS stuffing up, this can change.... */ -#if defined(OPENSSL_SYS_WIN16) || \ - (defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_WIN32)) -#define SSL3_RT_MAX_EXTRA (14000) -#else #define SSL3_RT_MAX_EXTRA (16384) -#endif /* Maximum plaintext length: defined by SSL/TLS standards */ #define SSL3_RT_MAX_PLAIN_LENGTH 16384 -- cgit v1.2.3