summaryrefslogtreecommitdiffstats
path: root/crypto/stack
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2004-03-25 13:37:02 +0000
committerDr. Stephen Henson <steve@openssl.org>2004-03-25 13:37:02 +0000
commit69d1d5e6cee22de3ecc353d156e8ace7abb58afb (patch)
treed6eebd5684b57580ec87194bc80e555edbe7d92f /crypto/stack
parentc86f2054f39c7005bc03f91db2d7bcf38f0a92ac (diff)
Fix ASN1 warnings.
Diffstat (limited to 'crypto/stack')
-rw-r--r--crypto/stack/safestack.h15
1 files changed, 8 insertions, 7 deletions
diff --git a/crypto/stack/safestack.h b/crypto/stack/safestack.h
index cd9e780e4d..e52a859eb3 100644
--- a/crypto/stack/safestack.h
+++ b/crypto/stack/safestack.h
@@ -115,10 +115,10 @@ STACK_OF(type) \
((void (*)(STACK_OF(type) *))sk_sort)(st)
#define SKM_ASN1_SET_OF_d2i(type, st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
- ((STACK_OF(type) * (*) (STACK_OF(type) **,unsigned char **, long , \
- type *(*)(type **, unsigned char **,long), \
- void (*)(type *), int ,int )) d2i_ASN1_SET) \
- (st,pp,length, d2i_func, free_func, ex_tag,ex_class)
+((STACK_OF(type) * (*) (STACK_OF(type) **,const unsigned char **, long , \
+ type *(*)(type **, const unsigned char **,long), \
+ void (*)(type *), int ,int )) d2i_ASN1_SET) \
+ (st,pp,length, d2i_func, free_func, ex_tag,ex_class)
#define SKM_ASN1_SET_OF_i2d(type, st, pp, i2d_func, ex_tag, ex_class, is_set) \
((int (*)(STACK_OF(type) *,unsigned char **, \
int (*)(type *,unsigned char **), int , int , int)) i2d_ASN1_SET) \
@@ -129,14 +129,15 @@ STACK_OF(type) \
int (*)(type *,unsigned char **), unsigned char **,int *)) ASN1_seq_pack) \
(st, i2d_func, buf, len)
#define SKM_ASN1_seq_unpack(type, buf, len, d2i_func, free_func) \
- ((STACK_OF(type) * (*)(unsigned char *,int, \
- type *(*)(type **,unsigned char **, long), \
+ ((STACK_OF(type) * (*)(const unsigned char *,int, \
+ type *(*)(type **,const unsigned char **, long), \
void (*)(type *)))ASN1_seq_unpack) \
(buf,len,d2i_func, free_func)
#define SKM_PKCS12_decrypt_d2i(type, algor, d2i_func, free_func, pass, passlen, oct, seq) \
((STACK_OF(type) * (*)(X509_ALGOR *, \
- type *(*)(type **, unsigned char **, long), void (*)(type *), \
+ type *(*)(type **, const unsigned char **, long), \
+ void (*)(type *), \
const char *, int, \
ASN1_STRING *, int))PKCS12_decrypt_d2i) \
(algor,d2i_func,free_func,pass,passlen,oct,seq)