diff options
Diffstat (limited to 'crypto/bio')
| -rw-r--r-- | crypto/bio/b_sock.c | 9 | ||||
| -rw-r--r-- | crypto/bio/bf_buff.c | 11 | ||||
| -rw-r--r-- | crypto/bio/bf_nbio.c | 11 | ||||
| -rw-r--r-- | crypto/bio/bf_null.c | 11 | ||||
| -rw-r--r-- | crypto/bio/bio.h | 129 | ||||
| -rw-r--r-- | crypto/bio/bss_acpt.c | 21 | ||||
| -rw-r--r-- | crypto/bio/bss_conn.c | 22 | ||||
| -rw-r--r-- | crypto/bio/bss_file.c | 11 | ||||
| -rw-r--r-- | crypto/bio/bss_log.c | 9 | ||||
| -rw-r--r-- | crypto/bio/bss_mem.c | 11 | ||||
| -rw-r--r-- | crypto/bio/bss_null.c | 11 | ||||
| -rw-r--r-- | crypto/bio/bss_sock.c | 21 |
12 files changed, 0 insertions, 277 deletions
diff --git a/crypto/bio/b_sock.c b/crypto/bio/b_sock.c index b9f10f3438..cc9c125478 100644 --- a/crypto/bio/b_sock.c +++ b/crypto/bio/b_sock.c @@ -65,8 +65,6 @@ #include "cryptlib.h" #include <openssl/bio.h> -/* BIOerr(BIO_F_WSASTARTUP,BIO_R_WSASTARTUP ); */ - #ifdef WIN16 #define SOCKET_PROTOCOL 0 /* more microsoft stupidity */ #else @@ -96,16 +94,9 @@ static struct ghbn_cache_st unsigned long order; } ghbn_cache[GHBN_NUM]; -#ifndef NOPROTO static int get_ip(const char *str,unsigned char *ip); static void ghbn_free(struct hostent *a); static struct hostent *ghbn_dup(struct hostent *a); -#else -static int get_ip(); -static void ghbn_free(); -static struct hostent *ghbn_dup(); -#endif - int BIO_get_host_ip(const char *str, unsigned char *ip) { int i; diff --git a/crypto/bio/bf_buff.c b/crypto/bio/bf_buff.c index d239fc0008..acd8148138 100644 --- a/crypto/bio/bf_buff.c +++ b/crypto/bio/bf_buff.c @@ -62,7 +62,6 @@ #include <openssl/bio.h> #include <openssl/evp.h> -#ifndef NOPROTO static int buffer_write(BIO *h,char *buf,int num); static int buffer_read(BIO *h,char *buf,int size); static int buffer_puts(BIO *h,char *str); @@ -70,16 +69,6 @@ static int buffer_gets(BIO *h,char *str,int size); static long buffer_ctrl(BIO *h,int cmd,long arg1,char *arg2); static int buffer_new(BIO *h); static int buffer_free(BIO *data); -#else -static int buffer_write(); -static int buffer_read(); -static int buffer_puts(); -static int buffer_gets(); -static long buffer_ctrl(); -static int buffer_new(); -static int buffer_free(); -#endif - #define DEFAULT_BUFFER_SIZE 1024 static BIO_METHOD methods_buffer= diff --git a/crypto/bio/bf_nbio.c b/crypto/bio/bf_nbio.c index 1486996943..cbec2bae29 100644 --- a/crypto/bio/bf_nbio.c +++ b/crypto/bio/bf_nbio.c @@ -66,7 +66,6 @@ /* BIO_put and BIO_get both add to the digest, * BIO_gets returns the digest */ -#ifndef NOPROTO static int nbiof_write(BIO *h,char *buf,int num); static int nbiof_read(BIO *h,char *buf,int size); static int nbiof_puts(BIO *h,char *str); @@ -74,16 +73,6 @@ static int nbiof_gets(BIO *h,char *str,int size); static long nbiof_ctrl(BIO *h,int cmd,long arg1,char *arg2); static int nbiof_new(BIO *h); static int nbiof_free(BIO *data); -#else -static int nbiof_write(); -static int nbiof_read(); -static int nbiof_puts(); -static int nbiof_gets(); -static long nbiof_ctrl(); -static int nbiof_new(); -static int nbiof_free(); -#endif - typedef struct nbio_test_st { /* only set if we sent a 'should retry' error */ diff --git a/crypto/bio/bf_null.c b/crypto/bio/bf_null.c index c2e782f1ea..3254a55dce 100644 --- a/crypto/bio/bf_null.c +++ b/crypto/bio/bf_null.c @@ -65,7 +65,6 @@ /* BIO_put and BIO_get both add to the digest, * BIO_gets returns the digest */ -#ifndef NOPROTO static int nullf_write(BIO *h,char *buf,int num); static int nullf_read(BIO *h,char *buf,int size); static int nullf_puts(BIO *h,char *str); @@ -73,16 +72,6 @@ static int nullf_gets(BIO *h,char *str,int size); static long nullf_ctrl(BIO *h,int cmd,long arg1,char *arg2); static int nullf_new(BIO *h); static int nullf_free(BIO *data); -#else -static int nullf_write(); -static int nullf_read(); -static int nullf_puts(); -static int nullf_gets(); -static long nullf_ctrl(); -static int nullf_new(); -static int nullf_free(); -#endif - static BIO_METHOD methods_nullf= { BIO_TYPE_NULL_FILTER, diff --git a/crypto/bio/bio.h b/crypto/bio/bio.h index 1f870909a5..0915c8885d 100644 --- a/crypto/bio/bio.h +++ b/crypto/bio/bio.h @@ -231,12 +231,8 @@ typedef struct bio_method_st typedef struct bio_st { BIO_METHOD *method; -#ifndef NOPROTO /* bio, mode, argp, argi, argl, ret */ long (*callback)(struct bio_st *,int,const char *,int, long,long); -#else - long (*callback)(); -#endif char *cb_arg; /* first argument for the callback */ int init; @@ -445,7 +441,6 @@ int BIO_read_filename(BIO *b,const char *name); #define NO_FP_API #endif -#ifndef NOPROTO /* These two aren't currently implemented */ /* int BIO_get_ex_num(BIO *bio); */ @@ -470,33 +465,6 @@ BIO *BIO_new_fp(FILE *stream, int close_flag); # define BIO_new_file_internal BIO_new_file # define BIO_new_fp_internal BIO_s_file # endif /* FP_API */ -#else - -/* These two aren't currently implemented */ -/*int BIO_get_ex_num();*/ -/*void BIO_set_ex_free_func();*/ -int BIO_set_ex_data(); -char *BIO_get_ex_data(); -int BIO_get_ex_new_index(); - -# if defined(WIN16) && defined(_WINDLL) -BIO_METHOD *BIO_s_file_internal(); -BIO *BIO_new_file_internal(); -BIO *BIO_new_fp_internal(); -# 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(); -BIO *BIO_new_file(); -BIO *BIO_new_fp(); -# 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 - -#ifndef NOPROTO BIO * BIO_new(BIO_METHOD *type); int BIO_set(BIO *a,BIO_METHOD *type); int BIO_free(BIO *a); @@ -564,78 +532,8 @@ void BIO_copy_next_retry(BIO *b); long BIO_ghbn_ctrl(int cmd,int iarg,char *parg); -#else - -BIO * BIO_new(); -int BIO_set(); -int BIO_free(); -int BIO_read(); -int BIO_gets(); -int BIO_write(); -int BIO_puts(); -char * BIO_ptr_ctrl(); -long BIO_ctrl(); -long BIO_int_ctrl(); -BIO * BIO_push(); -BIO * BIO_pop(); -void BIO_free_all(); -BIO * BIO_find_type(); -BIO * BIO_get_retry_BIO(); -int BIO_get_retry_reason(); -BIO * BIO_dup_chain(); - -#ifndef WIN16 -long BIO_debug_callback(); -#else -long _far _loadds BIO_debug_callback(); -#endif - -BIO_METHOD *BIO_s_mem(); -BIO_METHOD *BIO_s_socket(); -BIO_METHOD *BIO_s_connect(); -BIO_METHOD *BIO_s_accept(); -BIO_METHOD *BIO_s_fd(); -BIO_METHOD *BIO_s_log(); -BIO_METHOD *BIO_s_null(); -BIO_METHOD *BIO_f_null(); -BIO_METHOD *BIO_f_buffer(); -BIO_METHOD *BIO_f_nbio_test(); -/* BIO_METHOD *BIO_f_ber(); */ - -int BIO_sock_should_retry(); -int BIO_sock_non_fatal_error(); -int BIO_fd_should_retry(); -int BIO_fd_non_fatal_error(); -int BIO_dump(); - -struct hostent *BIO_gethostbyname(); -int BIO_sock_error(); -int BIO_socket_ioctl(); -int BIO_socket_nbio(); -int BIO_get_port(); -int BIO_get_host_ip(); -int BIO_get_accept_socket(); -int BIO_accept(); -int BIO_sock_init(); -void BIO_sock_cleanup(); -int BIO_set_tcp_ndelay(); - -void ERR_load_BIO_strings(); - -BIO *BIO_new_socket(); -BIO *BIO_new_fd(); -BIO *BIO_new_connect(); -BIO *BIO_new_accept(); - -void BIO_copy_next_retry(); - -long BIO_ghbn_ctrl(); - -#endif - /* Tim Hudson's portable varargs stuff */ -#ifndef NOPROTO #define VAR_ANSI /* select ANSI version by default */ #endif @@ -655,34 +553,7 @@ long BIO_ghbn_ctrl(); #define VAR_ARG(args,type,arg) arg=va_arg(args,type) #define VAR_END(args) va_end(args); -#else - -/* K&R version of a "portable" macro set for variable length args */ -#ifndef __VARARGS_H__ -#include <varargs.h> -#endif - -#define VAR_PLIST(arg1type,arg1) va_alist -#define VAR_PLIST2(arg1type,arg1,arg2type,arg2) va_alist -#define VAR_ALIST va_dcl -#define VAR_BDEFN(args,arg1type,arg1) va_list args; arg1type arg1 -#define VAR_BDEFN2(args,arg1type,arg1,arg2type,arg2) va_list args; \ - arg1type arg1; arg2type arg2 -#define VAR_INIT(args,arg1type,arg1) va_start(args); \ - arg1=va_arg(args,arg1type); -#define VAR_INIT2(args,arg1type,arg1,arg2type,arg2) va_start(args); \ - arg1=va_arg(args,arg1type); arg2=va_arg(args,arg2type); -#define VAR_ARG(args,type,arg) arg=va_arg(args,type) -#define VAR_END(args) va_end(args); - -#endif - -#ifndef NOPROTO int BIO_printf( VAR_PLIST( BIO *, bio ) ); -#else -int BIO_printf(); -#endif - /* BEGIN ERROR CODES */ /* The following lines are auto generated by the script mkerr.pl. Any changes * made after this point may be overwritten when the script is next run. diff --git a/crypto/bio/bss_acpt.c b/crypto/bio/bss_acpt.c index 083d1b584c..74e6bd6a05 100644 --- a/crypto/bio/bss_acpt.c +++ b/crypto/bio/bss_acpt.c @@ -64,8 +64,6 @@ #include "cryptlib.h" #include <openssl/bio.h> -/* BIOerr(BIO_F_WSASTARTUP,BIO_R_WSASTARTUP ); */ - #ifdef WIN16 #define SOCKET_PROTOCOL 0 /* more microsoft stupidity */ #else @@ -89,36 +87,17 @@ typedef struct bio_accept_st BIO *bio_chain; } BIO_ACCEPT; -#ifndef NOPROTO static int acpt_write(BIO *h,char *buf,int num); static int acpt_read(BIO *h,char *buf,int size); static int acpt_puts(BIO *h,char *str); static long acpt_ctrl(BIO *h,int cmd,long arg1,char *arg2); static int acpt_new(BIO *h); static int acpt_free(BIO *data); -#else -static int acpt_write(); -static int acpt_read(); -static int acpt_puts(); -static long acpt_ctrl(); -static int acpt_new(); -static int acpt_free(); -#endif - -#ifndef NOPROTO static int acpt_state(BIO *b, BIO_ACCEPT *c); static void acpt_close_socket(BIO *data); BIO_ACCEPT *BIO_ACCEPT_new(void ); void BIO_ACCEPT_free(BIO_ACCEPT *a); -#else - -static int acpt_state(); -static void acpt_close_socket(); -BIO_ACCEPT *BIO_ACCEPT_new(); -void BIO_ACCEPT_free(); -#endif - #define ACPT_S_BEFORE 1 #define ACPT_S_GET_ACCEPT_SOCKET 2 #define ACPT_S_OK 3 diff --git a/crypto/bio/bss_conn.c b/crypto/bio/bss_conn.c index 83ba60edfb..6e4fe9f5d4 100644 --- a/crypto/bio/bss_conn.c +++ b/crypto/bio/bss_conn.c @@ -64,8 +64,6 @@ #include "cryptlib.h" #include <openssl/bio.h> -/* BIOerr(BIO_F_WSASTARTUP,BIO_R_WSASTARTUP ); */ - #ifdef WIN16 #define SOCKET_PROTOCOL 0 /* more microsoft stupidity */ #else @@ -94,38 +92,18 @@ typedef struct bio_connect_st int (*info_callback)(); } BIO_CONNECT; -#ifndef NOPROTO static int conn_write(BIO *h,char *buf,int num); static int conn_read(BIO *h,char *buf,int size); static int conn_puts(BIO *h,char *str); static long conn_ctrl(BIO *h,int cmd,long arg1,char *arg2); static int conn_new(BIO *h); static int conn_free(BIO *data); -#else -static int conn_write(); -static int conn_read(); -static int conn_puts(); -static long conn_ctrl(); -static int conn_new(); -static int conn_free(); -#endif - -#ifndef NOPROTO static int conn_state(BIO *b, BIO_CONNECT *c); static void conn_close_socket(BIO *data); BIO_CONNECT *BIO_CONNECT_new(void ); void BIO_CONNECT_free(BIO_CONNECT *a); -#else - -static int conn_state(); -static void conn_close_socket(); -BIO_CONNECT *BIO_CONNECT_new(); -void BIO_CONNECT_free(); - -#endif - static BIO_METHOD methods_connectp= { BIO_TYPE_CONNECT, diff --git a/crypto/bio/bss_file.c b/crypto/bio/bss_file.c index ab73b23d0a..323286b09f 100644 --- a/crypto/bio/bss_file.c +++ b/crypto/bio/bss_file.c @@ -73,7 +73,6 @@ #if !defined(NO_STDIO) -#ifndef NOPROTO static int MS_CALLBACK file_write(BIO *h,char *buf,int num); static int MS_CALLBACK file_read(BIO *h,char *buf,int size); static int MS_CALLBACK file_puts(BIO *h,char *str); @@ -81,16 +80,6 @@ static int MS_CALLBACK file_gets(BIO *h,char *str,int size); static long MS_CALLBACK file_ctrl(BIO *h,int cmd,long arg1,char *arg2); static int MS_CALLBACK file_new(BIO *h); static int MS_CALLBACK file_free(BIO *data); -#else -static int MS_CALLBACK file_write(); -static int MS_CALLBACK file_read(); -static int MS_CALLBACK file_puts(); -static int MS_CALLBACK file_gets(); -static long MS_CALLBACK file_ctrl(); -static int MS_CALLBACK file_new(); -static int MS_CALLBACK file_free(); -#endif - static BIO_METHOD methods_filep= { BIO_TYPE_FILE, diff --git a/crypto/bio/bss_log.c b/crypto/bio/bss_log.c index c4e991bcca..53ad7aa88e 100644 --- a/crypto/bio/bss_log.c +++ b/crypto/bio/bss_log.c @@ -80,20 +80,11 @@ #ifndef NO_SYSLOG -#ifndef NOPROTO static int MS_CALLBACK slg_write(BIO *h,char *buf,int num); static int MS_CALLBACK slg_puts(BIO *h,char *str); static long MS_CALLBACK slg_ctrl(BIO *h,int cmd,long arg1,char *arg2); static int MS_CALLBACK slg_new(BIO *h); static int MS_CALLBACK slg_free(BIO *data); -#else -static int MS_CALLBACK slg_write(); -static int MS_CALLBACK slg_puts(); -static long MS_CALLBACK slg_ctrl(); -static int MS_CALLBACK slg_new(); -static int MS_CALLBACK slg_free(); -#endif - static int xopenlog(BIO* bp, const char* name, int level); static int xcloselog(BIO* bp); diff --git a/crypto/bio/bss_mem.c b/crypto/bio/bss_mem.c index edde3b4aa3..7e749a503e 100644 --- a/crypto/bio/bss_mem.c +++ b/crypto/bio/bss_mem.c @@ -61,7 +61,6 @@ #include "cryptlib.h" #include <openssl/bio.h> -#ifndef NOPROTO static int mem_write(BIO *h,char *buf,int num); static int mem_read(BIO *h,char *buf,int size); static int mem_puts(BIO *h,char *str); @@ -69,16 +68,6 @@ static int mem_gets(BIO *h,char *str,int size); static long mem_ctrl(BIO *h,int cmd,long arg1,char *arg2); static int mem_new(BIO *h); static int mem_free(BIO *data); -#else -static int mem_write(); -static int mem_read(); -static int mem_puts(); -static int mem_gets(); -static long mem_ctrl(); -static int mem_new(); -static int mem_free(); -#endif - static BIO_METHOD mem_method= { BIO_TYPE_MEM, diff --git a/crypto/bio/bss_null.c b/crypto/bio/bss_null.c index b2eb9ad141..d04be888e5 100644 --- a/crypto/bio/bss_null.c +++ b/crypto/bio/bss_null.c @@ -61,7 +61,6 @@ #include "cryptlib.h" #include <openssl/bio.h> -#ifndef NOPROTO static int null_write(BIO *h,char *buf,int num); static int null_read(BIO *h,char *buf,int size); static int null_puts(BIO *h,char *str); @@ -69,16 +68,6 @@ static int null_gets(BIO *h,char *str,int size); static long null_ctrl(BIO *h,int cmd,long arg1,char *arg2); static int null_new(BIO *h); static int null_free(BIO *data); -#else -static int null_write(); -static int null_read(); -static int null_puts(); -static int null_gets(); -static long null_ctrl(); -static int null_new(); -static int null_free(); -#endif - static BIO_METHOD null_method= { BIO_TYPE_NULL, diff --git a/crypto/bio/bss_sock.c b/crypto/bio/bss_sock.c index 89b1dcab37..d336b99fe8 100644 --- a/crypto/bio/bss_sock.c +++ b/crypto/bio/bss_sock.c @@ -65,7 +65,6 @@ #include <openssl/bio.h> #ifndef BIO_FD -#ifndef NOPROTO static int sock_write(BIO *h,char *buf,int num); static int sock_read(BIO *h,char *buf,int size); static int sock_puts(BIO *h,char *str); @@ -74,18 +73,7 @@ static int sock_new(BIO *h); static int sock_free(BIO *data); int BIO_sock_should_retry(int s); #else -static int sock_write(); -static int sock_read(); -static int sock_puts(); -static long sock_ctrl(); -static int sock_new(); -static int sock_free(); -int BIO_sock_should_retry(); -#endif - -#else -#ifndef NOPROTO static int fd_write(BIO *h,char *buf,int num); static int fd_read(BIO *h,char *buf,int size); static int fd_puts(BIO *h,char *str); @@ -93,15 +81,6 @@ static long fd_ctrl(BIO *h,int cmd,long arg1,char *arg2); static int fd_new(BIO *h); static int fd_free(BIO *data); int BIO_fd_should_retry(int s); -#else -static int fd_write(); -static int fd_read(); -static int fd_puts(); -static long fd_ctrl(); -static int fd_new(); -static int fd_free(); -int BIO_fd_should_retry(); -#endif #endif #ifndef BIO_FD |