Make sure id2_func is properly cast as well...

diff --git a/crypto/stack/safestack.h b/crypto/stack/safestack.h
index 3ae9d272da09c2e892db5134715e9055941534d6..38dd103641afce5bdc84bf5951016b72cd389d0e 100644 (file)
--- a/crypto/stack/safestack.h
+++ b/crypto/stack/safestack.h
@@ -196,10 +196,10 @@ STACK_OF(type) \
 #define        SKM_ASN1_SET_OF_d2i(type, st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
        d2i_ASN1_SET(st,pp,length, (void *(*)(void ** ,const unsigned char ** ,long))d2i_func, (void (*)(void *))free_func, ex_tag,ex_class)
 #define        SKM_ASN1_SET_OF_i2d(type, st, pp, i2d_func, ex_tag, ex_class, is_set) \
 #define        SKM_ASN1_SET_OF_d2i(type, st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
        d2i_ASN1_SET(st,pp,length, (void *(*)(void ** ,const unsigned char ** ,long))d2i_func, (void (*)(void *))free_func, ex_tag,ex_class)
 #define        SKM_ASN1_SET_OF_i2d(type, st, pp, i2d_func, ex_tag, ex_class, is_set) \

-       i2d_ASN1_SET(st,pp,i2d_func,ex_tag,ex_class,is_set)
+       i2d_ASN1_SET(st,pp,(int (*)(void *, unsigned char **))i2d_func,ex_tag,ex_class,is_set)

 
 #define        SKM_ASN1_seq_pack(type, st, i2d_func, buf, len) \
 
 #define        SKM_ASN1_seq_pack(type, st, i2d_func, buf, len) \

-       ASN1_seq_pack(st, i2d_func, buf, len)
+       ASN1_seq_pack(st, (int (*)(void *, unsigned char **))i2d_func, buf, len)

 #define        SKM_ASN1_seq_unpack(type, buf, len, d2i_func, free_func) \
        ASN1_seq_unpack(buf,len,(void *(*)(void **,const unsigned char **,long))d2i_func, (void(*)(void *))free_func)
 
 #define        SKM_ASN1_seq_unpack(type, buf, len, d2i_func, free_func) \
        ASN1_seq_unpack(buf,len,(void *(*)(void **,const unsigned char **,long))d2i_func, (void(*)(void *))free_func)