Rid the world of yet more evil casts.

diff --git a/crypto/x509/x509_vfy.c b/crypto/x509/x509_vfy.c
index debefef..0d3187d 100644 (file)
--- a/crypto/x509/x509_vfy.c
+++ b/crypto/x509/x509_vfy.c
@@ -607,12 +607,12 @@ void (*free_func)();
 int X509_STORE_CTX_set_ex_data(ctx,idx,data)
 X509_STORE_CTX *ctx;
 int idx;
 int X509_STORE_CTX_set_ex_data(ctx,idx,data)
 X509_STORE_CTX *ctx;
 int idx;

-char *data;
+void *data;

        {
        return(CRYPTO_set_ex_data(&ctx->ex_data,idx,data));
        }
 
        {
        return(CRYPTO_set_ex_data(&ctx->ex_data,idx,data));
        }
 

-char *X509_STORE_CTX_get_ex_data(ctx,idx)
+void *X509_STORE_CTX_get_ex_data(ctx,idx)

 X509_STORE_CTX *ctx;
 int idx;
        {
 X509_STORE_CTX *ctx;
 int idx;
        {

diff --git a/crypto/x509/x509_vfy.h b/crypto/x509/x509_vfy.h
index 03b40f2..929045f 100644 (file)
--- a/crypto/x509/x509_vfy.h
+++ b/crypto/x509/x509_vfy.h
@@ -309,8 +309,8 @@ int X509_STORE_set_default_paths(X509_STORE *ctx);
 
 int X509_STORE_CTX_get_ex_new_index(long argl, char *argp, int (*new_func)(),
        int (*dup_func)(), void (*free_func)());
 
 int X509_STORE_CTX_get_ex_new_index(long argl, char *argp, int (*new_func)(),
        int (*dup_func)(), void (*free_func)());

-int    X509_STORE_CTX_set_ex_data(X509_STORE_CTX *ctx,int idx,char *data);
-char * X509_STORE_CTX_get_ex_data(X509_STORE_CTX *ctx,int idx);
+int    X509_STORE_CTX_set_ex_data(X509_STORE_CTX *ctx,int idx,void *data);
+void * X509_STORE_CTX_get_ex_data(X509_STORE_CTX *ctx,int idx);

 int    X509_STORE_CTX_get_error(X509_STORE_CTX *ctx);
 void   X509_STORE_CTX_set_error(X509_STORE_CTX *ctx,int s);
 int    X509_STORE_CTX_get_error_depth(X509_STORE_CTX *ctx);
 int    X509_STORE_CTX_get_error(X509_STORE_CTX *ctx);
 void   X509_STORE_CTX_set_error(X509_STORE_CTX *ctx,int s);
 int    X509_STORE_CTX_get_error_depth(X509_STORE_CTX *ctx);


@@ -370,7 +370,7 @@ int X509_STORE_set_default_paths();
 
 int X509_STORE_CTX_get_ex_new_index();
 int    X509_STORE_CTX_set_ex_data();
 
 int X509_STORE_CTX_get_ex_new_index();
 int    X509_STORE_CTX_set_ex_data();

-char * X509_STORE_CTX_get_ex_data();
+void * X509_STORE_CTX_get_ex_data();

 int    X509_STORE_CTX_get_error();
 void   X509_STORE_CTX_set_error();
 int    X509_STORE_CTX_get_error_depth();
 int    X509_STORE_CTX_get_error();
 void   X509_STORE_CTX_set_error();
 int    X509_STORE_CTX_get_error_depth();