Safe stack reorganisation in terms of function casts.

[openssl.git] / crypto / x509 / x509.h

diff --git a/crypto/x509/x509.h b/crypto/x509/x509.h
index 87f192fa80bb1421f242c04ee4e03c538c9c3a7f..baf76f3e1e6527308213a35af40e9ef9defb2625 100644 (file)
--- a/crypto/x509/x509.h
+++ b/crypto/x509/x509.h
@@ -152,37 +152,6 @@ typedef struct X509_algor_st
        } X509_ALGOR;
 
 DECLARE_STACK_OF(X509_ALGOR)
        } X509_ALGOR;
 
 DECLARE_STACK_OF(X509_ALGOR)

-/* This block of defines is updated by a perl script, please do not touch! */
-#ifndef DEBUG_SAFESTACK
-       #define sk_X509_ALGOR_new(a) sk_new((int (*) \
-               (const char * const *, const char * const *))(a))
-       #define sk_X509_ALGOR_new_null() sk_new_null()
-       #define sk_X509_ALGOR_free(a) sk_free(a)
-       #define sk_X509_ALGOR_num(a) sk_num(a)
-       #define sk_X509_ALGOR_value(a,b) ((X509_ALGOR *) \
-               sk_value((a),(b)))
-       #define sk_X509_ALGOR_set(a,b,c) ((X509_ALGOR *) \
-               sk_set((a),(b),(char *)(c)))
-       #define sk_X509_ALGOR_zero(a) sk_zero(a)
-       #define sk_X509_ALGOR_push(a,b) sk_push((a),(char *)(b))
-       #define sk_X509_ALGOR_unshift(a,b) sk_unshift((a),(b))
-       #define sk_X509_ALGOR_find(a,b) sk_find((a), (char *)(b))
-       #define sk_X509_ALGOR_delete(a,b) ((X509_ALGOR *) \
-               sk_delete((a),(b)))
-       #define sk_X509_ALGOR_delete_ptr(a,b) ((X509_ALGOR *) \
-               sk_delete_ptr((a),(char *)(b)))
-       #define sk_X509_ALGOR_insert(a,b,c) sk_insert((a),(char *)(b),(c))
-       #define sk_X509_ALGOR_set_cmp_func(a,b) ((int (*) \
-               (const X509_ALGOR * const *,const X509_ALGOR * const *)) \
-               sk_set_cmp_func((a),(int (*) \
-               (const char * const *, const char * const *))(b)))
-       #define sk_X509_ALGOR_dup(a) sk_dup(a)
-       #define sk_X509_ALGOR_pop_free(a,b) sk_pop_free((a),(void (*)(void *))(b))
-       #define sk_X509_ALGOR_shift(a) ((X509_ALGOR *)sk_shift(a))
-       #define sk_X509_ALGOR_pop(a) ((X509_ALGOR *)sk_pop(a))
-       #define sk_X509_ALGOR_sort(a) sk_sort(a)
-#endif /* !DEBUG_SAFESTACK */
-/* End of perl script block, you may now edit :-) */

 DECLARE_ASN1_SET_OF(X509_ALGOR)
 
 typedef struct X509_val_st
 DECLARE_ASN1_SET_OF(X509_ALGOR)
 
 typedef struct X509_val_st


@@ -213,37 +182,6 @@ typedef struct X509_name_entry_st
        } X509_NAME_ENTRY;
 
 DECLARE_STACK_OF(X509_NAME_ENTRY)
        } X509_NAME_ENTRY;
 
 DECLARE_STACK_OF(X509_NAME_ENTRY)

-/* This block of defines is updated by a perl script, please do not touch! */
-#ifndef DEBUG_SAFESTACK
-       #define sk_X509_NAME_ENTRY_new(a) sk_new((int (*) \
-               (const char * const *, const char * const *))(a))
-       #define sk_X509_NAME_ENTRY_new_null() sk_new_null()
-       #define sk_X509_NAME_ENTRY_free(a) sk_free(a)
-       #define sk_X509_NAME_ENTRY_num(a) sk_num(a)
-       #define sk_X509_NAME_ENTRY_value(a,b) ((X509_NAME_ENTRY *) \
-               sk_value((a),(b)))
-       #define sk_X509_NAME_ENTRY_set(a,b,c) ((X509_NAME_ENTRY *) \
-               sk_set((a),(b),(char *)(c)))
-       #define sk_X509_NAME_ENTRY_zero(a) sk_zero(a)
-       #define sk_X509_NAME_ENTRY_push(a,b) sk_push((a),(char *)(b))
-       #define sk_X509_NAME_ENTRY_unshift(a,b) sk_unshift((a),(b))
-       #define sk_X509_NAME_ENTRY_find(a,b) sk_find((a), (char *)(b))
-       #define sk_X509_NAME_ENTRY_delete(a,b) ((X509_NAME_ENTRY *) \
-               sk_delete((a),(b)))
-       #define sk_X509_NAME_ENTRY_delete_ptr(a,b) ((X509_NAME_ENTRY *) \
-               sk_delete_ptr((a),(char *)(b)))
-       #define sk_X509_NAME_ENTRY_insert(a,b,c) sk_insert((a),(char *)(b),(c))
-       #define sk_X509_NAME_ENTRY_set_cmp_func(a,b) ((int (*) \
-               (const X509_NAME_ENTRY * const *,const X509_NAME_ENTRY * const *)) \
-               sk_set_cmp_func((a),(int (*) \
-               (const char * const *, const char * const *))(b)))
-       #define sk_X509_NAME_ENTRY_dup(a) sk_dup(a)
-       #define sk_X509_NAME_ENTRY_pop_free(a,b) sk_pop_free((a),(void (*)(void *))(b))
-       #define sk_X509_NAME_ENTRY_shift(a) ((X509_NAME_ENTRY *)sk_shift(a))
-       #define sk_X509_NAME_ENTRY_pop(a) ((X509_NAME_ENTRY *)sk_pop(a))
-       #define sk_X509_NAME_ENTRY_sort(a) sk_sort(a)
-#endif /* !DEBUG_SAFESTACK */
-/* End of perl script block, you may now edit :-) */

 DECLARE_ASN1_SET_OF(X509_NAME_ENTRY)
 
 /* we always keep X509_NAMEs in 2 forms. */
 DECLARE_ASN1_SET_OF(X509_NAME_ENTRY)
 
 /* we always keep X509_NAMEs in 2 forms. */


@@ -260,37 +198,6 @@ typedef struct X509_name_st
        } X509_NAME;
 
 DECLARE_STACK_OF(X509_NAME)
        } X509_NAME;
 
 DECLARE_STACK_OF(X509_NAME)

-/* This block of defines is updated by a perl script, please do not touch! */
-#ifndef DEBUG_SAFESTACK
-       #define sk_X509_NAME_new(a) sk_new((int (*) \
-               (const char * const *, const char * const *))(a))
-       #define sk_X509_NAME_new_null() sk_new_null()
-       #define sk_X509_NAME_free(a) sk_free(a)
-       #define sk_X509_NAME_num(a) sk_num(a)
-       #define sk_X509_NAME_value(a,b) ((X509_NAME *) \
-               sk_value((a),(b)))
-       #define sk_X509_NAME_set(a,b,c) ((X509_NAME *) \
-               sk_set((a),(b),(char *)(c)))
-       #define sk_X509_NAME_zero(a) sk_zero(a)
-       #define sk_X509_NAME_push(a,b) sk_push((a),(char *)(b))
-       #define sk_X509_NAME_unshift(a,b) sk_unshift((a),(b))
-       #define sk_X509_NAME_find(a,b) sk_find((a), (char *)(b))
-       #define sk_X509_NAME_delete(a,b) ((X509_NAME *) \
-               sk_delete((a),(b)))
-       #define sk_X509_NAME_delete_ptr(a,b) ((X509_NAME *) \
-               sk_delete_ptr((a),(char *)(b)))
-       #define sk_X509_NAME_insert(a,b,c) sk_insert((a),(char *)(b),(c))
-       #define sk_X509_NAME_set_cmp_func(a,b) ((int (*) \
-               (const X509_NAME * const *,const X509_NAME * const *)) \
-               sk_set_cmp_func((a),(int (*) \
-               (const char * const *, const char * const *))(b)))
-       #define sk_X509_NAME_dup(a) sk_dup(a)
-       #define sk_X509_NAME_pop_free(a,b) sk_pop_free((a),(void (*)(void *))(b))
-       #define sk_X509_NAME_shift(a) ((X509_NAME *)sk_shift(a))
-       #define sk_X509_NAME_pop(a) ((X509_NAME *)sk_pop(a))
-       #define sk_X509_NAME_sort(a) sk_sort(a)
-#endif /* !DEBUG_SAFESTACK */
-/* End of perl script block, you may now edit :-) */

 
 #define X509_EX_V_NETSCAPE_HACK                0x8000
 #define X509_EX_V_INIT                 0x0001
 
 #define X509_EX_V_NETSCAPE_HACK                0x8000
 #define X509_EX_V_INIT                 0x0001


@@ -305,37 +212,6 @@ typedef struct X509_extension_st
        } X509_EXTENSION;
 
 DECLARE_STACK_OF(X509_EXTENSION)
        } X509_EXTENSION;
 
 DECLARE_STACK_OF(X509_EXTENSION)

-/* This block of defines is updated by a perl script, please do not touch! */
-#ifndef DEBUG_SAFESTACK
-       #define sk_X509_EXTENSION_new(a) sk_new((int (*) \
-               (const char * const *, const char * const *))(a))
-       #define sk_X509_EXTENSION_new_null() sk_new_null()
-       #define sk_X509_EXTENSION_free(a) sk_free(a)
-       #define sk_X509_EXTENSION_num(a) sk_num(a)
-       #define sk_X509_EXTENSION_value(a,b) ((X509_EXTENSION *) \
-               sk_value((a),(b)))
-       #define sk_X509_EXTENSION_set(a,b,c) ((X509_EXTENSION *) \
-               sk_set((a),(b),(char *)(c)))
-       #define sk_X509_EXTENSION_zero(a) sk_zero(a)
-       #define sk_X509_EXTENSION_push(a,b) sk_push((a),(char *)(b))
-       #define sk_X509_EXTENSION_unshift(a,b) sk_unshift((a),(b))
-       #define sk_X509_EXTENSION_find(a,b) sk_find((a), (char *)(b))
-       #define sk_X509_EXTENSION_delete(a,b) ((X509_EXTENSION *) \
-               sk_delete((a),(b)))
-       #define sk_X509_EXTENSION_delete_ptr(a,b) ((X509_EXTENSION *) \
-               sk_delete_ptr((a),(char *)(b)))
-       #define sk_X509_EXTENSION_insert(a,b,c) sk_insert((a),(char *)(b),(c))
-       #define sk_X509_EXTENSION_set_cmp_func(a,b) ((int (*) \
-               (const X509_EXTENSION * const *,const X509_EXTENSION * const *)) \
-               sk_set_cmp_func((a),(int (*) \
-               (const char * const *, const char * const *))(b)))
-       #define sk_X509_EXTENSION_dup(a) sk_dup(a)
-       #define sk_X509_EXTENSION_pop_free(a,b) sk_pop_free((a),(void (*)(void *))(b))
-       #define sk_X509_EXTENSION_shift(a) ((X509_EXTENSION *)sk_shift(a))
-       #define sk_X509_EXTENSION_pop(a) ((X509_EXTENSION *)sk_pop(a))
-       #define sk_X509_EXTENSION_sort(a) sk_sort(a)
-#endif /* !DEBUG_SAFESTACK */
-/* End of perl script block, you may now edit :-) */

 DECLARE_ASN1_SET_OF(X509_EXTENSION)
 
 /* a sequence of these are used */
 DECLARE_ASN1_SET_OF(X509_EXTENSION)
 
 /* a sequence of these are used */


@@ -351,37 +227,6 @@ typedef struct x509_attributes_st
        } X509_ATTRIBUTE;
 
 DECLARE_STACK_OF(X509_ATTRIBUTE)
        } X509_ATTRIBUTE;
 
 DECLARE_STACK_OF(X509_ATTRIBUTE)

-/* This block of defines is updated by a perl script, please do not touch! */
-#ifndef DEBUG_SAFESTACK
-       #define sk_X509_ATTRIBUTE_new(a) sk_new((int (*) \
-               (const char * const *, const char * const *))(a))
-       #define sk_X509_ATTRIBUTE_new_null() sk_new_null()
-       #define sk_X509_ATTRIBUTE_free(a) sk_free(a)
-       #define sk_X509_ATTRIBUTE_num(a) sk_num(a)
-       #define sk_X509_ATTRIBUTE_value(a,b) ((X509_ATTRIBUTE *) \
-               sk_value((a),(b)))
-       #define sk_X509_ATTRIBUTE_set(a,b,c) ((X509_ATTRIBUTE *) \
-               sk_set((a),(b),(char *)(c)))
-       #define sk_X509_ATTRIBUTE_zero(a) sk_zero(a)
-       #define sk_X509_ATTRIBUTE_push(a,b) sk_push((a),(char *)(b))
-       #define sk_X509_ATTRIBUTE_unshift(a,b) sk_unshift((a),(b))
-       #define sk_X509_ATTRIBUTE_find(a,b) sk_find((a), (char *)(b))
-       #define sk_X509_ATTRIBUTE_delete(a,b) ((X509_ATTRIBUTE *) \
-               sk_delete((a),(b)))
-       #define sk_X509_ATTRIBUTE_delete_ptr(a,b) ((X509_ATTRIBUTE *) \
-               sk_delete_ptr((a),(char *)(b)))
-       #define sk_X509_ATTRIBUTE_insert(a,b,c) sk_insert((a),(char *)(b),(c))
-       #define sk_X509_ATTRIBUTE_set_cmp_func(a,b) ((int (*) \
-               (const X509_ATTRIBUTE * const *,const X509_ATTRIBUTE * const *)) \
-               sk_set_cmp_func((a),(int (*) \
-               (const char * const *, const char * const *))(b)))
-       #define sk_X509_ATTRIBUTE_dup(a) sk_dup(a)
-       #define sk_X509_ATTRIBUTE_pop_free(a,b) sk_pop_free((a),(void (*)(void *))(b))
-       #define sk_X509_ATTRIBUTE_shift(a) ((X509_ATTRIBUTE *)sk_shift(a))
-       #define sk_X509_ATTRIBUTE_pop(a) ((X509_ATTRIBUTE *)sk_pop(a))
-       #define sk_X509_ATTRIBUTE_sort(a) sk_sort(a)
-#endif /* !DEBUG_SAFESTACK */
-/* End of perl script block, you may now edit :-) */

 DECLARE_ASN1_SET_OF(X509_ATTRIBUTE)
 
 typedef struct X509_req_info_st
 DECLARE_ASN1_SET_OF(X509_ATTRIBUTE)
 
 typedef struct X509_req_info_st


@@ -453,37 +298,6 @@ typedef struct x509_st
        } X509;
 
 DECLARE_STACK_OF(X509)
        } X509;
 
 DECLARE_STACK_OF(X509)

-/* This block of defines is updated by a perl script, please do not touch! */
-#ifndef DEBUG_SAFESTACK
-       #define sk_X509_new(a) sk_new((int (*) \
-               (const char * const *, const char * const *))(a))
-       #define sk_X509_new_null() sk_new_null()
-       #define sk_X509_free(a) sk_free(a)
-       #define sk_X509_num(a) sk_num(a)
-       #define sk_X509_value(a,b) ((X509 *) \
-               sk_value((a),(b)))
-       #define sk_X509_set(a,b,c) ((X509 *) \
-               sk_set((a),(b),(char *)(c)))
-       #define sk_X509_zero(a) sk_zero(a)
-       #define sk_X509_push(a,b) sk_push((a),(char *)(b))
-       #define sk_X509_unshift(a,b) sk_unshift((a),(b))
-       #define sk_X509_find(a,b) sk_find((a), (char *)(b))
-       #define sk_X509_delete(a,b) ((X509 *) \
-               sk_delete((a),(b)))
-       #define sk_X509_delete_ptr(a,b) ((X509 *) \
-               sk_delete_ptr((a),(char *)(b)))
-       #define sk_X509_insert(a,b,c) sk_insert((a),(char *)(b),(c))
-       #define sk_X509_set_cmp_func(a,b) ((int (*) \
-               (const X509 * const *,const X509 * const *)) \
-               sk_set_cmp_func((a),(int (*) \
-               (const char * const *, const char * const *))(b)))
-       #define sk_X509_dup(a) sk_dup(a)
-       #define sk_X509_pop_free(a,b) sk_pop_free((a),(void (*)(void *))(b))
-       #define sk_X509_shift(a) ((X509 *)sk_shift(a))
-       #define sk_X509_pop(a) ((X509 *)sk_pop(a))
-       #define sk_X509_sort(a) sk_sort(a)
-#endif /* !DEBUG_SAFESTACK */
-/* End of perl script block, you may now edit :-) */

 DECLARE_ASN1_SET_OF(X509)
 
 /* This is used for a table of trust checking functions */
 DECLARE_ASN1_SET_OF(X509)
 
 /* This is used for a table of trust checking functions */


@@ -498,37 +312,6 @@ typedef struct x509_trust_st {
 } X509_TRUST;
 
 DECLARE_STACK_OF(X509_TRUST)
 } X509_TRUST;
 
 DECLARE_STACK_OF(X509_TRUST)

-/* This block of defines is updated by a perl script, please do not touch! */
-#ifndef DEBUG_SAFESTACK
-       #define sk_X509_TRUST_new(a) sk_new((int (*) \
-               (const char * const *, const char * const *))(a))
-       #define sk_X509_TRUST_new_null() sk_new_null()
-       #define sk_X509_TRUST_free(a) sk_free(a)
-       #define sk_X509_TRUST_num(a) sk_num(a)
-       #define sk_X509_TRUST_value(a,b) ((X509_TRUST *) \
-               sk_value((a),(b)))
-       #define sk_X509_TRUST_set(a,b,c) ((X509_TRUST *) \
-               sk_set((a),(b),(char *)(c)))
-       #define sk_X509_TRUST_zero(a) sk_zero(a)
-       #define sk_X509_TRUST_push(a,b) sk_push((a),(char *)(b))
-       #define sk_X509_TRUST_unshift(a,b) sk_unshift((a),(b))
-       #define sk_X509_TRUST_find(a,b) sk_find((a), (char *)(b))
-       #define sk_X509_TRUST_delete(a,b) ((X509_TRUST *) \
-               sk_delete((a),(b)))
-       #define sk_X509_TRUST_delete_ptr(a,b) ((X509_TRUST *) \
-               sk_delete_ptr((a),(char *)(b)))
-       #define sk_X509_TRUST_insert(a,b,c) sk_insert((a),(char *)(b),(c))
-       #define sk_X509_TRUST_set_cmp_func(a,b) ((int (*) \
-               (const X509_TRUST * const *,const X509_TRUST * const *)) \
-               sk_set_cmp_func((a),(int (*) \
-               (const char * const *, const char * const *))(b)))
-       #define sk_X509_TRUST_dup(a) sk_dup(a)
-       #define sk_X509_TRUST_pop_free(a,b) sk_pop_free((a),(void (*)(void *))(b))
-       #define sk_X509_TRUST_shift(a) ((X509_TRUST *)sk_shift(a))
-       #define sk_X509_TRUST_pop(a) ((X509_TRUST *)sk_pop(a))
-       #define sk_X509_TRUST_sort(a) sk_sort(a)
-#endif /* !DEBUG_SAFESTACK */
-/* End of perl script block, you may now edit :-) */

 
 /* standard trust ids */
 
 
 /* standard trust ids */
 


@@ -564,37 +347,6 @@ typedef struct X509_revoked_st
        } X509_REVOKED;
 
 DECLARE_STACK_OF(X509_REVOKED)
        } X509_REVOKED;
 
 DECLARE_STACK_OF(X509_REVOKED)

-/* This block of defines is updated by a perl script, please do not touch! */
-#ifndef DEBUG_SAFESTACK
-       #define sk_X509_REVOKED_new(a) sk_new((int (*) \
-               (const char * const *, const char * const *))(a))
-       #define sk_X509_REVOKED_new_null() sk_new_null()
-       #define sk_X509_REVOKED_free(a) sk_free(a)
-       #define sk_X509_REVOKED_num(a) sk_num(a)
-       #define sk_X509_REVOKED_value(a,b) ((X509_REVOKED *) \
-               sk_value((a),(b)))
-       #define sk_X509_REVOKED_set(a,b,c) ((X509_REVOKED *) \
-               sk_set((a),(b),(char *)(c)))
-       #define sk_X509_REVOKED_zero(a) sk_zero(a)
-       #define sk_X509_REVOKED_push(a,b) sk_push((a),(char *)(b))
-       #define sk_X509_REVOKED_unshift(a,b) sk_unshift((a),(b))
-       #define sk_X509_REVOKED_find(a,b) sk_find((a), (char *)(b))
-       #define sk_X509_REVOKED_delete(a,b) ((X509_REVOKED *) \
-               sk_delete((a),(b)))
-       #define sk_X509_REVOKED_delete_ptr(a,b) ((X509_REVOKED *) \
-               sk_delete_ptr((a),(char *)(b)))
-       #define sk_X509_REVOKED_insert(a,b,c) sk_insert((a),(char *)(b),(c))
-       #define sk_X509_REVOKED_set_cmp_func(a,b) ((int (*) \
-               (const X509_REVOKED * const *,const X509_REVOKED * const *)) \
-               sk_set_cmp_func((a),(int (*) \
-               (const char * const *, const char * const *))(b)))
-       #define sk_X509_REVOKED_dup(a) sk_dup(a)
-       #define sk_X509_REVOKED_pop_free(a,b) sk_pop_free((a),(void (*)(void *))(b))
-       #define sk_X509_REVOKED_shift(a) ((X509_REVOKED *)sk_shift(a))
-       #define sk_X509_REVOKED_pop(a) ((X509_REVOKED *)sk_pop(a))
-       #define sk_X509_REVOKED_sort(a) sk_sort(a)
-#endif /* !DEBUG_SAFESTACK */
-/* End of perl script block, you may now edit :-) */

 DECLARE_ASN1_SET_OF(X509_REVOKED)
 
 typedef struct X509_crl_info_st
 DECLARE_ASN1_SET_OF(X509_REVOKED)
 
 typedef struct X509_crl_info_st


@@ -618,37 +370,6 @@ typedef struct X509_crl_st
        } X509_CRL;
 
 DECLARE_STACK_OF(X509_CRL)
        } X509_CRL;
 
 DECLARE_STACK_OF(X509_CRL)

-/* This block of defines is updated by a perl script, please do not touch! */
-#ifndef DEBUG_SAFESTACK
-       #define sk_X509_CRL_new(a) sk_new((int (*) \
-               (const char * const *, const char * const *))(a))
-       #define sk_X509_CRL_new_null() sk_new_null()
-       #define sk_X509_CRL_free(a) sk_free(a)
-       #define sk_X509_CRL_num(a) sk_num(a)
-       #define sk_X509_CRL_value(a,b) ((X509_CRL *) \
-               sk_value((a),(b)))
-       #define sk_X509_CRL_set(a,b,c) ((X509_CRL *) \
-               sk_set((a),(b),(char *)(c)))
-       #define sk_X509_CRL_zero(a) sk_zero(a)
-       #define sk_X509_CRL_push(a,b) sk_push((a),(char *)(b))
-       #define sk_X509_CRL_unshift(a,b) sk_unshift((a),(b))
-       #define sk_X509_CRL_find(a,b) sk_find((a), (char *)(b))
-       #define sk_X509_CRL_delete(a,b) ((X509_CRL *) \
-               sk_delete((a),(b)))
-       #define sk_X509_CRL_delete_ptr(a,b) ((X509_CRL *) \
-               sk_delete_ptr((a),(char *)(b)))
-       #define sk_X509_CRL_insert(a,b,c) sk_insert((a),(char *)(b),(c))
-       #define sk_X509_CRL_set_cmp_func(a,b) ((int (*) \
-               (const X509_CRL * const *,const X509_CRL * const *)) \
-               sk_set_cmp_func((a),(int (*) \
-               (const char * const *, const char * const *))(b)))
-       #define sk_X509_CRL_dup(a) sk_dup(a)
-       #define sk_X509_CRL_pop_free(a,b) sk_pop_free((a),(void (*)(void *))(b))
-       #define sk_X509_CRL_shift(a) ((X509_CRL *)sk_shift(a))
-       #define sk_X509_CRL_pop(a) ((X509_CRL *)sk_pop(a))
-       #define sk_X509_CRL_sort(a) sk_sort(a)
-#endif /* !DEBUG_SAFESTACK */
-/* End of perl script block, you may now edit :-) */

 DECLARE_ASN1_SET_OF(X509_CRL)
 
 typedef struct private_key_st
 DECLARE_ASN1_SET_OF(X509_CRL)
 
 typedef struct private_key_st


@@ -687,37 +408,6 @@ typedef struct X509_info_st
        } X509_INFO;
 
 DECLARE_STACK_OF(X509_INFO)
        } X509_INFO;
 
 DECLARE_STACK_OF(X509_INFO)

-/* This block of defines is updated by a perl script, please do not touch! */
-#ifndef DEBUG_SAFESTACK
-       #define sk_X509_INFO_new(a) sk_new((int (*) \
-               (const char * const *, const char * const *))(a))
-       #define sk_X509_INFO_new_null() sk_new_null()
-       #define sk_X509_INFO_free(a) sk_free(a)
-       #define sk_X509_INFO_num(a) sk_num(a)
-       #define sk_X509_INFO_value(a,b) ((X509_INFO *) \
-               sk_value((a),(b)))
-       #define sk_X509_INFO_set(a,b,c) ((X509_INFO *) \
-               sk_set((a),(b),(char *)(c)))
-       #define sk_X509_INFO_zero(a) sk_zero(a)
-       #define sk_X509_INFO_push(a,b) sk_push((a),(char *)(b))
-       #define sk_X509_INFO_unshift(a,b) sk_unshift((a),(b))
-       #define sk_X509_INFO_find(a,b) sk_find((a), (char *)(b))
-       #define sk_X509_INFO_delete(a,b) ((X509_INFO *) \
-               sk_delete((a),(b)))
-       #define sk_X509_INFO_delete_ptr(a,b) ((X509_INFO *) \
-               sk_delete_ptr((a),(char *)(b)))
-       #define sk_X509_INFO_insert(a,b,c) sk_insert((a),(char *)(b),(c))
-       #define sk_X509_INFO_set_cmp_func(a,b) ((int (*) \
-               (const X509_INFO * const *,const X509_INFO * const *)) \
-               sk_set_cmp_func((a),(int (*) \
-               (const char * const *, const char * const *))(b)))
-       #define sk_X509_INFO_dup(a) sk_dup(a)
-       #define sk_X509_INFO_pop_free(a,b) sk_pop_free((a),(void (*)(void *))(b))
-       #define sk_X509_INFO_shift(a) ((X509_INFO *)sk_shift(a))
-       #define sk_X509_INFO_pop(a) ((X509_INFO *)sk_pop(a))
-       #define sk_X509_INFO_sort(a) sk_sort(a)
-#endif /* !DEBUG_SAFESTACK */
-/* End of perl script block, you may now edit :-) */

 #endif
 
 /* The next 2 structures and their 8 routines were sent to me by
 #endif
 
 /* The next 2 structures and their 8 routines were sent to me by