diff options
author | Rich Salz <rsalz@openssl.org> | 2015-01-12 17:29:26 -0500 |
---|---|---|
committer | Rich Salz <rsalz@openssl.org> | 2015-01-12 17:30:54 -0500 |
commit | 6d23cf97443bfedf755341b4f2d0d7fce254e020 (patch) | |
tree | ef52ffc0029a579d35439f2dc0ba2deee966ed93 /ssl | |
parent | 31d1d3741f16bd80ec25f72dcdbf6bbdc5664374 (diff) | |
download | openssl-6d23cf97443bfedf755341b4f2d0d7fce254e020.tar.gz |
RT3548: Remove unsupported platforms
This last one for this ticket. Removes WIN16.
So long, MS_CALLBACK and MS_FAR. We won't miss you.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'ssl')
-rw-r--r-- | ssl/s3_both.c | 6 | ||||
-rw-r--r-- | ssl/s3_lib.c | 2 | ||||
-rw-r--r-- | ssl/ssl_lib.c | 4 | ||||
-rw-r--r-- | ssl/ssltest.c | 16 |
4 files changed, 9 insertions, 19 deletions
diff --git a/ssl/s3_both.c b/ssl/s3_both.c index 4e698bd637..72521531bd 100644 --- a/ssl/s3_both.c +++ b/ssl/s3_both.c @@ -183,12 +183,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 ssl_set_handshake_header(s, SSL3_MT_FINISHED, l); s->state=b; } diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c index 14a4a6e914..fcaaa7bf70 100644 --- a/ssl/s3_lib.c +++ b/ssl/s3_lib.c @@ -3441,7 +3441,7 @@ void ssl3_clear(SSL *s) } #ifndef OPENSSL_NO_SRP -static char * MS_CALLBACK srp_password_from_info_cb(SSL *s, void *arg) +static char * srp_password_from_info_cb(SSL *s, void *arg) { return BUF_strdup(s->srp_ctx.info) ; } diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index f9f91e666c..b17a3ed848 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -3602,10 +3602,6 @@ void *SSL_CTX_get0_security_ex_data(const SSL_CTX *ctx) return ctx->cert->sec_ex; } -#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, diff --git a/ssl/ssltest.c b/ssl/ssltest.c index 81292591d6..c3684c37ec 100644 --- a/ssl/ssltest.c +++ b/ssl/ssltest.c @@ -217,12 +217,12 @@ #define COMP_RLE 255 #define COMP_ZLIB 1 -static int MS_CALLBACK verify_callback(int ok, X509_STORE_CTX *ctx); +static int verify_callback(int ok, X509_STORE_CTX *ctx); #ifndef OPENSSL_NO_RSA -static RSA MS_CALLBACK *tmp_rsa_cb(SSL *s, int is_export,int keylength); +static RSA *tmp_rsa_cb(SSL *s, int is_export,int keylength); static void free_tmp_rsa(void); #endif -static int MS_CALLBACK app_verify_callback(X509_STORE_CTX *ctx, void *arg); +static int app_verify_callback(X509_STORE_CTX *ctx, void *arg); #define APP_CALLBACK_STRING "Test Callback Argument" struct app_verify_arg { @@ -260,7 +260,7 @@ typedef struct srp_client_arg_st #define PWD_STRLEN 1024 -static char * MS_CALLBACK ssl_give_srp_client_pwd_cb(SSL *s, void *arg) +static char * ssl_give_srp_client_pwd_cb(SSL *s, void *arg) { SRP_CLIENT_ARG *srp_client_arg = (SRP_CLIENT_ARG *)arg; return BUF_strdup((char *)srp_client_arg->srppassin); @@ -274,7 +274,7 @@ typedef struct srp_server_arg_st char *pass; } SRP_SERVER_ARG; -static int MS_CALLBACK ssl_srp_server_param_cb(SSL *s, int *ad, void *arg) +static int ssl_srp_server_param_cb(SSL *s, int *ad, void *arg) { SRP_SERVER_ARG * p = (SRP_SERVER_ARG *) arg; @@ -2650,7 +2650,7 @@ static int get_proxy_auth_ex_data_idx(void) return idx; } -static int MS_CALLBACK verify_callback(int ok, X509_STORE_CTX *ctx) +static int verify_callback(int ok, X509_STORE_CTX *ctx) { char *s,buf[256]; @@ -3025,7 +3025,7 @@ static int process_proxy_cond(unsigned int letters[26], return process_proxy_cond_adders(letters, cond, cond_end, &pos, 1); } -static int MS_CALLBACK app_verify_callback(X509_STORE_CTX *ctx, void *arg) +static int app_verify_callback(X509_STORE_CTX *ctx, void *arg) { int ok=1; struct app_verify_arg *cb_arg = arg; @@ -3119,7 +3119,7 @@ static int MS_CALLBACK app_verify_callback(X509_STORE_CTX *ctx, void *arg) #ifndef OPENSSL_NO_RSA static RSA *rsa_tmp=NULL; -static RSA MS_CALLBACK *tmp_rsa_cb(SSL *s, int is_export, int keylength) +static RSA *tmp_rsa_cb(SSL *s, int is_export, int keylength) { BIGNUM *bn = NULL; if (rsa_tmp == NULL) |