remove more cases of MS_STATIC, MS_CALLBACK, and MS_FAR. Did you

know that MS_STATIC doesn't mean it is static?  How far can lies
and half-truths be layered?  I wonder if anyone got fooled, and
actually returned a pointer..
ok beck

1 files changed, 11 insertions, 11 deletions

diff --git a/src/lib/libssl/src/ssl/ssltest.c b/src/lib/libssl/src/ssl/ssltest.c
index 4f80be8ee4..8a602cc551 100644
--- a/src/lib/libssl/src/ssl/ssltest.c
+++ b/src/lib/libssl/src/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;
 
@@ -1230,7 +1230,7 @@ int doit_biopair(SSL *s_ssl, SSL *c_ssl, long count,
                         {
                         /* CLIENT */
                 
-                        MS_STATIC char cbuf[1024*8];
+                        char cbuf[1024*8];
                         int i, r;
                         clock_t c_clock = clock();
 
@@ -1316,7 +1316,7 @@ int doit_biopair(SSL *s_ssl, SSL *c_ssl, long count,
                         {
                         /* SERVER */
                 
-                        MS_STATIC char sbuf[1024*8];
+                        char sbuf[1024*8];
                         int i, r;
                         clock_t s_clock = clock();
 
@@ -1550,7 +1550,7 @@ end:
 
 int doit(SSL *s_ssl, SSL *c_ssl, long count)
         {
-        MS_STATIC char cbuf[1024*8],sbuf[1024*8];
+        char cbuf[1024*8],sbuf[1024*8];
         long cw_num=count,cr_num=count;
         long sw_num=count,sr_num=count;
         int ret=1;
@@ -1858,7 +1858,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];
 
@@ -2232,7 +2232,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;
@@ -2326,7 +2326,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)