diff options
author | Dr. Stephen Henson <steve@openssl.org> | 2000-06-16 23:29:26 +0000 |
---|---|---|
committer | Dr. Stephen Henson <steve@openssl.org> | 2000-06-16 23:29:26 +0000 |
commit | 3aceb94b9e6ac4722b96d4fb1cf7e1a4358941e0 (patch) | |
tree | 9adfd28b708d52c0f0efac181d7cfadc0f1ecb9a /crypto/pkcs7/pk7_mime.c | |
parent | fb3e1eeb9364bc4d895cbdc5c048831cc7790c20 (diff) |
Safe stack reorganisation in terms of function casts.
After some messing around this seems to work but needs
a few more tests. Working out the syntax for sk_set_cmp_func()
(cast it to a function that itself returns a function pointer)
was painful :-(
Needs some testing to see what other compilers think of this
syntax.
Also needs similar stuff for ASN1_SET_OF etc etc.
Diffstat (limited to 'crypto/pkcs7/pk7_mime.c')
-rw-r--r-- | crypto/pkcs7/pk7_mime.c | 62 |
1 files changed, 0 insertions, 62 deletions
diff --git a/crypto/pkcs7/pk7_mime.c b/crypto/pkcs7/pk7_mime.c index 7c6649cc14..9741aa578e 100644 --- a/crypto/pkcs7/pk7_mime.c +++ b/crypto/pkcs7/pk7_mime.c @@ -75,37 +75,6 @@ char *param_value; /* Param value e.g. "sha1" */ } MIME_PARAM; DECLARE_STACK_OF(MIME_PARAM) -/* This block of defines is updated by a perl script, please do not touch! */ -#ifndef DEBUG_SAFESTACK - #define sk_MIME_PARAM_new(a) sk_new((int (*) \ - (const char * const *, const char * const *))(a)) - #define sk_MIME_PARAM_new_null() sk_new_null() - #define sk_MIME_PARAM_free(a) sk_free(a) - #define sk_MIME_PARAM_num(a) sk_num(a) - #define sk_MIME_PARAM_value(a,b) ((MIME_PARAM *) \ - sk_value((a),(b))) - #define sk_MIME_PARAM_set(a,b,c) ((MIME_PARAM *) \ - sk_set((a),(b),(char *)(c))) - #define sk_MIME_PARAM_zero(a) sk_zero(a) - #define sk_MIME_PARAM_push(a,b) sk_push((a),(char *)(b)) - #define sk_MIME_PARAM_unshift(a,b) sk_unshift((a),(b)) - #define sk_MIME_PARAM_find(a,b) sk_find((a), (char *)(b)) - #define sk_MIME_PARAM_delete(a,b) ((MIME_PARAM *) \ - sk_delete((a),(b))) - #define sk_MIME_PARAM_delete_ptr(a,b) ((MIME_PARAM *) \ - sk_delete_ptr((a),(char *)(b))) - #define sk_MIME_PARAM_insert(a,b,c) sk_insert((a),(char *)(b),(c)) - #define sk_MIME_PARAM_set_cmp_func(a,b) ((int (*) \ - (const MIME_PARAM * const *,const MIME_PARAM * const *)) \ - sk_set_cmp_func((a),(int (*) \ - (const char * const *, const char * const *))(b))) - #define sk_MIME_PARAM_dup(a) sk_dup(a) - #define sk_MIME_PARAM_pop_free(a,b) sk_pop_free((a),(void (*)(void *))(b)) - #define sk_MIME_PARAM_shift(a) ((MIME_PARAM *)sk_shift(a)) - #define sk_MIME_PARAM_pop(a) ((MIME_PARAM *)sk_pop(a)) - #define sk_MIME_PARAM_sort(a) sk_sort(a) -#endif /* !DEBUG_SAFESTACK */ -/* End of perl script block, you may now edit :-) */ IMPLEMENT_STACK_OF(MIME_PARAM) typedef struct { @@ -115,37 +84,6 @@ STACK_OF(MIME_PARAM) *params; /* Zero or more parameters */ } MIME_HEADER; DECLARE_STACK_OF(MIME_HEADER) -/* This block of defines is updated by a perl script, please do not touch! */ -#ifndef DEBUG_SAFESTACK - #define sk_MIME_HEADER_new(a) sk_new((int (*) \ - (const char * const *, const char * const *))(a)) - #define sk_MIME_HEADER_new_null() sk_new_null() - #define sk_MIME_HEADER_free(a) sk_free(a) - #define sk_MIME_HEADER_num(a) sk_num(a) - #define sk_MIME_HEADER_value(a,b) ((MIME_HEADER *) \ - sk_value((a),(b))) - #define sk_MIME_HEADER_set(a,b,c) ((MIME_HEADER *) \ - sk_set((a),(b),(char *)(c))) - #define sk_MIME_HEADER_zero(a) sk_zero(a) - #define sk_MIME_HEADER_push(a,b) sk_push((a),(char *)(b)) - #define sk_MIME_HEADER_unshift(a,b) sk_unshift((a),(b)) - #define sk_MIME_HEADER_find(a,b) sk_find((a), (char *)(b)) - #define sk_MIME_HEADER_delete(a,b) ((MIME_HEADER *) \ - sk_delete((a),(b))) - #define sk_MIME_HEADER_delete_ptr(a,b) ((MIME_HEADER *) \ - sk_delete_ptr((a),(char *)(b))) - #define sk_MIME_HEADER_insert(a,b,c) sk_insert((a),(char *)(b),(c)) - #define sk_MIME_HEADER_set_cmp_func(a,b) ((int (*) \ - (const MIME_HEADER * const *,const MIME_HEADER * const *)) \ - sk_set_cmp_func((a),(int (*) \ - (const char * const *, const char * const *))(b))) - #define sk_MIME_HEADER_dup(a) sk_dup(a) - #define sk_MIME_HEADER_pop_free(a,b) sk_pop_free((a),(void (*)(void *))(b)) - #define sk_MIME_HEADER_shift(a) ((MIME_HEADER *)sk_shift(a)) - #define sk_MIME_HEADER_pop(a) ((MIME_HEADER *)sk_pop(a)) - #define sk_MIME_HEADER_sort(a) sk_sort(a) -#endif /* !DEBUG_SAFESTACK */ -/* End of perl script block, you may now edit :-) */ IMPLEMENT_STACK_OF(MIME_HEADER) static int B64_write_PKCS7(BIO *bio, PKCS7 *p7); |