diff --git a/crypto/symhacks.h b/crypto/symhacks.h
index db91bc562da9f0295cf7acdb7b39c86bf48932dd..60678127ce66c6078f7bda682cffcd62197d6cde 100644
--- a/crypto/symhacks.h
+++ b/crypto/symhacks.h
@@ -342,6 +342,14 @@
 #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 */
 
 
diff --git a/crypto/ts/ts_rsp_sign.c b/crypto/ts/ts_rsp_sign.c
index ea4506a9ee8f62f3eb0bb34e32349e8bcf975a81..aa1b6370d9d4476cd1cb5711ed83ba77951e5c10 100644
--- a/crypto/ts/ts_rsp_sign.c
+++ b/crypto/ts/ts_rsp_sign.c
@@ -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;