"make update" + stripping the type-specific stack functions out of

libeay.num and ssleay.num.

14 files changed, 1085 insertions, 608 deletions

diff --git a/crypto/asn1/asn1.h b/crypto/asn1/asn1.h
index e137f6b7c7..50a0cfb162 100644
--- a/crypto/asn1/asn1.h
+++ b/crypto/asn1/asn1.h
@@ -245,6 +245,37 @@ typedef struct asn1_string_table_st {
 } ASN1_STRING_TABLE;
 
 DECLARE_STACK_OF(ASN1_STRING_TABLE)
+/* This block of defines is updated by a perl script, please do not touch! */
+#ifndef DEBUG_SAFESTACK
+	#define sk_ASN1_STRING_TABLE_new(a) sk_new((int (*) \
+		(const char * const *, const char * const *))(a))
+	#define sk_ASN1_STRING_TABLE_new_null() sk_new_null()
+	#define sk_ASN1_STRING_TABLE_free(a) sk_free(a)
+	#define sk_ASN1_STRING_TABLE_num(a) sk_num(a)
+	#define sk_ASN1_STRING_TABLE_value(a,b) ((ASN1_STRING_TABLE *) \
+		sk_value((a),(b)))
+	#define sk_ASN1_STRING_TABLE_set(a,b,c) ((ASN1_STRING_TABLE *) \
+		sk_set((a),(b),(char *)(c)))
+	#define sk_ASN1_STRING_TABLE_zero(a) sk_zero(a)
+	#define sk_ASN1_STRING_TABLE_push(a,b) sk_push((a),(char *)(b))
+	#define sk_ASN1_STRING_TABLE_unshift(a,b) sk_unshift((a),(b))
+	#define sk_ASN1_STRING_TABLE_find(a,b) sk_find((a), (char *)(b))
+	#define sk_ASN1_STRING_TABLE_delete(a,b) ((ASN1_STRING_TABLE *) \
+		sk_delete((a),(b)))
+	#define sk_ASN1_STRING_TABLE_delete_ptr(a,b) ((ASN1_STRING_TABLE *) \
+		sk_delete_ptr((a),(char *)(b)))
+	#define sk_ASN1_STRING_TABLE_insert(a,b,c) sk_insert((a),(char *)(b),(c))
+	#define sk_ASN1_STRING_TABLE_set_cmp_func(a,b) ((int (*) \
+		(const ASN1_STRING_TABLE * const *,const ASN1_STRING_TABLE * const *)) \
+		sk_set_cmp_func((a),(int (*) \
+		(const char * const *, const char * const *))(b)))
+	#define sk_ASN1_STRING_TABLE_dup(a) sk_dup(a)
+	#define sk_ASN1_STRING_TABLE_pop_free(a,b) sk_pop_free((a),(void (*)(void *))(b))
+	#define sk_ASN1_STRING_TABLE_shift(a) ((ASN1_STRING_TABLE *)sk_shift(a))
+	#define sk_ASN1_STRING_TABLE_pop(a) ((ASN1_STRING_TABLE *)sk_pop(a))
+	#define sk_ASN1_STRING_TABLE_sort(a) sk_sort(a)
+#endif /* !DEBUG_SAFESTACK */
+/* End of perl script block, you may now edit :-) */
 
 /* size limits: this stuff is taken straight from RFC2459 */
 
@@ -294,6 +325,37 @@ typedef struct asn1_string_st ASN1_UTF8STRING;
 typedef int ASN1_NULL;
 
 DECLARE_STACK_OF(ASN1_INTEGER)
+/* This block of defines is updated by a perl script, please do not touch! */
+#ifndef DEBUG_SAFESTACK
+	#define sk_ASN1_INTEGER_new(a) sk_new((int (*) \
+		(const char * const *, const char * const *))(a))
+	#define sk_ASN1_INTEGER_new_null() sk_new_null()
+	#define sk_ASN1_INTEGER_free(a) sk_free(a)
+	#define sk_ASN1_INTEGER_num(a) sk_num(a)
+	#define sk_ASN1_INTEGER_value(a,b) ((ASN1_INTEGER *) \
+		sk_value((a),(b)))
+	#define sk_ASN1_INTEGER_set(a,b,c) ((ASN1_INTEGER *) \
+		sk_set((a),(b),(char *)(c)))
+	#define sk_ASN1_INTEGER_zero(a) sk_zero(a)
+	#define sk_ASN1_INTEGER_push(a,b) sk_push((a),(char *)(b))
+	#define sk_ASN1_INTEGER_unshift(a,b) sk_unshift((a),(b))
+	#define sk_ASN1_INTEGER_find(a,b) sk_find((a), (char *)(b))
+	#define sk_ASN1_INTEGER_delete(a,b) ((ASN1_INTEGER *) \
+		sk_delete((a),(b)))
+	#define sk_ASN1_INTEGER_delete_ptr(a,b) ((ASN1_INTEGER *) \
+		sk_delete_ptr((a),(char *)(b)))
+	#define sk_ASN1_INTEGER_insert(a,b,c) sk_insert((a),(char *)(b),(c))
+	#define sk_ASN1_INTEGER_set_cmp_func(a,b) ((int (*) \
+		(const ASN1_INTEGER * const *,const ASN1_INTEGER * const *)) \
+		sk_set_cmp_func((a),(int (*) \
+		(const char * const *, const char * const *))(b)))
+	#define sk_ASN1_INTEGER_dup(a) sk_dup(a)
+	#define sk_ASN1_INTEGER_pop_free(a,b) sk_pop_free((a),(void (*)(void *))(b))
+	#define sk_ASN1_INTEGER_shift(a) ((ASN1_INTEGER *)sk_shift(a))
+	#define sk_ASN1_INTEGER_pop(a) ((ASN1_INTEGER *)sk_pop(a))
+	#define sk_ASN1_INTEGER_sort(a) sk_sort(a)
+#endif /* !DEBUG_SAFESTACK */
+/* End of perl script block, you may now edit :-) */
 DECLARE_ASN1_SET_OF(ASN1_INTEGER)
 
 typedef struct asn1_type_st
@@ -325,6 +387,37 @@ typedef struct asn1_type_st
 	} ASN1_TYPE;
 
 DECLARE_STACK_OF(ASN1_TYPE)
+/* This block of defines is updated by a perl script, please do not touch! */
+#ifndef DEBUG_SAFESTACK
+	#define sk_ASN1_TYPE_new(a) sk_new((int (*) \
+		(const char * const *, const char * const *))(a))
+	#define sk_ASN1_TYPE_new_null() sk_new_null()
+	#define sk_ASN1_TYPE_free(a) sk_free(a)
+	#define sk_ASN1_TYPE_num(a) sk_num(a)
+	#define sk_ASN1_TYPE_value(a,b) ((ASN1_TYPE *) \
+		sk_value((a),(b)))
+	#define sk_ASN1_TYPE_set(a,b,c) ((ASN1_TYPE *) \
+		sk_set((a),(b),(char *)(c)))
+	#define sk_ASN1_TYPE_zero(a) sk_zero(a)
+	#define sk_ASN1_TYPE_push(a,b) sk_push((a),(char *)(b))
+	#define sk_ASN1_TYPE_unshift(a,b) sk_unshift((a),(b))
+	#define sk_ASN1_TYPE_find(a,b) sk_find((a), (char *)(b))
+	#define sk_ASN1_TYPE_delete(a,b) ((ASN1_TYPE *) \
+		sk_delete((a),(b)))
+	#define sk_ASN1_TYPE_delete_ptr(a,b) ((ASN1_TYPE *) \
+		sk_delete_ptr((a),(char *)(b)))
+	#define sk_ASN1_TYPE_insert(a,b,c) sk_insert((a),(char *)(b),(c))
+	#define sk_ASN1_TYPE_set_cmp_func(a,b) ((int (*) \
+		(const ASN1_TYPE * const *,const ASN1_TYPE * const *)) \
+		sk_set_cmp_func((a),(int (*) \
+		(const char * const *, const char * const *))(b)))
+	#define sk_ASN1_TYPE_dup(a) sk_dup(a)
+	#define sk_ASN1_TYPE_pop_free(a,b) sk_pop_free((a),(void (*)(void *))(b))
+	#define sk_ASN1_TYPE_shift(a) ((ASN1_TYPE *)sk_shift(a))
+	#define sk_ASN1_TYPE_pop(a) ((ASN1_TYPE *)sk_pop(a))
+	#define sk_ASN1_TYPE_sort(a) sk_sort(a)
+#endif /* !DEBUG_SAFESTACK */
+/* End of perl script block, you may now edit :-) */
 DECLARE_ASN1_SET_OF(ASN1_TYPE)
 
 typedef struct asn1_method_st
@@ -546,6 +639,37 @@ ASN1_OBJECT *	d2i_ASN1_OBJECT(ASN1_OBJECT **a,unsigned char **pp,
 			long length);
 
 DECLARE_STACK_OF(ASN1_OBJECT)
+/* This block of defines is updated by a perl script, please do not touch! */
+#ifndef DEBUG_SAFESTACK
+	#define sk_ASN1_OBJECT_new(a) sk_new((int (*) \
+		(const char * const *, const char * const *))(a))
+	#define sk_ASN1_OBJECT_new_null() sk_new_null()
+	#define sk_ASN1_OBJECT_free(a) sk_free(a)
+	#define sk_ASN1_OBJECT_num(a) sk_num(a)
+	#define sk_ASN1_OBJECT_value(a,b) ((ASN1_OBJECT *) \
+		sk_value((a),(b)))
+	#define sk_ASN1_OBJECT_set(a,b,c) ((ASN1_OBJECT *) \
+		sk_set((a),(b),(char *)(c)))
+	#define sk_ASN1_OBJECT_zero(a) sk_zero(a)
+	#define sk_ASN1_OBJECT_push(a,b) sk_push((a),(char *)(b))
+	#define sk_ASN1_OBJECT_unshift(a,b) sk_unshift((a),(b))
+	#define sk_ASN1_OBJECT_find(a,b) sk_find((a), (char *)(b))
+	#define sk_ASN1_OBJECT_delete(a,b) ((ASN1_OBJECT *) \
+		sk_delete((a),(b)))
+	#define sk_ASN1_OBJECT_delete_ptr(a,b) ((ASN1_OBJECT *) \
+		sk_delete_ptr((a),(char *)(b)))
+	#define sk_ASN1_OBJECT_insert(a,b,c) sk_insert((a),(char *)(b),(c))
+	#define sk_ASN1_OBJECT_set_cmp_func(a,b) ((int (*) \
+		(const ASN1_OBJECT * const *,const ASN1_OBJECT * const *)) \
+		sk_set_cmp_func((a),(int (*) \
+		(const char * const *, const char * const *))(b)))
+	#define sk_ASN1_OBJECT_dup(a) sk_dup(a)
+	#define sk_ASN1_OBJECT_pop_free(a,b) sk_pop_free((a),(void (*)(void *))(b))
+	#define sk_ASN1_OBJECT_shift(a) ((ASN1_OBJECT *)sk_shift(a))
+	#define sk_ASN1_OBJECT_pop(a) ((ASN1_OBJECT *)sk_pop(a))
+	#define sk_ASN1_OBJECT_sort(a) sk_sort(a)
+#endif /* !DEBUG_SAFESTACK */
+/* End of perl script block, you may now edit :-) */
 DECLARE_ASN1_SET_OF(ASN1_OBJECT)
 
 ASN1_STRING *	ASN1_STRING_new(void);
diff --git a/crypto/bio/bio.h b/crypto/bio/bio.h
index 2e25516cf3..24d1bc8da9 100644
--- a/crypto/bio/bio.h
+++ b/crypto/bio/bio.h
@@ -262,6 +262,37 @@ struct bio_st
 	};
 
 DECLARE_STACK_OF(BIO)
+/* This block of defines is updated by a perl script, please do not touch! */
+#ifndef DEBUG_SAFESTACK
+	#define sk_BIO_new(a) sk_new((int (*) \
+		(const char * const *, const char * const *))(a))
+	#define sk_BIO_new_null() sk_new_null()
+	#define sk_BIO_free(a) sk_free(a)
+	#define sk_BIO_num(a) sk_num(a)
+	#define sk_BIO_value(a,b) ((BIO *) \
+		sk_value((a),(b)))
+	#define sk_BIO_set(a,b,c) ((BIO *) \
+		sk_set((a),(b),(char *)(c)))
+	#define sk_BIO_zero(a) sk_zero(a)
+	#define sk_BIO_push(a,b) sk_push((a),(char *)(b))
+	#define sk_BIO_unshift(a,b) sk_unshift((a),(b))
+	#define sk_BIO_find(a,b) sk_find((a), (char *)(b))
+	#define sk_BIO_delete(a,b) ((BIO *) \
+		sk_delete((a),(b)))
+	#define sk_BIO_delete_ptr(a,b) ((BIO *) \
+		sk_delete_ptr((a),(char *)(b)))
+	#define sk_BIO_insert(a,b,c) sk_insert((a),(char *)(b),(c))
+	#define sk_BIO_set_cmp_func(a,b) ((int (*) \
+		(const BIO * const *,const BIO * const *)) \
+		sk_set_cmp_func((a),(int (*) \
+		(const char * const *, const char * const *))(b)))
+	#define sk_BIO_dup(a) sk_dup(a)
+	#define sk_BIO_pop_free(a,b) sk_pop_free((a),(void (*)(void *))(b))
+	#define sk_BIO_shift(a) ((BIO *)sk_shift(a))
+	#define sk_BIO_pop(a) ((BIO *)sk_pop(a))
+	#define sk_BIO_sort(a) sk_sort(a)
+#endif /* !DEBUG_SAFESTACK */
+/* End of perl script block, you may now edit :-) */
 
 typedef struct bio_f_buffer_ctx_struct
 	{
diff --git a/crypto/conf/conf.h b/crypto/conf/conf.h
index 2f70634455..0adda45dd3 100644
--- a/crypto/conf/conf.h
+++ b/crypto/conf/conf.h
@@ -77,6 +77,37 @@ typedef struct
 	} CONF_VALUE;
 
 DECLARE_STACK_OF(CONF_VALUE)
+/* This block of defines is updated by a perl script, please do not touch! */
+#ifndef DEBUG_SAFESTACK
+	#define sk_CONF_VALUE_new(a) sk_new((int (*) \
+		(const char * const *, const char * const *))(a))
+	#define sk_CONF_VALUE_new_null() sk_new_null()
+	#define sk_CONF_VALUE_free(a) sk_free(a)
+	#define sk_CONF_VALUE_num(a) sk_num(a)
+	#define sk_CONF_VALUE_value(a,b) ((CONF_VALUE *) \
+		sk_value((a),(b)))
+	#define sk_CONF_VALUE_set(a,b,c) ((CONF_VALUE *) \
+		sk_set((a),(b),(char *)(c)))
+	#define sk_CONF_VALUE_zero(a) sk_zero(a)
+	#define sk_CONF_VALUE_push(a,b) sk_push((a),(char *)(b))
+	#define sk_CONF_VALUE_unshift(a,b) sk_unshift((a),(b))
+	#define sk_CONF_VALUE_find(a,b) sk_find((a), (char *)(b))
+	#define sk_CONF_VALUE_delete(a,b) ((CONF_VALUE *) \
+		sk_delete((a),(b)))
+	#define sk_CONF_VALUE_delete_ptr(a,b) ((CONF_VALUE *) \
+		sk_delete_ptr((a),(char *)(b)))
+	#define sk_CONF_VALUE_insert(a,b,c) sk_insert((a),(char *)(b),(c))
+	#define sk_CONF_VALUE_set_cmp_func(a,b) ((int (*) \
+		(const CONF_VALUE * const *,const CONF_VALUE * const *)) \
+		sk_set_cmp_func((a),(int (*) \
+		(const char * const *, const char * const *))(b)))
+	#define sk_CONF_VALUE_dup(a) sk_dup(a)
+	#define sk_CONF_VALUE_pop_free(a,b) sk_pop_free((a),(void (*)(void *))(b))
+	#define sk_CONF_VALUE_shift(a) ((CONF_VALUE *)sk_shift(a))
+	#define sk_CONF_VALUE_pop(a) ((CONF_VALUE *)sk_pop(a))
+	#define sk_CONF_VALUE_sort(a) sk_sort(a)
+#endif /* !DEBUG_SAFESTACK */
+/* End of perl script block, you may now edit :-) */
 
 struct conf_st;
 typedef struct conf_st CONF;
diff --git a/crypto/crypto.h b/crypto/crypto.h
index 84894af56c..adb436f862 100644
--- a/crypto/crypto.h
+++ b/crypto/crypto.h
@@ -201,6 +201,37 @@ typedef struct crypto_ex_data_func_st
 	} CRYPTO_EX_DATA_FUNCS;
 
 DECLARE_STACK_OF(CRYPTO_EX_DATA_FUNCS)
+/* This block of defines is updated by a perl script, please do not touch! */
+#ifndef DEBUG_SAFESTACK
+	#define sk_CRYPTO_EX_DATA_FUNCS_new(a) sk_new((int (*) \
+		(const char * const *, const char * const *))(a))
+	#define sk_CRYPTO_EX_DATA_FUNCS_new_null() sk_new_null()
+	#define sk_CRYPTO_EX_DATA_FUNCS_free(a) sk_free(a)
+	#define sk_CRYPTO_EX_DATA_FUNCS_num(a) sk_num(a)
+	#define sk_CRYPTO_EX_DATA_FUNCS_value(a,b) ((CRYPTO_EX_DATA_FUNCS *) \
+		sk_value((a),(b)))
+	#define sk_CRYPTO_EX_DATA_FUNCS_set(a,b,c) ((CRYPTO_EX_DATA_FUNCS *) \
+		sk_set((a),(b),(char *)(c)))
+	#define sk_CRYPTO_EX_DATA_FUNCS_zero(a) sk_zero(a)
+	#define sk_CRYPTO_EX_DATA_FUNCS_push(a,b) sk_push((a),(char *)(b))
+	#define sk_CRYPTO_EX_DATA_FUNCS_unshift(a,b) sk_unshift((a),(b))
+	#define sk_CRYPTO_EX_DATA_FUNCS_find(a,b) sk_find((a), (char *)(b))
+	#define sk_CRYPTO_EX_DATA_FUNCS_delete(a,b) ((CRYPTO_EX_DATA_FUNCS *) \
+		sk_delete((a),(b)))
+	#define sk_CRYPTO_EX_DATA_FUNCS_delete_ptr(a,b) ((CRYPTO_EX_DATA_FUNCS *) \
+		sk_delete_ptr((a),(char *)(b)))
+	#define sk_CRYPTO_EX_DATA_FUNCS_insert(a,b,c) sk_insert((a),(char *)(b),(c))
+	#define sk_CRYPTO_EX_DATA_FUNCS_set_cmp_func(a,b) ((int (*) \
+		(const CRYPTO_EX_DATA_FUNCS * const *,const CRYPTO_EX_DATA_FUNCS * const *)) \
+		sk_set_cmp_func((a),(int (*) \
+		(const char * const *, const char * const *))(b)))
+	#define sk_CRYPTO_EX_DATA_FUNCS_dup(a) sk_dup(a)
+	#define sk_CRYPTO_EX_DATA_FUNCS_pop_free(a,b) sk_pop_free((a),(void (*)(void *))(b))
+	#define sk_CRYPTO_EX_DATA_FUNCS_shift(a) ((CRYPTO_EX_DATA_FUNCS *)sk_shift(a))
+	#define sk_CRYPTO_EX_DATA_FUNCS_pop(a) ((CRYPTO_EX_DATA_FUNCS *)sk_pop(a))
+	#define sk_CRYPTO_EX_DATA_FUNCS_sort(a) sk_sort(a)
+#endif /* !DEBUG_SAFESTACK */
+/* End of perl script block, you may now edit :-) */
 
 /* Per class, we have a STACK of CRYPTO_EX_DATA_FUNCS for each CRYPTO_EX_DATA
  * entry.
diff --git a/crypto/objects/o_names.c b/crypto/objects/o_names.c
index d9389a5e5a..67cb7f1837 100644
--- a/crypto/objects/o_names.c
+++ b/crypto/objects/o_names.c
@@ -20,6 +20,37 @@ typedef struct name_funcs_st
 	} NAME_FUNCS;
 
 DECLARE_STACK_OF(NAME_FUNCS)
+/* This block of defines is updated by a perl script, please do not touch! */
+#ifndef DEBUG_SAFESTACK
+	#define sk_NAME_FUNCS_new(a) sk_new((int (*) \
+		(const char * const *, const char * const *))(a))
+	#define sk_NAME_FUNCS_new_null() sk_new_null()
+	#define sk_NAME_FUNCS_free(a) sk_free(a)
+	#define sk_NAME_FUNCS_num(a) sk_num(a)
+	#define sk_NAME_FUNCS_value(a,b) ((NAME_FUNCS *) \
+		sk_value((a),(b)))
+	#define sk_NAME_FUNCS_set(a,b,c) ((NAME_FUNCS *) \
+		sk_set((a),(b),(char *)(c)))
+	#define sk_NAME_FUNCS_zero(a) sk_zero(a)
+	#define sk_NAME_FUNCS_push(a,b) sk_push((a),(char *)(b))
+	#define sk_NAME_FUNCS_unshift(a,b) sk_unshift((a),(b))
+	#define sk_NAME_FUNCS_find(a,b) sk_find((a), (char *)(b))
+	#define sk_NAME_FUNCS_delete(a,b) ((NAME_FUNCS *) \
+		sk_delete((a),(b)))
+	#define sk_NAME_FUNCS_delete_ptr(a,b) ((NAME_FUNCS *) \
+		sk_delete_ptr((a),(char *)(b)))
+	#define sk_NAME_FUNCS_insert(a,b,c) sk_insert((a),(char *)(b),(c))
+	#define sk_NAME_FUNCS_set_cmp_func(a,b) ((int (*) \
+		(const NAME_FUNCS * const *,const NAME_FUNCS * const *)) \
+		sk_set_cmp_func((a),(int (*) \
+		(const char * const *, const char * const *))(b)))
+	#define sk_NAME_FUNCS_dup(a) sk_dup(a)
+	#define sk_NAME_FUNCS_pop_free(a,b) sk_pop_free((a),(void (*)(void *))(b))
+	#define sk_NAME_FUNCS_shift(a) ((NAME_FUNCS *)sk_shift(a))
+	#define sk_NAME_FUNCS_pop(a) ((NAME_FUNCS *)sk_pop(a))
+	#define sk_NAME_FUNCS_sort(a) sk_sort(a)
+#endif /* !DEBUG_SAFESTACK */
+/* End of perl script block, you may now edit :-) */
 IMPLEMENT_STACK_OF(NAME_FUNCS)
 
 static STACK_OF(NAME_FUNCS) *name_funcs_stack;
diff --git a/crypto/pkcs12/pkcs12.h b/crypto/pkcs12/pkcs12.h
index 4cf92b68ea..1e0dc3e189 100644
--- a/crypto/pkcs12/pkcs12.h
+++ b/crypto/pkcs12/pkcs12.h
@@ -124,6 +124,37 @@ ASN1_TYPE *rest;
 } PKCS12_SAFEBAG;
 
 DECLARE_STACK_OF(PKCS12_SAFEBAG)
+/* This block of defines is updated by a perl script, please do not touch! */
+#ifndef DEBUG_SAFESTACK
+	#define sk_PKCS12_SAFEBAG_new(a) sk_new((int (*) \
+		(const char * const *, const char * const *))(a))
+	#define sk_PKCS12_SAFEBAG_new_null() sk_new_null()
+	#define sk_PKCS12_SAFEBAG_free(a) sk_free(a)
+	#define sk_PKCS12_SAFEBAG_num(a) sk_num(a)
+	#define sk_PKCS12_SAFEBAG_value(a,b) ((PKCS12_SAFEBAG *) \
+		sk_value((a),(b)))
+	#define sk_PKCS12_SAFEBAG_set(a,b,c) ((PKCS12_SAFEBAG *) \
+		sk_set((a),(b),(char *)(c)))
+	#define sk_PKCS12_SAFEBAG_zero(a) sk_zero(a)
+	#define sk_PKCS12_SAFEBAG_push(a,b) sk_push((a),(char *)(b))
+	#define sk_PKCS12_SAFEBAG_unshift(a,b) sk_unshift((a),(b))
+	#define sk_PKCS12_SAFEBAG_find(a,b) sk_find((a), (char *)(b))
+	#define sk_PKCS12_SAFEBAG_delete(a,b) ((PKCS12_SAFEBAG *) \
+		sk_delete((a),(b)))
+	#define sk_PKCS12_SAFEBAG_delete_ptr(a,b) ((PKCS12_SAFEBAG *) \
+		sk_delete_ptr((a),(char *)(b)))
+	#define sk_PKCS12_SAFEBAG_insert(a,b,c) sk_insert((a),(char *)(b),(c))
+	#define sk_PKCS12_SAFEBAG_set_cmp_func(a,b) ((int (*) \
+		(const PKCS12_SAFEBAG * const *,const PKCS12_SAFEBAG * const *)) \
+		sk_set_cmp_func((a),(int (*) \
+		(const char * const *, const char * const *))(b)))
+	#define sk_PKCS12_SAFEBAG_dup(a) sk_dup(a)
+	#define sk_PKCS12_SAFEBAG_pop_free(a,b) sk_pop_free((a),(void (*)(void *))(b))
+	#define sk_PKCS12_SAFEBAG_shift(a) ((PKCS12_SAFEBAG *)sk_shift(a))
+	#define sk_PKCS12_SAFEBAG_pop(a) ((PKCS12_SAFEBAG *)sk_pop(a))
+	#define sk_PKCS12_SAFEBAG_sort(a) sk_sort(a)
+#endif /* !DEBUG_SAFESTACK */
+/* End of perl script block, you may now edit :-) */
 DECLARE_ASN1_SET_OF(PKCS12_SAFEBAG)
 DECLARE_PKCS12_STACK_OF(PKCS12_SAFEBAG)
 
diff --git a/crypto/pkcs7/pk7_mime.c b/crypto/pkcs7/pk7_mime.c
index 36d47ef11c..0ba7d77462 100644
--- a/crypto/pkcs7/pk7_mime.c
+++ b/crypto/pkcs7/pk7_mime.c
@@ -75,6 +75,37 @@ 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 {
@@ -84,6 +115,37 @@ 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);
diff --git a/crypto/pkcs7/pkcs7.h b/crypto/pkcs7/pkcs7.h
index f3f85f57af..9916a3b1d9 100644
--- a/crypto/pkcs7/pkcs7.h
+++ b/crypto/pkcs7/pkcs7.h
@@ -104,6 +104,37 @@ typedef struct pkcs7_signer_info_st
 	} PKCS7_SIGNER_INFO;
 
 DECLARE_STACK_OF(PKCS7_SIGNER_INFO)
+/* This block of defines is updated by a perl script, please do not touch! */
+#ifndef DEBUG_SAFESTACK
+	#define sk_PKCS7_SIGNER_INFO_new(a) sk_new((int (*) \
+		(const char * const *, const char * const *))(a))
+	#define sk_PKCS7_SIGNER_INFO_new_null() sk_new_null()
+	#define sk_PKCS7_SIGNER_INFO_free(a) sk_free(a)
+	#define sk_PKCS7_SIGNER_INFO_num(a) sk_num(a)
+	#define sk_PKCS7_SIGNER_INFO_value(a,b) ((PKCS7_SIGNER_INFO *) \
+		sk_value((a),(b)))
+	#define sk_PKCS7_SIGNER_INFO_set(a,b,c) ((PKCS7_SIGNER_INFO *) \
+		sk_set((a),(b),(char *)(c)))
+	#define sk_PKCS7_SIGNER_INFO_zero(a) sk_zero(a)
+	#define sk_PKCS7_SIGNER_INFO_push(a,b) sk_push((a),(char *)(b))
+	#define sk_PKCS7_SIGNER_INFO_unshift(a,b) sk_unshift((a),(b))
+	#define sk_PKCS7_SIGNER_INFO_find(a,b) sk_find((a), (char *)(b))
+	#define sk_PKCS7_SIGNER_INFO_delete(a,b) ((PKCS7_SIGNER_INFO *) \
+		sk_delete((a),(b)))
+	#define sk_PKCS7_SIGNER_INFO_delete_ptr(a,b) ((PKCS7_SIGNER_INFO *) \
+		sk_delete_ptr((a),(char *)(b)))
+	#define sk_PKCS7_SIGNER_INFO_insert(a,b,c) sk_insert((a),(char *)(b),(c))
+	#define sk_PKCS7_SIGNER_INFO_set_cmp_func(a,b) ((int (*) \
+		(const PKCS7_SIGNER_INFO * const *,const PKCS7_SIGNER_INFO * const *)) \
+		sk_set_cmp_func((a),(int (*) \
+		(const char * const *, const char * const *))(b)))
+	#define sk_PKCS7_SIGNER_INFO_dup(a) sk_dup(a)
+	#define sk_PKCS7_SIGNER_INFO_pop_free(a,b) sk_pop_free((a),(void (*)(void *))(b))
+	#define sk_PKCS7_SIGNER_INFO_shift(a) ((PKCS7_SIGNER_INFO *)sk_shift(a))
+	#define sk_PKCS7_SIGNER_INFO_pop(a) ((PKCS7_SIGNER_INFO *)sk_pop(a))
+	#define sk_PKCS7_SIGNER_INFO_sort(a) sk_sort(a)
+#endif /* !DEBUG_SAFESTACK */
+/* End of perl script block, you may now edit :-) */
 DECLARE_ASN1_SET_OF(PKCS7_SIGNER_INFO)
 
 typedef struct pkcs7_recip_info_st
@@ -116,6 +147,37 @@ typedef struct pkcs7_recip_info_st
 	} PKCS7_RECIP_INFO;
 
 DECLARE_STACK_OF(PKCS7_RECIP_INFO)
+/* This block of defines is updated by a perl script, please do not touch! */
+#ifndef DEBUG_SAFESTACK
+	#define sk_PKCS7_RECIP_INFO_new(a) sk_new((int (*) \
+		(const char * const *, const char * const *))(a))
+	#define sk_PKCS7_RECIP_INFO_new_null() sk_new_null()
+	#define sk_PKCS7_RECIP_INFO_free(a) sk_free(a)
+	#define sk_PKCS7_RECIP_INFO_num(a) sk_num(a)
+	#define sk_PKCS7_RECIP_INFO_value(a,b) ((PKCS7_RECIP_INFO *) \
+		sk_value((a),(b)))
+	#define sk_PKCS7_RECIP_INFO_set(a,b,c) ((PKCS7_RECIP_INFO *) \
+		sk_set((a),(b),(char *)(c)))
+	#define sk_PKCS7_RECIP_INFO_zero(a) sk_zero(a)
+	#define sk_PKCS7_RECIP_INFO_push(a,b) sk_push((a),(char *)(b))
+	#define sk_PKCS7_RECIP_INFO_unshift(a,b) sk_unshift((a),(b))
+	#define sk_PKCS7_RECIP_INFO_find(a,b) sk_find((a), (char *)(b))
+	#define sk_PKCS7_RECIP_INFO_delete(a,b) ((PKCS7_RECIP_INFO *) \
+		sk_delete((a),(b)))
+	#define sk_PKCS7_RECIP_INFO_delete_ptr(a,b) ((PKCS7_RECIP_INFO *) \
+		sk_delete_ptr((a),(char *)(b)))
+	#define sk_PKCS7_RECIP_INFO_insert(a,b,c) sk_insert((a),(char *)(b),(c))
+	#define sk_PKCS7_RECIP_INFO_set_cmp_func(a,b) ((int (*) \
+		(const PKCS7_RECIP_INFO * const *,const PKCS7_RECIP_INFO * const *)) \
+		sk_set_cmp_func((a),(int (*) \
+		(const char * const *, const char * const *))(b)))
+	#define sk_PKCS7_RECIP_INFO_dup(a) sk_dup(a)
+	#define sk_PKCS7_RECIP_INFO_pop_free(a,b) sk_pop_free((a),(void (*)(void *))(b))
+	#define sk_PKCS7_RECIP_INFO_shift(a) ((PKCS7_RECIP_INFO *)sk_shift(a))
+	#define sk_PKCS7_RECIP_INFO_pop(a) ((PKCS7_RECIP_INFO *)sk_pop(a))
+	#define sk_PKCS7_RECIP_INFO_sort(a) sk_sort(a)
+#endif /* !DEBUG_SAFESTACK */
+/* End of perl script block, you may now edit :-) */
 DECLARE_ASN1_SET_OF(PKCS7_RECIP_INFO)
 
 typedef struct pkcs7_signed_st
@@ -214,6 +276,37 @@ typedef struct pkcs7_st
 	} PKCS7;
 
 DECLARE_STACK_OF(PKCS7)
+/* This block of defines is updated by a perl script, please do not touch! */
+#ifndef DEBUG_SAFESTACK
+	#define sk_PKCS7_new(a) sk_new((int (*) \
+		(const char * const *, const char * const *))(a))
+	#define sk_PKCS7_new_null() sk_new_null()
+	#define sk_PKCS7_free(a) sk_free(a)
+	#define sk_PKCS7_num(a) sk_num(a)
+	#define sk_PKCS7_value(a,b) ((PKCS7 *) \
+		sk_value((a),(b)))
+	#define sk_PKCS7_set(a,b,c) ((PKCS7 *) \
+		sk_set((a),(b),(char *)(c)))
+	#define sk_PKCS7_zero(a) sk_zero(a)
+	#define sk_PKCS7_push(a,b) sk_push((a),(char *)(b))
+	#define sk_PKCS7_unshift(a,b) sk_unshift((a),(b))
+	#define sk_PKCS7_find(a,b) sk_find((a), (char *)(b))
+	#define sk_PKCS7_delete(a,b) ((PKCS7 *) \
+		sk_delete((a),(b)))
+	#define sk_PKCS7_delete_ptr(a,b) ((PKCS7 *) \
+		sk_delete_ptr((a),(char *)(b)))
+	#define sk_PKCS7_insert(a,b,c) sk_insert((a),(char *)(b),(c))
+	#define sk_PKCS7_set_cmp_func(a,b) ((int (*) \
+		(const PKCS7 * const *,const PKCS7 * const *)) \
+		sk_set_cmp_func((a),(int (*) \
+		(const char * const *, const char * const *))(b)))
+	#define sk_PKCS7_dup(a) sk_dup(a)
+	#define sk_PKCS7_pop_free(a,b) sk_pop_free((a),(void (*)(void *))(b))
+	#define sk_PKCS7_shift(a) ((PKCS7 *)sk_shift(a))
+	#define sk_PKCS7_pop(a) ((PKCS7 *)sk_pop(a))
+	#define sk_PKCS7_sort(a) sk_sort(a)
+#endif /* !DEBUG_SAFESTACK */
+/* End of perl script block, you may now edit :-) */
 DECLARE_ASN1_SET_OF(PKCS7)
 DECLARE_PKCS12_STACK_OF(PKCS7)
 
diff --git a/crypto/x509/x509.h b/crypto/x509/x509.h
index a5cb555589..1dae31a233 100644
--- a/crypto/x509/x509.h
+++ b/crypto/x509/x509.h
@@ -143,6 +143,37 @@ typedef struct X509_algor_st
 	} 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
@@ -173,6 +204,37 @@ typedef struct X509_name_entry_st
 	} 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. */
@@ -189,6 +251,37 @@ typedef struct X509_name_st
 	} 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
@@ -203,6 +296,37 @@ typedef struct X509_extension_st
 	} 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 */
@@ -218,6 +342,37 @@ typedef struct x509_attributes_st
 	} 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)))