diff options
| author |   beck <beck@openbsd.org> | 2014-04-14 00:00:55 +0000 |
|---|---|---|
| committer | beck <beck@openbsd.org> | 2014-04-14 00:00:55 +0000 |
| commit | 9779aa3324ed0c3303ea9590ab44add259f1e69d (patch) | |
| tree | edea787d7f29956631dc69c8a1ee07943dff0c31 /lib/libssl/src | |
| parent | two SHUTDOWN2 got away; noticed by beck (diff) | |
| download | wireguard-openbsd-9779aa3324ed0c3303ea9590ab44add259f1e69d.tar.xz wireguard-openbsd-9779aa3324ed0c3303ea9590ab44add259f1e69d.zip | |
remove last vestiges of OPENSSL_SYS_XXX from src/ssl
ok deraadt@
Diffstat (limited to 'lib/libssl/src')
| -rw-r--r-- | lib/libssl/src/ssl/kssl.h | 9 | ||||
| -rw-r--r-- | lib/libssl/src/ssl/ssl2.h | 4 | ||||
| -rw-r--r-- | lib/libssl/src/ssl/ssl_lib.c | 4 |
3 files changed, 0 insertions, 17 deletions
diff --git a/lib/libssl/src/ssl/kssl.h b/lib/libssl/src/ssl/kssl.h index e4df8430731..8242fd5eeb6 100644 --- a/lib/libssl/src/ssl/kssl.h +++ b/lib/libssl/src/ssl/kssl.h @@ -70,15 +70,6 @@ #include <stdio.h> #include <ctype.h> #include <krb5.h> -#ifdef OPENSSL_SYS_WIN32 -/* These can sometimes get redefined indirectly by krb5 header files - * after they get undefed in ossl_typ.h - */ -#undef X509_NAME -#undef X509_EXTENSIONS -#undef OCSP_REQUEST -#undef OCSP_RESPONSE -#endif #ifdef __cplusplus extern "C" { diff --git a/lib/libssl/src/ssl/ssl2.h b/lib/libssl/src/ssl/ssl2.h index eb25dcb0bf5..29033c8be73 100644 --- a/lib/libssl/src/ssl/ssl2.h +++ b/lib/libssl/src/ssl/ssl2.h @@ -133,11 +133,7 @@ extern "C" { /* Upper/Lower Bounds */ #define SSL2_MAX_MASTER_KEY_LENGTH_IN_BITS 256 -#ifdef OPENSSL_SYS_MPE -#define SSL2_MAX_RECORD_LENGTH_2_BYTE_HEADER 29998u -#else #define SSL2_MAX_RECORD_LENGTH_2_BYTE_HEADER 32767u /* 2^15-1 */ -#endif #define SSL2_MAX_RECORD_LENGTH_3_BYTE_HEADER 16383 /* 2^14-1 */ #define SSL2_CHALLENGE_LENGTH 16 diff --git a/lib/libssl/src/ssl/ssl_lib.c b/lib/libssl/src/ssl/ssl_lib.c index f052deeb973..d9a728493e2 100644 --- a/lib/libssl/src/ssl/ssl_lib.c +++ b/lib/libssl/src/ssl/ssl_lib.c @@ -3252,10 +3252,6 @@ int SSL_cache_hit(SSL *s) return s->hit; } -#if defined(_WINDLL) && defined(OPENSSL_SYS_WIN16) -#include "../crypto/bio/bss_file.c" -#endif - IMPLEMENT_STACK_OF(SSL_CIPHER) IMPLEMENT_STACK_OF(SSL_COMP) IMPLEMENT_OBJ_BSEARCH_GLOBAL_CMP_FN(SSL_CIPHER, SSL_CIPHER, |