diff options
| author | Richard Levitte <levitte@openssl.org> | 2006-03-02 13:55:40 +0000 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2006-03-02 13:55:40 +0000 |
| commit | 6e2fcc44bd5c032e68039cdf68d9263dfc1e7301 (patch) | |
| tree | 4e734ddb4335904f2375c13722d723b11f322d1c /crypto | |
| parent | 8721fc2d0b83f8e375ca90e3fab5af88b6690e78 (diff) | |
Make shorter TS symbols for OpenVMS.
Don't convert a function pointer to a void*, ISO C doesn't like that.
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/symhacks.h | 8 | ||||
| -rw-r--r-- | crypto/ts/ts_rsp_sign.c | 9 |
2 files changed, 16 insertions, 1 deletions
diff --git a/crypto/symhacks.h b/crypto/symhacks.h index db91bc562d..60678127ce 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 ea4506a9ee..aa1b6370d9 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; |