Make shorter TS symbols for OpenVMS.
authorRichard Levitte <levitte@openssl.org>
Thu, 2 Mar 2006 13:55:40 +0000 (13:55 +0000)
committerRichard Levitte <levitte@openssl.org>
Thu, 2 Mar 2006 13:55:40 +0000 (13:55 +0000)
Don't convert a function pointer to a void*, ISO C doesn't like that.

crypto/symhacks.h
crypto/ts/ts_rsp_sign.c

index db91bc5..6067812 100644 (file)
 #undef STORE_method_get_unlock_store_function
 #define STORE_method_get_unlock_store_function STORE_meth_get_unlock_store_fn
 
+/* Hack som long TS names */
+#undef TS_RESP_CTX_set_status_info_cond
+#define TS_RESP_CTX_set_status_info_cond       TS_RESP_CTX_set_stat_info_cond
+#undef TS_RESP_CTX_set_clock_precision_digits
+#define TS_RESP_CTX_set_clock_precision_digits TS_RESP_CTX_set_clk_prec_digits
+#undef TS_CONF_set_clock_precision_digits
+#define TS_CONF_set_clock_precision_digits     TS_CONF_set_clk_prec_digits
+
 #endif /* defined OPENSSL_SYS_VMS */
 
 
index ea4506a..aa1b637 100644 (file)
@@ -689,7 +689,14 @@ static int TS_RESP_process_extensions(TS_RESP_CTX *ctx)
        for (i = 0; ok && i < sk_X509_EXTENSION_num(exts); ++i)
                {
                X509_EXTENSION *ext = sk_X509_EXTENSION_value(exts, i);
-               ok = (*ctx->extension_cb)(ctx, ext, (void *)ctx->extension_cb);
+               /* XXXXX The last argument was previously
+                  (void *)ctx->extension_cb, but ISO C doesn't permit
+                  converting a function pointer to void *.  For lack of
+                  better information, I'm placing a NULL there instead.
+                  The callback can pick its own address out from the ctx
+                  anyway...
+               */
+               ok = (*ctx->extension_cb)(ctx, ext, NULL);
                }
 
        return ok;