Commit be7b4458 authored by Andy Polyakov's avatar Andy Polyakov
Browse files

Keep disclaiming 16-bit platform support. For now remove WIN16 references 

from .h files...
parent 7304956e

crypto/bf/blowfish.h

+1 −1
Original line number Diff line number Diff line
@@ -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

crypto/bio/bio.h

+1 −33
Original line number Diff line number Diff line
@@ -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 */

# 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);

crypto/bio/bss_file.c

+1 −1
Original line number Diff line number Diff line
@@ -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 */

crypto/conf/conf_api.c

+2 −2
Original line number Diff line number Diff line
@@ -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

crypto/des/des_locl.h

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ 


#include <openssl/e_os2.h>



#if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_WIN16)

#if defined(OPENSSL_SYS_WIN32)

#ifndef OPENSSL_SYS_MSDOS

#define OPENSSL_SYS_MSDOS

#endif