diff options
| author | Bob Beck <beck@cvs.openbsd.org> | 2014-04-13 23:05:19 +0000 |
|---|---|---|
| committer | Bob Beck <beck@cvs.openbsd.org> | 2014-04-13 23:05:19 +0000 |
| commit | b65dfad680c3cc8b1e546e7e4a5d57cc7e8dc31f (patch) | |
| tree | 91ecedc6a98e7cb76b8984b8eb197969d46b1197 | |
| parent | 2ccd9a52a58de15c24587e4bb5d60bd7ce4e3ebe (diff) | |
Flense a variety of windows support stuff, and a strange gettimeofday function.
ok deraadt@
| -rw-r--r-- | lib/libcrypto/bio/bss_dgram.c | 12 | ||||
| -rw-r--r-- | lib/libssl/d1_both.c | 7 | ||||
| -rw-r--r-- | lib/libssl/dtls1.h | 11 | ||||
| -rw-r--r-- | lib/libssl/s3_both.c | 7 | ||||
| -rw-r--r-- | lib/libssl/ssl.h | 4 |
5 files changed, 0 insertions, 41 deletions
diff --git a/lib/libcrypto/bio/bss_dgram.c b/lib/libcrypto/bio/bss_dgram.c index 54c012c47d7..f39f94f7fe4 100644 --- a/lib/libcrypto/bio/bss_dgram.c +++ b/lib/libcrypto/bio/bss_dgram.c @@ -1847,19 +1847,7 @@ int BIO_dgram_non_fatal_error(int err) static void get_current_time(struct timeval *t) { -#ifdef OPENSSL_SYS_WIN32 - struct _timeb tb; - _ftime(&tb); - t->tv_sec = (long)tb.time; - t->tv_usec = (long)tb.millitm * 1000; -#elif defined(OPENSSL_SYS_VMS) - struct timeb tb; - ftime(&tb); - t->tv_sec = (long)tb.time; - t->tv_usec = (long)tb.millitm * 1000; -#else gettimeofday(t, NULL); -#endif } #endif diff --git a/lib/libssl/d1_both.c b/lib/libssl/d1_both.c index 2e8cf681ed0..a265fed22fd 100644 --- a/lib/libssl/d1_both.c +++ b/lib/libssl/d1_both.c @@ -938,13 +938,6 @@ int dtls1_send_finished(SSL *s, int a, int b, const char *sender, int slen) s->s3->previous_server_finished_len=i; } -#ifdef OPENSSL_SYS_WIN16 - /* MSVC 1.5 does not clear the top bytes of the word unless - * I do this. - */ - l&=0xffff; -#endif - d = dtls1_set_message_header(s, d, SSL3_MT_FINISHED, l, 0, l); s->init_num=(int)l+DTLS1_HM_HEADER_LENGTH; s->init_off=0; diff --git a/lib/libssl/dtls1.h b/lib/libssl/dtls1.h index aa57e9aec42..3e0fe918a38 100644 --- a/lib/libssl/dtls1.h +++ b/lib/libssl/dtls1.h @@ -62,18 +62,7 @@ #include <openssl/buffer.h> #include <openssl/pqueue.h> -#ifdef OPENSSL_SYS_WIN32 -/* Needed for struct timeval */ -#include <winsock.h> -#elif defined(OPENSSL_SYS_NETWARE) && !defined(_WINSOCK2API_) -#include <sys/timeval.h> -#else -#if defined(OPENSSL_SYS_VXWORKS) -#include <sys/times.h> -#else #include <sys/time.h> -#endif -#endif #ifdef __cplusplus extern "C" { diff --git a/lib/libssl/s3_both.c b/lib/libssl/s3_both.c index 53b9390fdd3..77f825af310 100644 --- a/lib/libssl/s3_both.c +++ b/lib/libssl/s3_both.c @@ -185,13 +185,6 @@ int ssl3_send_finished(SSL *s, int a, int b, const char *sender, int slen) s->s3->previous_server_finished_len=i; } -#ifdef OPENSSL_SYS_WIN16 - /* MSVC 1.5 does not clear the top bytes of the word unless - * I do this. - */ - l&=0xffff; -#endif - *(d++)=SSL3_MT_FINISHED; l2n3(l,d); s->init_num=(int)l+4; diff --git a/lib/libssl/ssl.h b/lib/libssl/ssl.h index 0aec299c7a0..81a14839746 100644 --- a/lib/libssl/ssl.h +++ b/lib/libssl/ssl.h @@ -733,11 +733,7 @@ int SRP_generate_client_master_secret(SSL *s,unsigned char *master_key); #endif -#if defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_WIN32) -#define SSL_MAX_CERT_LIST_DEFAULT 1024*30 /* 30k max cert list :-) */ -#else #define SSL_MAX_CERT_LIST_DEFAULT 1024*100 /* 100k max cert list :-) */ -#endif #define SSL_SESSION_CACHE_MAX_SIZE_DEFAULT (1024*20) |