Using speaking "variable" names in macros so that e.g. grepping for

sk_whatever_insert and sk_whatever_set immediately reveals the subtle
difference in parameter order.

Change mkstack.pl so that safestack.h is not rewritten when
nothing has changed.

1 files changed, 783 insertions, 768 deletions

diff --git a/crypto/stack/safestack.h b/crypto/stack/safestack.h
index 3338d1630a..8cc022b456 100644
--- a/crypto/stack/safestack.h
+++ b/crypto/stack/safestack.h
@@ -68,47 +68,51 @@ STACK_OF(type) \
     STACK stack; \
     };
 
-#define IMPLEMENT_STACK_OF(type) /* nada */
+#define IMPLEMENT_STACK_OF(type) /* nada (obsolete in new safestack approach)*/
 
-#define SKM_sk_new(type, a) \
-	((STACK_OF(type) * (*)(int (*)(const type * const *, const type * const *)))sk_new)(a)
+/* SKM_sk_... stack macros are internal to safestack.h:
+ * never use them directly, use sk_<type>_... instead */
+#define SKM_sk_new(type, cmp) \
+	((STACK_OF(type) * (*)(int (*)(const type * const *, const type * const *)))sk_new)(cmp)
 #define SKM_sk_new_null(type) \
 	((STACK_OF(type) * (*)(void))sk_new_null)()
-#define SKM_sk_free(type, a) \
-	((void (*)(STACK_OF(type) *))sk_free)(a)
-#define SKM_sk_num(type, a) \
-	((int (*)(const STACK_OF(type) *))sk_num)(a)
-#define SKM_sk_value(type, a, b) \
-	((type * (*)(const STACK_OF(type) *, int))sk_value)(a, b)
-#define SKM_sk_set(type, a, b, c) \
-	((type * (*)(STACK_OF(type) *, int, type *))sk_set)(a,b,c)
-#define SKM_sk_zero(type, a) \
-	((void (*)(STACK_OF(type) *))sk_zero)(a)
-#define SKM_sk_push(type, a, b) \
-	((int (*)(STACK_OF(type) *, type *))sk_push)(a, b)
-#define SKM_sk_unshift(type, a,b) \
-	((int (*)(STACK_OF(type) *, type *))sk_unshift)(a, b)
-#define SKM_sk_find(type, a, b) \
-	((int (*)(STACK_OF(type) *, type *))sk_find)(a, b)
-#define SKM_sk_delete(type, a,b) \
-	((type * (*)(STACK_OF(type) *, int))sk_delete)(a, b)
-#define SKM_sk_delete_ptr(type, a,b) \
-	((type * (*)(STACK_OF(type) *, type *))sk_delete_ptr)(a, b)
-#define SKM_sk_insert(type, a,b,c) \
-	((int (*)(STACK_OF(type) *, type *, int))sk_insert)(a,b,c)
-#define SKM_sk_set_cmp_func(type, a,b) \
+#define SKM_sk_free(type, st) \
+	((void (*)(STACK_OF(type) *))sk_free)(st)
+#define SKM_sk_num(type, st) \
+	((int (*)(const STACK_OF(type) *))sk_num)(st)
+#define SKM_sk_value(type, st,i) \
+	((type * (*)(const STACK_OF(type) *, int))sk_value)(st, i)
+#define SKM_sk_set(type, st,i,val) \
+	((type * (*)(STACK_OF(type) *, int, type *))sk_set)(st, i, val)
+#define SKM_sk_zero(type, st) \
+	((void (*)(STACK_OF(type) *))sk_zero)(st)
+#define SKM_sk_push(type, st,val) \
+	((int (*)(STACK_OF(type) *, type *))sk_push)(st, val)
+#define SKM_sk_unshift(type, st,val) \
+	((int (*)(STACK_OF(type) *, type *))sk_unshift)(st, val)
+#define SKM_sk_find(type, st,val) \
+	((int (*)(STACK_OF(type) *, type *))sk_find)(st, val)
+#define SKM_sk_delete(type, st,i) \
+	((type * (*)(STACK_OF(type) *, int))sk_delete)(st, i)
+#define SKM_sk_delete_ptr(type, st,ptr) \
+	((type * (*)(STACK_OF(type) *, type *))sk_delete_ptr)(st, ptr)
+#define SKM_sk_insert(type, st,val,i) \
+	((int (*)(STACK_OF(type) *, type *, int))sk_insert)(st, val, i)
+#define SKM_sk_set_cmp_func(type, st,cmp) \
 	((int (*(*)(STACK_OF(type) *, int (*)(const type * const *, const type * const *))) \
-				(const type * const *, const type * const *))sk_set_cmp_func)(a, b)
-#define SKM_sk_dup(type, a) \
-	((STACK_OF(type) *(*)(STACK_OF(type) *))sk_dup)(a)
-#define SKM_sk_pop_free(type, a,b) \
-	((void (*)(STACK_OF(type) *, void (*)(type *)))sk_pop_free)(a, b)
-#define SKM_sk_shift(type, a) \
-	((type * (*)(STACK_OF(type) *))sk_shift)(a)
-#define SKM_sk_pop(type, a) \
-	((type * (*)(STACK_OF(type) *))sk_pop)(a)
-#define SKM_sk_sort(type, a) \
-	((void (*)(STACK_OF(type) *))sk_sort)(a)
+	  (const type * const *, const type * const *))sk_set_cmp_func)\
+	(st, cmp)
+#define SKM_sk_dup(type, st) \
+	((STACK_OF(type) *(*)(STACK_OF(type) *))sk_dup)(st)
+#define SKM_sk_pop_free(type, st,free_func) \
+	((void (*)(STACK_OF(type) *, void (*)(type *)))sk_pop_free)\
+	(st, free_func)
+#define SKM_sk_shift(type, st) \
+	((type * (*)(STACK_OF(type) *))sk_shift)(st)
+#define SKM_sk_pop(type, st) \
+	((type * (*)(STACK_OF(type) *))sk_pop)(st)
+#define SKM_sk_sort(type, st) \
+	((void (*)(STACK_OF(type) *))sk_sort)(st)
 
 #else
 
@@ -117,737 +121,748 @@ STACK_OF(type) \
 #define DECLARE_STACK_OF(type)    /* nada */
 #define IMPLEMENT_STACK_OF(type)  /* nada */
 
-#define SKM_sk_new(stype, a) sk_new((int (*) \
-	(const char * const *, const char * const *))(a))
-#define SKM_sk_new_null(stype) sk_new_null()
-#define SKM_sk_free(stype, a) sk_free(a)
-#define SKM_sk_num(stype, a) sk_num(a)
-#define SKM_sk_value(stype, a,b) ((stype *) \
-	sk_value((a),(b)))
-#define SKM_sk_set(stype, a,b,c) ((stype *) \
-	sk_set((a),(b),(char *)(c)))
-#define SKM_sk_zero(stype, a) sk_zero(a)
-#define SKM_sk_push(stype, a,b) sk_push((a),(char *)(b))
-#define SKM_sk_unshift(stype, a,b) sk_unshift((a),(b))
-#define SKM_sk_find(stype, a,b) sk_find((a), (char *)(b))
-#define SKM_sk_delete(stype, a,b) ((stype *) \
-	sk_delete((a),(b)))
-#define SKM_sk_delete_ptr(stype, a,b) ((stype *) \
-	sk_delete_ptr((a),(char *)(b)))
-#define SKM_sk_insert(stype, a,b,c) sk_insert((a),(char *)(b),(c))
-#define SKM_sk_set_cmp_func(stype, a,b) ((int (*) \
-		(const stype * const *,const stype * const *)) \
-		sk_set_cmp_func((a),(int (*) \
-		(const char * const *, const char * const *))(b)))
-#define SKM_sk_dup(stype, a) sk_dup(a)
-#define SKM_sk_pop_free(stype, a,b) sk_pop_free((a),(void (*)(void *))(b))
-#define SKM_sk_shift(stype, a) ((stype *)sk_shift(a))
-#define SKM_sk_pop(stype, a) ((stype *)sk_pop(a))
-#define SKM_sk_sort(stype, a) sk_sort(a)
+#define SKM_sk_new(type, cmp) \
+	sk_new((int (*)(const char * const *, const char * const *))(cmp))
+#define SKM_sk_new_null(type) \
+	sk_new_null()
+#define SKM_sk_free(type, st) \
+	sk_free(st)
+#define SKM_sk_num(type, st) \
+	sk_num(st)
+#define SKM_sk_value(type, st,i) \
+	((type *)sk_value(st, i))
+#define SKM_sk_set(type, st,i,val) \
+	((type *)sk_set(st, i,(char *)val))
+#define SKM_sk_zero(type, st) \
+	sk_zero(st)
+#define SKM_sk_push(type, st,val) \
+	sk_push(st, (char *)val)
+#define SKM_sk_unshift(type, st,val) \
+	sk_unshift(st, val)
+#define SKM_sk_find(type, st,val) \
+	sk_find(st, (char *)val)
+#define SKM_sk_delete(type, st,i) \
+	((type *)sk_delete(st, i))
+#define SKM_sk_delete_ptr(type, st,ptr) \
+	((type *)sk_delete_ptr(st,(char *)ptr))
+#define SKM_sk_insert(type, st,val,i) \
+	sk_insert(st, (char *)val, i)
+#define SKM_sk_set_cmp_func(type, st,cmp) \
+	((int (*)(const type * const *,const type * const *)) \
+	sk_set_cmp_func(st, (int (*)(const char * const *, const char * const *))(cmp)))
+#define SKM_sk_dup(type, st) \
+	sk_dup(st)
+#define SKM_sk_pop_free(type, st,free_func) \
+	sk_pop_free(st, (void (*)(void *))free_func)
+#define SKM_sk_shift(type, st) \
+	((type *)sk_shift(st))
+#define SKM_sk_pop(type, st) \
+	((type *)sk_pop(st))
+#define SKM_sk_sort(type, st) \
+	sk_sort(st)
 
 #endif
 
-/* This block of defines is updated by a perl script, please do not touch! */
-	#define sk_CRYPTO_EX_DATA_FUNCS_new(a) SKM_sk_new(CRYPTO_EX_DATA_FUNCS, (a))
-	#define sk_CRYPTO_EX_DATA_FUNCS_new_null() SKM_sk_new_null(CRYPTO_EX_DATA_FUNCS)
-	#define sk_CRYPTO_EX_DATA_FUNCS_free(a) SKM_sk_free(CRYPTO_EX_DATA_FUNCS, (a))
-	#define sk_CRYPTO_EX_DATA_FUNCS_num(a) SKM_sk_num(CRYPTO_EX_DATA_FUNCS, (a))
-	#define sk_CRYPTO_EX_DATA_FUNCS_value(a,b) SKM_sk_value(CRYPTO_EX_DATA_FUNCS, (a), (b))
-	#define sk_CRYPTO_EX_DATA_FUNCS_set(a,b,c) SKM_sk_set(CRYPTO_EX_DATA_FUNCS, (a), (b), (c))
-	#define sk_CRYPTO_EX_DATA_FUNCS_zero(a) SKM_sk_zero(CRYPTO_EX_DATA_FUNCS, (a))
-	#define sk_CRYPTO_EX_DATA_FUNCS_push(a,b) SKM_sk_push(CRYPTO_EX_DATA_FUNCS, (a),(b))
-	#define sk_CRYPTO_EX_DATA_FUNCS_unshift(a,b) SKM_sk_unshift(CRYPTO_EX_DATA_FUNCS, (a),(b))
-	#define sk_CRYPTO_EX_DATA_FUNCS_find(a,b) SKM_sk_find(CRYPTO_EX_DATA_FUNCS, (a), (b))
-	#define sk_CRYPTO_EX_DATA_FUNCS_delete(a,b) SKM_sk_delete(CRYPTO_EX_DATA_FUNCS, (a),(b))
-	#define sk_CRYPTO_EX_DATA_FUNCS_delete_ptr(a,b) SKM_sk_delete_ptr(CRYPTO_EX_DATA_FUNCS, (a),(b))
-	#define sk_CRYPTO_EX_DATA_FUNCS_insert(a,b,c) SKM_sk_insert(CRYPTO_EX_DATA_FUNCS, (a),(b),(c))
-	#define sk_CRYPTO_EX_DATA_FUNCS_set_cmp_func(a,b) SKM_sk_set_cmp_func(CRYPTO_EX_DATA_FUNCS, (a),(b))
-	#define sk_CRYPTO_EX_DATA_FUNCS_dup(a) SKM_sk_dup(CRYPTO_EX_DATA_FUNCS, a)
-	#define sk_CRYPTO_EX_DATA_FUNCS_pop_free(a,b) SKM_sk_pop_free(CRYPTO_EX_DATA_FUNCS, (a),(b))
-	#define sk_CRYPTO_EX_DATA_FUNCS_shift(a) SKM_sk_shift(CRYPTO_EX_DATA_FUNCS, (a))
-	#define sk_CRYPTO_EX_DATA_FUNCS_pop(a) SKM_sk_pop(CRYPTO_EX_DATA_FUNCS, (a))
-	#define sk_CRYPTO_EX_DATA_FUNCS_sort(a) SKM_sk_sort(CRYPTO_EX_DATA_FUNCS, (a))
-
-	#define sk_ASN1_STRING_TABLE_new(a) SKM_sk_new(ASN1_STRING_TABLE, (a))
-	#define sk_ASN1_STRING_TABLE_new_null() SKM_sk_new_null(ASN1_STRING_TABLE)
-	#define sk_ASN1_STRING_TABLE_free(a) SKM_sk_free(ASN1_STRING_TABLE, (a))
-	#define sk_ASN1_STRING_TABLE_num(a) SKM_sk_num(ASN1_STRING_TABLE, (a))
-	#define sk_ASN1_STRING_TABLE_value(a,b) SKM_sk_value(ASN1_STRING_TABLE, (a), (b))
-	#define sk_ASN1_STRING_TABLE_set(a,b,c) SKM_sk_set(ASN1_STRING_TABLE, (a), (b), (c))
-	#define sk_ASN1_STRING_TABLE_zero(a) SKM_sk_zero(ASN1_STRING_TABLE, (a))
-	#define sk_ASN1_STRING_TABLE_push(a,b) SKM_sk_push(ASN1_STRING_TABLE, (a),(b))
-	#define sk_ASN1_STRING_TABLE_unshift(a,b) SKM_sk_unshift(ASN1_STRING_TABLE, (a),(b))
-	#define sk_ASN1_STRING_TABLE_find(a,b) SKM_sk_find(ASN1_STRING_TABLE, (a), (b))
-	#define sk_ASN1_STRING_TABLE_delete(a,b) SKM_sk_delete(ASN1_STRING_TABLE, (a),(b))
-	#define sk_ASN1_STRING_TABLE_delete_ptr(a,b) SKM_sk_delete_ptr(ASN1_STRING_TABLE, (a),(b))
-	#define sk_ASN1_STRING_TABLE_insert(a,b,c) SKM_sk_insert(ASN1_STRING_TABLE, (a),(b),(c))
-	#define sk_ASN1_STRING_TABLE_set_cmp_func(a,b) SKM_sk_set_cmp_func(ASN1_STRING_TABLE, (a),(b))
-	#define sk_ASN1_STRING_TABLE_dup(a) SKM_sk_dup(ASN1_STRING_TABLE, a)
-	#define sk_ASN1_STRING_TABLE_pop_free(a,b) SKM_sk_pop_free(ASN1_STRING_TABLE, (a),(b))
-	#define sk_ASN1_STRING_TABLE_shift(a) SKM_sk_shift(ASN1_STRING_TABLE, (a))
-	#define sk_ASN1_STRING_TABLE_pop(a) SKM_sk_pop(ASN1_STRING_TABLE, (a))
-	#define sk_ASN1_STRING_TABLE_sort(a) SKM_sk_sort(ASN1_STRING_TABLE, (a))
-
-	#define sk_ASN1_INTEGER_new(a) SKM_sk_new(ASN1_INTEGER, (a))
-	#define sk_ASN1_INTEGER_new_null() SKM_sk_new_null(ASN1_INTEGER)
-	#define sk_ASN1_INTEGER_free(a) SKM_sk_free(ASN1_INTEGER, (a))
-	#define sk_ASN1_INTEGER_num(a) SKM_sk_num(ASN1_INTEGER, (a))
-	#define sk_ASN1_INTEGER_value(a,b) SKM_sk_value(ASN1_INTEGER, (a), (b))
-	#define sk_ASN1_INTEGER_set(a,b,c) SKM_sk_set(ASN1_INTEGER, (a), (b), (c))
-	#define sk_ASN1_INTEGER_zero(a) SKM_sk_zero(ASN1_INTEGER, (a))
-	#define sk_ASN1_INTEGER_push(a,b) SKM_sk_push(ASN1_INTEGER, (a),(b))
-	#define sk_ASN1_INTEGER_unshift(a,b) SKM_sk_unshift(ASN1_INTEGER, (a),(b))
-	#define sk_ASN1_INTEGER_find(a,b) SKM_sk_find(ASN1_INTEGER, (a), (b))
-	#define sk_ASN1_INTEGER_delete(a,b) SKM_sk_delete(ASN1_INTEGER, (a),(b))
-	#define sk_ASN1_INTEGER_delete_ptr(a,b) SKM_sk_delete_ptr(ASN1_INTEGER, (a),(b))
-	#define sk_ASN1_INTEGER_insert(a,b,c) SKM_sk_insert(ASN1_INTEGER, (a),(b),(c))
-	#define sk_ASN1_INTEGER_set_cmp_func(a,b) SKM_sk_set_cmp_func(ASN1_INTEGER, (a),(b))
-	#define sk_ASN1_INTEGER_dup(a) SKM_sk_dup(ASN1_INTEGER, a)
-	#define sk_ASN1_INTEGER_pop_free(a,b) SKM_sk_pop_free(ASN1_INTEGER, (a),(b))
-	#define sk_ASN1_INTEGER_shift(a) SKM_sk_shift(ASN1_INTEGER, (a))
-	#define sk_ASN1_INTEGER_pop(a) SKM_sk_pop(ASN1_INTEGER, (a))
-	#define sk_ASN1_INTEGER_sort(a) SKM_sk_sort(ASN1_INTEGER, (a))
-
-	#define sk_ASN1_TYPE_new(a) SKM_sk_new(ASN1_TYPE, (a))
-	#define sk_ASN1_TYPE_new_null() SKM_sk_new_null(ASN1_TYPE)
-	#define sk_ASN1_TYPE_free(a) SKM_sk_free(ASN1_TYPE, (a))
-	#define sk_ASN1_TYPE_num(a) SKM_sk_num(ASN1_TYPE, (a))
-	#define sk_ASN1_TYPE_value(a,b) SKM_sk_value(ASN1_TYPE, (a), (b))
-	#define sk_ASN1_TYPE_set(a,b,c) SKM_sk_set(ASN1_TYPE, (a), (b), (c))
-	#define sk_ASN1_TYPE_zero(a) SKM_sk_zero(ASN1_TYPE, (a))
-	#define sk_ASN1_TYPE_push(a,b) SKM_sk_push(ASN1_TYPE, (a),(b))
-	#define sk_ASN1_TYPE_unshift(a,b) SKM_sk_unshift(ASN1_TYPE, (a),(b))
-	#define sk_ASN1_TYPE_find(a,b) SKM_sk_find(ASN1_TYPE, (a), (b))
-	#define sk_ASN1_TYPE_delete(a,b) SKM_sk_delete(ASN1_TYPE, (a),(b))
-	#define sk_ASN1_TYPE_delete_ptr(a,b) SKM_sk_delete_ptr(ASN1_TYPE, (a),(b))
-	#define sk_ASN1_TYPE_insert(a,b,c) SKM_sk_insert(ASN1_TYPE, (a),(b),(c))
-	#define sk_ASN1_TYPE_set_cmp_func(a,b) SKM_sk_set_cmp_func(ASN1_TYPE, (a),(b))
-	#define sk_ASN1_TYPE_dup(a) SKM_sk_dup(ASN1_TYPE, a)
-	#define sk_ASN1_TYPE_pop_free(a,b) SKM_sk_pop_free(ASN1_TYPE, (a),(b))
-	#define sk_ASN1_TYPE_shift(a) SKM_sk_shift(ASN1_TYPE, (a))
-	#define sk_ASN1_TYPE_pop(a) SKM_sk_pop(ASN1_TYPE, (a))
-	#define sk_ASN1_TYPE_sort(a) SKM_sk_sort(ASN1_TYPE, (a))
-
-	#define sk_ASN1_OBJECT_new(a) SKM_sk_new(ASN1_OBJECT, (a))
-	#define sk_ASN1_OBJECT_new_null() SKM_sk_new_null(ASN1_OBJECT)
-	#define sk_ASN1_OBJECT_free(a) SKM_sk_free(ASN1_OBJECT, (a))
-	#define sk_ASN1_OBJECT_num(a) SKM_sk_num(ASN1_OBJECT, (a))
-	#define sk_ASN1_OBJECT_value(a,b) SKM_sk_value(ASN1_OBJECT, (a), (b))
-	#define sk_ASN1_OBJECT_set(a,b,c) SKM_sk_set(ASN1_OBJECT, (a), (b), (c))
-	#define sk_ASN1_OBJECT_zero(a) SKM_sk_zero(ASN1_OBJECT, (a))
-	#define sk_ASN1_OBJECT_push(a,b) SKM_sk_push(ASN1_OBJECT, (a),(b))
-	#define sk_ASN1_OBJECT_unshift(a,b) SKM_sk_unshift(ASN1_OBJECT, (a),(b))
-	#define sk_ASN1_OBJECT_find(a,b) SKM_sk_find(ASN1_OBJECT, (a), (b))
-	#define sk_ASN1_OBJECT_delete(a,b) SKM_sk_delete(ASN1_OBJECT, (a),(b))
-	#define sk_ASN1_OBJECT_delete_ptr(a,b) SKM_sk_delete_ptr(ASN1_OBJECT, (a),(b))
-	#define sk_ASN1_OBJECT_insert(a,b,c) SKM_sk_insert(ASN1_OBJECT, (a),(b),(c))
-	#define sk_ASN1_OBJECT_set_cmp_func(a,b) SKM_sk_set_cmp_func(ASN1_OBJECT, (a),(b))
-	#define sk_ASN1_OBJECT_dup(a) SKM_sk_dup(ASN1_OBJECT, a)
-	#define sk_ASN1_OBJECT_pop_free(a,b) SKM_sk_pop_free(ASN1_OBJECT, (a),(b))
-	#define sk_ASN1_OBJECT_shift(a) SKM_sk_shift(ASN1_OBJECT, (a))
-	#define sk_ASN1_OBJECT_pop(a) SKM_sk_pop(ASN1_OBJECT, (a))
-	#define sk_ASN1_OBJECT_sort(a) SKM_sk_sort(ASN1_OBJECT, (a))
-
-	#define sk_BIO_new(a) SKM_sk_new(BIO, (a))
-	#define sk_BIO_new_null() SKM_sk_new_null(BIO)
-	#define sk_BIO_free(a) SKM_sk_free(BIO, (a))
-	#define sk_BIO_num(a) SKM_sk_num(BIO, (a))
-	#define sk_BIO_value(a,b) SKM_sk_value(BIO, (a), (b))
-	#define sk_BIO_set(a,b,c) SKM_sk_set(BIO, (a), (b), (c))
-	#define sk_BIO_zero(a) SKM_sk_zero(BIO, (a))
-	#define sk_BIO_push(a,b) SKM_sk_push(BIO, (a),(b))
-	#define sk_BIO_unshift(a,b) SKM_sk_unshift(BIO, (a),(b))
-	#define sk_BIO_find(a,b) SKM_sk_find(BIO, (a), (b))
-	#define sk_BIO_delete(a,b) SKM_sk_delete(BIO, (a),(b))
-	#define sk_BIO_delete_ptr(a,b) SKM_sk_delete_ptr(BIO, (a),(b))
-	#define sk_BIO_insert(a,b,c) SKM_sk_insert(BIO, (a),(b),(c))
-	#define sk_BIO_set_cmp_func(a,b) SKM_sk_set_cmp_func(BIO, (a),(b))
-	#define sk_BIO_dup(a) SKM_sk_dup(BIO, a)
-	#define sk_BIO_pop_free(a,b) SKM_sk_pop_free(BIO, (a),(b))
-	#define sk_BIO_shift(a) SKM_sk_shift(BIO, (a))
-	#define sk_BIO_pop(a) SKM_sk_pop(BIO, (a))
-	#define sk_BIO_sort(a) SKM_sk_sort(BIO, (a))
-
-	#define sk_CONF_VALUE_new(a) SKM_sk_new(CONF_VALUE, (a))
-	#define sk_CONF_VALUE_new_null() SKM_sk_new_null(CONF_VALUE)
-	#define sk_CONF_VALUE_free(a) SKM_sk_free(CONF_VALUE, (a))
-	#define sk_CONF_VALUE_num(a) SKM_sk_num(CONF_VALUE, (a))
-	#define sk_CONF_VALUE_value(a,b) SKM_sk_value(CONF_VALUE, (a), (b))
-	#define sk_CONF_VALUE_set(a,b,c) SKM_sk_set(CONF_VALUE, (a), (b), (c))
-	#define sk_CONF_VALUE_zero(a) SKM_sk_zero(CONF_VALUE, (a))
-	#define sk_CONF_VALUE_push(a,b) SKM_sk_push(CONF_VALUE, (a),(b))
-	#define sk_CONF_VALUE_unshift(a,b) SKM_sk_unshift(CONF_VALUE, (a),(b))
-	#define sk_CONF_VALUE_find(a,b) SKM_sk_find(CONF_VALUE, (a), (b))
-	#define sk_CONF_VALUE_delete(a,b) SKM_sk_delete(CONF_VALUE, (a),(b))
-	#define sk_CONF_VALUE_delete_ptr(a,b) SKM_sk_delete_ptr(CONF_VALUE, (a),(b))
-	#define sk_CONF_VALUE_insert(a,b,c) SKM_sk_insert(CONF_VALUE, (a),(b),(c))
-	#define sk_CONF_VALUE_set_cmp_func(a,b) SKM_sk_set_cmp_func(CONF_VALUE, (a),(b))
-	#define sk_CONF_VALUE_dup(a) SKM_sk_dup(CONF_VALUE, a)
-	#define sk_CONF_VALUE_pop_free(a,b) SKM_sk_pop_free(CONF_VALUE, (a),(b))
-	#define sk_CONF_VALUE_shift(a) SKM_sk_shift(CONF_VALUE, (a))
-	#define sk_CONF_VALUE_pop(a) SKM_sk_pop(CONF_VALUE, (a))
-	#define sk_CONF_VALUE_sort(a) SKM_sk_sort(CONF_VALUE, (a))
-
-	#define sk_NAME_FUNCS_new(a) SKM_sk_new(NAME_FUNCS, (a))
-	#define sk_NAME_FUNCS_new_null() SKM_sk_new_null(NAME_FUNCS)
-	#define sk_NAME_FUNCS_free(a) SKM_sk_free(NAME_FUNCS, (a))
-	#define sk_NAME_FUNCS_num(a) SKM_sk_num(NAME_FUNCS, (a))
-	#define sk_NAME_FUNCS_value(a,b) SKM_sk_value(NAME_FUNCS, (a), (b))
-	#define sk_NAME_FUNCS_set(a,b,c) SKM_sk_set(NAME_FUNCS, (a), (b), (c))
-	#define sk_NAME_FUNCS_zero(a) SKM_sk_zero(NAME_FUNCS, (a))
-	#define sk_NAME_FUNCS_push(a,b) SKM_sk_push(NAME_FUNCS, (a),(b))
-	#define sk_NAME_FUNCS_unshift(a,b) SKM_sk_unshift(NAME_FUNCS, (a),(b))
-	#define sk_NAME_FUNCS_find(a,b) SKM_sk_find(NAME_FUNCS, (a), (b))
-	#define sk_NAME_FUNCS_delete(a,b) SKM_sk_delete(NAME_FUNCS, (a),(b))
-	#define sk_NAME_FUNCS_delete_ptr(a,b) SKM_sk_delete_ptr(NAME_FUNCS, (a),(b))
-	#define sk_NAME_FUNCS_insert(a,b,c) SKM_sk_insert(NAME_FUNCS, (a),(b),(c))
-	#define sk_NAME_FUNCS_set_cmp_func(a,b) SKM_sk_set_cmp_func(NAME_FUNCS, (a),(b))
-	#define sk_NAME_FUNCS_dup(a) SKM_sk_dup(NAME_FUNCS, a)
-	#define sk_NAME_FUNCS_pop_free(a,b) SKM_sk_pop_free(NAME_FUNCS, (a),(b))
-	#define sk_NAME_FUNCS_shift(a) SKM_sk_shift(NAME_FUNCS, (a))
-	#define sk_NAME_FUNCS_pop(a) SKM_sk_pop(NAME_FUNCS, (a))
-	#define sk_NAME_FUNCS_sort(a) SKM_sk_sort(NAME_FUNCS, (a))
-
-	#define sk_PKCS12_SAFEBAG_new(a) SKM_sk_new(PKCS12_SAFEBAG, (a))
-	#define sk_PKCS12_SAFEBAG_new_null() SKM_sk_new_null(PKCS12_SAFEBAG)
-	#define sk_PKCS12_SAFEBAG_free(a) SKM_sk_free(PKCS12_SAFEBAG, (a))
-	#define sk_PKCS12_SAFEBAG_num(a) SKM_sk_num(PKCS12_SAFEBAG, (a))
-	#define sk_PKCS12_SAFEBAG_value(a,b) SKM_sk_value(PKCS12_SAFEBAG, (a), (b))
-	#define sk_PKCS12_SAFEBAG_set(a,b,c) SKM_sk_set(PKCS12_SAFEBAG, (a), (b), (c))
-	#define sk_PKCS12_SAFEBAG_zero(a) SKM_sk_zero(PKCS12_SAFEBAG, (a))
-	#define sk_PKCS12_SAFEBAG_push(a,b) SKM_sk_push(PKCS12_SAFEBAG, (a),(b))
-	#define sk_PKCS12_SAFEBAG_unshift(a,b) SKM_sk_unshift(PKCS12_SAFEBAG, (a),(b))
-	#define sk_PKCS12_SAFEBAG_find(a,b) SKM_sk_find(PKCS12_SAFEBAG, (a), (b))
-	#define sk_PKCS12_SAFEBAG_delete(a,b) SKM_sk_delete(PKCS12_SAFEBAG, (a),(b))
-	#define sk_PKCS12_SAFEBAG_delete_ptr(a,b) SKM_sk_delete_ptr(PKCS12_SAFEBAG, (a),(b))
-	#define sk_PKCS12_SAFEBAG_insert(a,b,c) SKM_sk_insert(PKCS12_SAFEBAG, (a),(b),(c))
-	#define sk_PKCS12_SAFEBAG_set_cmp_func(a,b) SKM_sk_set_cmp_func(PKCS12_SAFEBAG, (a),(b))
-	#define sk_PKCS12_SAFEBAG_dup(a) SKM_sk_dup(PKCS12_SAFEBAG, a)
-	#define sk_PKCS12_SAFEBAG_pop_free(a,b) SKM_sk_pop_free(PKCS12_SAFEBAG, (a),(b))
-	#define sk_PKCS12_SAFEBAG_shift(a) SKM_sk_shift(PKCS12_SAFEBAG, (a))
-	#define sk_PKCS12_SAFEBAG_pop(a) SKM_sk_pop(PKCS12_SAFEBAG, (a))
-	#define sk_PKCS12_SAFEBAG_sort(a) SKM_sk_sort(PKCS12_SAFEBAG, (a))
-
-	#define sk_MIME_PARAM_new(a) SKM_sk_new(MIME_PARAM, (a))
-	#define sk_MIME_PARAM_new_null() SKM_sk_new_null(MIME_PARAM)
-	#define sk_MIME_PARAM_free(a) SKM_sk_free(MIME_PARAM, (a))
-	#define sk_MIME_PARAM_num(a) SKM_sk_num(MIME_PARAM, (a))
-	#define sk_MIME_PARAM_value(a,b) SKM_sk_value(MIME_PARAM, (a), (b))
-	#define sk_MIME_PARAM_set(a,b,c) SKM_sk_set(MIME_PARAM, (a), (b), (c))
-	#define sk_MIME_PARAM_zero(a) SKM_sk_zero(MIME_PARAM, (a))
-	#define sk_MIME_PARAM_push(a,b) SKM_sk_push(MIME_PARAM, (a),(b))
-	#define sk_MIME_PARAM_unshift(a,b) SKM_sk_unshift(MIME_PARAM, (a),(b))
-	#define sk_MIME_PARAM_find(a,b) SKM_sk_find(MIME_PARAM, (a), (b))
-	#define sk_MIME_PARAM_delete(a,b) SKM_sk_delete(MIME_PARAM, (a),(b))
-	#define sk_MIME_PARAM_delete_ptr(a,b) SKM_sk_delete_ptr(MIME_PARAM, (a),(b))
-	#define sk_MIME_PARAM_insert(a,b,c) SKM_sk_insert(MIME_PARAM, (a),(b),(c))
-	#define sk_MIME_PARAM_set_cmp_func(a,b) SKM_sk_set_cmp_func(MIME_PARAM, (a),(b))
-	#define sk_MIME_PARAM_dup(a) SKM_sk_dup(MIME_PARAM, a)
-	#define sk_MIME_PARAM_pop_free(a,b) SKM_sk_pop_free(MIME_PARAM, (a),(b))
-	#define sk_MIME_PARAM_shift(a) SKM_sk_shift(MIME_PARAM, (a))
-	#define sk_MIME_PARAM_pop(a) SKM_sk_pop(MIME_PARAM, (a))
-	#define sk_MIME_PARAM_sort(a) SKM_sk_sort(MIME_PARAM, (a))
-
-	#define sk_MIME_HEADER_new(a) SKM_sk_new(MIME_HEADER, (a))
-	#define sk_MIME_HEADER_new_null() SKM_sk_new_null(MIME_HEADER)
-	#define sk_MIME_HEADER_free(a) SKM_sk_free(MIME_HEADER, (a))
-	#define sk_MIME_HEADER_num(a) SKM_sk_num(MIME_HEADER, (a))
-	#define sk_MIME_HEADER_value(a,b) SKM_sk_value(MIME_HEADER, (a), (b))
-	#define sk_MIME_HEADER_set(a,b,c) SKM_sk_set(MIME_HEADER, (a), (b), (c))
-	#define sk_MIME_HEADER_zero(a) SKM_sk_zero(MIME_HEADER, (a))
-	#define sk_MIME_HEADER_push(a,b) SKM_sk_push(MIME_HEADER, (a),(b))
-	#define sk_MIME_HEADER_unshift(a,b) SKM_sk_unshift(MIME_HEADER, (a),(b))
-	#define sk_MIME_HEADER_find(a,b) SKM_sk_find(MIME_HEADER, (a), (b))
-	#define sk_MIME_HEADER_delete(a,b) SKM_sk_delete(MIME_HEADER, (a),(b))
-	#define sk_MIME_HEADER_delete_ptr(a,b) SKM_sk_delete_ptr(MIME_HEADER, (a),(b))
-	#define sk_MIME_HEADER_insert(a,b,c) SKM_sk_insert(MIME_HEADER, (a),(b),(c))
-	#define sk_MIME_HEADER_set_cmp_func(a,b) SKM_sk_set_cmp_func(MIME_HEADER, (a),(b))
-	#define sk_MIME_HEADER_dup(a) SKM_sk_dup(MIME_HEADER, a)
-	#define sk_MIME_HEADER_pop_free(a,b) SKM_sk_pop_free(MIME_HEADER, (a),(b))
-	#define sk_MIME_HEADER_shift(a) SKM_sk_shift(MIME_HEADER, (a))
-	#define sk_MIME_HEADER_pop(a) SKM_sk_pop(MIME_HEADER, (a))
-	#define sk_MIME_HEADER_sort(a) SKM_sk_sort(MIME_HEADER, (a))
-
-	#define sk_PKCS7_SIGNER_INFO_new(a) SKM_sk_new(PKCS7_SIGNER_INFO, (a))
-	#define sk_PKCS7_SIGNER_INFO_new_null() SKM_sk_new_null(PKCS7_SIGNER_INFO)
-	#define sk_PKCS7_SIGNER_INFO_free(a) SKM_sk_free(PKCS7_SIGNER_INFO, (a))
-	#define sk_PKCS7_SIGNER_INFO_num(a) SKM_sk_num(PKCS7_SIGNER_INFO, (a))
-	#define sk_PKCS7_SIGNER_INFO_value(a,b) SKM_sk_value(PKCS7_SIGNER_INFO, (a), (b))
-	#define sk_PKCS7_SIGNER_INFO_set(a,b,c) SKM_sk_set(PKCS7_SIGNER_INFO, (a), (b), (c))
-	#define sk_PKCS7_SIGNER_INFO_zero(a) SKM_sk_zero(PKCS7_SIGNER_INFO, (a))
-	#define sk_PKCS7_SIGNER_INFO_push(a,b) SKM_sk_push(PKCS7_SIGNER_INFO, (a),(b))
-	#define sk_PKCS7_SIGNER_INFO_unshift(a,b) SKM_sk_unshift(PKCS7_SIGNER_INFO, (a),(b))
-	#define sk_PKCS7_SIGNER_INFO_find(a,b) SKM_sk_find(PKCS7_SIGNER_INFO, (a), (b))
-	#define sk_PKCS7_SIGNER_INFO_delete(a,b) SKM_sk_delete(PKCS7_SIGNER_INFO, (a),(b))
-	#define sk_PKCS7_SIGNER_INFO_delete_ptr(a,b) SKM_sk_delete_ptr(PKCS7_SIGNER_INFO, (a),(b))
-	#define sk_PKCS7_SIGNER_INFO_insert(a,b,c) SKM_sk_insert(PKCS7_SIGNER_INFO, (a),(b),(c))
-	#define sk_PKCS7_SIGNER_INFO_set_cmp_func(a,b) SKM_sk_set_cmp_func(PKCS7_SIGNER_INFO, (a),(b))
-	#define sk_PKCS7_SIGNER_INFO_dup(a) SKM_sk_dup(PKCS7_SIGNER_INFO, a)
-	#define sk_PKCS7_SIGNER_INFO_pop_free(a,b) SKM_sk_pop_free(PKCS7_SIGNER_INFO, (a),(b))
-	#define sk_PKCS7_SIGNER_INFO_shift(a) SKM_sk_shift(PKCS7_SIGNER_INFO, (a))
-	#define sk_PKCS7_SIGNER_INFO_pop(a) SKM_sk_pop(PKCS7_SIGNER_INFO, (a))
-	#define sk_PKCS7_SIGNER_INFO_sort(a) SKM_sk_sort(PKCS7_SIGNER_INFO, (a))
-
-	#define sk_PKCS7_RECIP_INFO_new(a) SKM_sk_new(PKCS7_RECIP_INFO, (a))
-	#define sk_PKCS7_RECIP_INFO_new_null() SKM_sk_new_null(PKCS7_RECIP_INFO)
-	#define sk_PKCS7_RECIP_INFO_free(a) SKM_sk_free(PKCS7_RECIP_INFO, (a))
-	#define sk_PKCS7_RECIP_INFO_num(a) SKM_sk_num(PKCS7_RECIP_INFO, (a))
-	#define sk_PKCS7_RECIP_INFO_value(a,b) SKM_sk_value(PKCS7_RECIP_INFO, (a), (b))
-	#define sk_PKCS7_RECIP_INFO_set(a,b,c) SKM_sk_set(PKCS7_RECIP_INFO, (a), (b), (c))
-	#define sk_PKCS7_RECIP_INFO_zero(a) SKM_sk_zero(PKCS7_RECIP_INFO, (a))
-	#define sk_PKCS7_RECIP_INFO_push(a,b) SKM_sk_push(PKCS7_RECIP_INFO, (a),(b))
-	#define sk_PKCS7_RECIP_INFO_unshift(a,b) SKM_sk_unshift(PKCS7_RECIP_INFO, (a),(b))
-	#define sk_PKCS7_RECIP_INFO_find(a,b) SKM_sk_find(PKCS7_RECIP_INFO, (a), (b))
-	#define sk_PKCS7_RECIP_INFO_delete(a,b) SKM_sk_delete(PKCS7_RECIP_INFO, (a),(b))
-	#define sk_PKCS7_RECIP_INFO_delete_ptr(a,b) SKM_sk_delete_ptr(PKCS7_RECIP_INFO, (a),(b))
-	#define sk_PKCS7_RECIP_INFO_insert(a,b,c) SKM_sk_insert(PKCS7_RECIP_INFO, (a),(b),(c))
-	#define sk_PKCS7_RECIP_INFO_set_cmp_func(a,b) SKM_sk_set_cmp_func(PKCS7_RECIP_INFO, (a),(b))
-	#define sk_PKCS7_RECIP_INFO_dup(a) SKM_sk_dup(PKCS7_RECIP_INFO, a)
-	#define sk_PKCS7_RECIP_INFO_pop_free(a,b) SKM_sk_pop_free(PKCS7_RECIP_INFO, (a),(b))
-	#define sk_PKCS7_RECIP_INFO_shift(a) SKM_sk_shift(PKCS7_RECIP_INFO, (a))
-	#define sk_PKCS7_RECIP_INFO_pop(a) SKM_sk_pop(PKCS7_RECIP_INFO, (a))
-	#define sk_PKCS7_RECIP_INFO_sort(a) SKM_sk_sort(PKCS7_RECIP_INFO, (a))
-
-	#define sk_PKCS7_new(a) SKM_sk_new(PKCS7, (a))
-	#define sk_PKCS7_new_null() SKM_sk_new_null(PKCS7)
-	#define sk_PKCS7_free(a) SKM_sk_free(PKCS7, (a))
-	#define sk_PKCS7_num(a) SKM_sk_num(PKCS7, (a))
-	#define sk_PKCS7_value(a,b) SKM_sk_value(PKCS7, (a), (b))
-	#define sk_PKCS7_set(a,b,c) SKM_sk_set(PKCS7, (a), (b), (c))
-	#define sk_PKCS7_zero(a) SKM_sk_zero(PKCS7, (a))
-	#define sk_PKCS7_push(a,b) SKM_sk_push(PKCS7, (a),(b))
-	#define sk_PKCS7_unshift(a,b) SKM_sk_unshift(PKCS7, (a),(b))
-	#define sk_PKCS7_find(a,b) SKM_sk_find(PKCS7, (a), (b))
-	#define sk_PKCS7_delete(a,b) SKM_sk_delete(PKCS7, (a),(b))
-	#define sk_PKCS7_delete_ptr(a,b) SKM_sk_delete_ptr(PKCS7, (a),(b))
-	#define sk_PKCS7_insert(a,b,c) SKM_sk_insert(PKCS7, (a),(b),(c))
-	#define sk_PKCS7_set_cmp_func(a,b) SKM_sk_set_cmp_func(PKCS7, (a),(b))
-	#define sk_PKCS7_dup(a) SKM_sk_dup(PKCS7, a)
-	#define sk_PKCS7_pop_free(a,b) SKM_sk_pop_free(PKCS7, (a),(b))
-	#define sk_PKCS7_shift(a) SKM_sk_shift(PKCS7, (a))
-	#define sk_PKCS7_pop(a) SKM_sk_pop(PKCS7, (a))
-	#define sk_PKCS7_sort(a) SKM_sk_sort(PKCS7, (a))
-
-	#define sk_X509_ALGOR_new(a) SKM_sk_new(X509_ALGOR, (a))
-	#define sk_X509_ALGOR_new_null() SKM_sk_new_null(X509_ALGOR)
-	#define sk_X509_ALGOR_free(a) SKM_sk_free(X509_ALGOR, (a))
-	#define sk_X509_ALGOR_num(a) SKM_sk_num(X509_ALGOR, (a))
-	#define sk_X509_ALGOR_value(a,b) SKM_sk_value(X509_ALGOR, (a), (b))
-	#define sk_X509_ALGOR_set(a,b,c) SKM_sk_set(X509_ALGOR, (a), (b), (c))
-	#define sk_X509_ALGOR_zero(a) SKM_sk_zero(X509_ALGOR, (a))
-	#define sk_X509_ALGOR_push(a,b) SKM_sk_push(X509_ALGOR, (a),(b))
-	#define sk_X509_ALGOR_unshift(a,b) SKM_sk_unshift(X509_ALGOR, (a),(b))
-	#define sk_X509_ALGOR_find(a,b) SKM_sk_find(X509_ALGOR, (a), (b))
-	#define sk_X509_ALGOR_delete(a,b) SKM_sk_delete(X509_ALGOR, (a),(b))
-	#define sk_X509_ALGOR_delete_ptr(a,b) SKM_sk_delete_ptr(X509_ALGOR, (a),(b))
-	#define sk_X509_ALGOR_insert(a,b,c) SKM_sk_insert(X509_ALGOR, (a),(b),(c))
-	#define sk_X509_ALGOR_set_cmp_func(a,b) SKM_sk_set_cmp_func(X509_ALGOR, (a),(b))
-	#define sk_X509_ALGOR_dup(a) SKM_sk_dup(X509_ALGOR, a)
-	#define sk_X509_ALGOR_pop_free(a,b) SKM_sk_pop_free(X509_ALGOR, (a),(b))
-	#define sk_X509_ALGOR_shift(a) SKM_sk_shift(X509_ALGOR, (a))
-	#define sk_X509_ALGOR_pop(a) SKM_sk_pop(X509_ALGOR, (a))
-	#define sk_X509_ALGOR_sort(a) SKM_sk_sort(X509_ALGOR, (a))
-
-	#define sk_X509_NAME_ENTRY_new(a) SKM_sk_new(X509_NAME_ENTRY, (a))
-	#define sk_X509_NAME_ENTRY_new_null() SKM_sk_new_null(X509_NAME_ENTRY)
-	#define sk_X509_NAME_ENTRY_free(a) SKM_sk_free(X509_NAME_ENTRY, (a))
-	#define sk_X509_NAME_ENTRY_num(a) SKM_sk_num(X509_NAME_ENTRY, (a))
-	#define sk_X509_NAME_ENTRY_value(a,b) SKM_sk_value(X509_NAME_ENTRY, (a), (b))
-	#define sk_X509_NAME_ENTRY_set(a,b,c) SKM_sk_set(X509_NAME_ENTRY, (a), (b), (c))
-	#define sk_X509_NAME_ENTRY_zero(a) SKM_sk_zero(X509_NAME_ENTRY, (a))
-	#define sk_X509_NAME_ENTRY_push(a,b) SKM_sk_push(X509_NAME_ENTRY, (a),(b))
-	#define sk_X509_NAME_ENTRY_unshift(a,b) SKM_sk_unshift(X509_NAME_ENTRY, (a),(b))
-	#define sk_X509_NAME_ENTRY_find(a,b) SKM_sk_find(X509_NAME_ENTRY, (a), (b))
-	#define sk_X509_NAME_ENTRY_delete(a,b) SKM_sk_delete(X509_NAME_ENTRY, (a),(b))
-	#define sk_X509_NAME_ENTRY_delete_ptr(a,b) SKM_sk_delete_ptr(X509_NAME_ENTRY, (a),(b))
-	#define sk_X509_NAME_ENTRY_insert(a,b,c) SKM_sk_insert(X509_NAME_ENTRY, (a),(b),(c))
-	#define sk_X509_NAME_ENTRY_set_cmp_func(a,b) SKM_sk_set_cmp_func(X509_NAME_ENTRY, (a),(b))
-	#define sk_X509_NAME_ENTRY_dup(a) SKM_sk_dup(X509_NAME_ENTRY, a)
-	#define sk_X509_NAME_ENTRY_pop_free(a,b) SKM_sk_pop_free(X509_NAME_ENTRY, (a),(b))
-	#define sk_X509_NAME_ENTRY_shift(a) SKM_sk_shift(X509_NAME_ENTRY, (a))
-	#define sk_X509_NAME_ENTRY_pop(a) SKM_sk_pop(X509_NAME_ENTRY, (a))
-	#define sk_X509_NAME_ENTRY_sort(a) SKM_sk_sort(X509_NAME_ENTRY, (a))
-
-	#define sk_X509_NAME_new(a) SKM_sk_new(X509_NAME, (a))
-	#define sk_X509_NAME_new_null() SKM_sk_new_null(X509_NAME)
-	#define sk_X509_NAME_free(a) SKM_sk_free(X509_NAME, (a))
-	#define sk_X509_NAME_num(a) SKM_sk_num(X509_NAME, (a))
-	#define sk_X509_NAME_value(a,b) SKM_sk_value(X509_NAME, (a), (b))
-	#define sk_X509_NAME_set(a,b,c) SKM_sk_set(X509_NAME, (a), (b), (c))
-	#define sk_X509_NAME_zero(a) SKM_sk_zero(X509_NAME, (a))
-	#define sk_X509_NAME_push(a,b) SKM_sk_push(X509_NAME, (a),(b))
-	#define sk_X509_NAME_unshift(a,b) SKM_sk_unshift(X509_NAME, (a),(b))
-	#define sk_X509_NAME_find(a,b) SKM_sk_find(X509_NAME, (a), (b))
-	#define sk_X509_NAME_delete(a,b) SKM_sk_delete(X509_NAME, (a),(b))
-	#define sk_X509_NAME_delete_ptr(a,b) SKM_sk_delete_ptr(X509_NAME, (a),(b))
-	#define sk_X509_NAME_insert(a,b,c) SKM_sk_insert(X509_NAME, (a),(b),(c))
-	#define sk_X509_NAME_set_cmp_func(a,b) SKM_sk_set_cmp_func(X509_NAME, (a),(b))
-	#define sk_X509_NAME_dup(a) SKM_sk_dup(X509_NAME, a)
-	#define sk_X509_NAME_pop_free(a,b) SKM_sk_pop_free(X509_NAME, (a),(b))
-	#define sk_X509_NAME_shift(a) SKM_sk_shift(X509_NAME, (a))
-	#define sk_X509_NAME_pop(a) SKM_sk_pop(X509_NAME, (a))
-	#define sk_X509_NAME_sort(a) SKM_sk_sort(X509_NAME, (a))
-
-	#define sk_X509_EXTENSION_new(a) SKM_sk_new(X509_EXTENSION, (a))
-	#define sk_X509_EXTENSION_new_null() SKM_sk_new_null(X509_EXTENSION)
-	#define sk_X509_EXTENSION_free(a) SKM_sk_free(X509_EXTENSION, (a))
-	#define sk_X509_EXTENSION_num(a) SKM_sk_num(X509_EXTENSION, (a))
-	#define sk_X509_EXTENSION_value(a,b) SKM_sk_value(X509_EXTENSION, (a), (b))
-	#define sk_X509_EXTENSION_set(a,b,c) SKM_sk_set(X509_EXTENSION, (a), (b), (c))
-	#define sk_X509_EXTENSION_zero(a) SKM_sk_zero(X509_EXTENSION, (a))
-	#define sk_X509_EXTENSION_push(a,b) SKM_sk_push(X509_EXTENSION, (a),(b))
-	#define sk_X509_EXTENSION_unshift(a,b) SKM_sk_unshift(X509_EXTENSION, (a),(b))
-	#define sk_X509_EXTENSION_find(a,b) SKM_sk_find(X509_EXTENSION, (a), (b))
-	#define sk_X509_EXTENSION_delete(a,b) SKM_sk_delete(X509_EXTENSION, (a),(b))
-	#define sk_X509_EXTENSION_delete_ptr(a,b) SKM_sk_delete_ptr(X509_EXTENSION, (a),(b))
-	#define sk_X509_EXTENSION_insert(a,b,c) SKM_sk_insert(X509_EXTENSION, (a),(b),(c))
-	#define sk_X509_EXTENSION_set_cmp_func(a,b) SKM_sk_set_cmp_func(X509_EXTENSION, (a),(b))
-	#define sk_X509_EXTENSION_dup(a) SKM_sk_dup(X509_EXTENSION, a)
-	#define sk_X509_EXTENSION_pop_free(a,b) SKM_sk_pop_free(X509_EXTENSION, (a),(b))
-	#define sk_X509_EXTENSION_shift(a) SKM_sk_shift(X509_EXTENSION, (a))
-	#define sk_X509_EXTENSION_pop(a) SKM_sk_pop(X509_EXTENSION, (a))
-	#define sk_X509_EXTENSION_sort(a) SKM_sk_sort(X509_EXTENSION, (a))
-
-	#define sk_X509_ATTRIBUTE_new(a) SKM_sk_new(X509_ATTRIBUTE, (a))
-	#define sk_X509_ATTRIBUTE_new_null() SKM_sk_new_null(X509_ATTRIBUTE)
-	#define sk_X509_ATTRIBUTE_free(a) SKM_sk_free(X509_ATTRIBUTE, (a))
-	#define sk_X509_ATTRIBUTE_num(a) SKM_sk_num(X509_ATTRIBUTE, (a))
-	#define sk_X509_ATTRIBUTE_value(a,b) SKM_sk_value(X509_ATTRIBUTE, (a), (b))
-	#define sk_X509_ATTRIBUTE_set(a,b,c) SKM_sk_set(X509_ATTRIBUTE, (a), (b), (c))
-	#define sk_X509_ATTRIBUTE_zero(a) SKM_sk_zero(X509_ATTRIBUTE, (a))
-	#define sk_X509_ATTRIBUTE_push(a,b) SKM_sk_push(X509_ATTRIBUTE, (a),(b))
-	#define sk_X509_ATTRIBUTE_unshift(a,b) SKM_sk_unshift(X509_ATTRIBUTE, (a),(b))
-	#define sk_X509_ATTRIBUTE_find(a,b) SKM_sk_find(X509_ATTRIBUTE, (a), (b))
-	#define sk_X509_ATTRIBUTE_delete(a,b) SKM_sk_delete(X509_ATTRIBUTE, (a),(b))
-	#define sk_X509_ATTRIBUTE_delete_ptr(a,b) SKM_sk_delete_ptr(X509_ATTRIBUTE, (a),(b))
-	#define sk_X509_ATTRIBUTE_insert(a,b,c) SKM_sk_insert(X509_ATTRIBUTE, (a),(b),(c))
-	#define sk_X509_ATTRIBUTE_set_cmp_func(a,b) SKM_sk_set_cmp_func(X509_ATTRIBUTE, (a),(b))
-	#define sk_X509_ATTRIBUTE_dup(a) SKM_sk_dup(X509_ATTRIBUTE, a)
-	#define sk_X509_ATTRIBUTE_pop_free(a,b) SKM_sk_pop_free(X509_ATTRIBUTE, (a),(b))
-	#define sk_X509_ATTRIBUTE_shift(a) SKM_sk_shift(X509_ATTRIBUTE, (a))
-	#define sk_X509_ATTRIBUTE_pop(a) SKM_sk_pop(X509_ATTRIBUTE, (a))
-	#define sk_X509_ATTRIBUTE_sort(a) SKM_sk_sort(X509_ATTRIBUTE, (a))
-
-	#define sk_X509_new(a) SKM_sk_new(X509, (a))
-	#define sk_X509_new_null() SKM_sk_new_null(X509)
-	#define sk_X509_free(a) SKM_sk_free(X509, (a))
-	#define sk_X509_num(a) SKM_sk_num(X509, (a))
-	#define sk_X509_value(a,b) SKM_sk_value(X509, (a), (b))
-	#define sk_X509_set(a,b,c) SKM_sk_set(X509, (a), (b), (c))
-	#define sk_X509_zero(a) SKM_sk_zero(X509, (a))
-	#define sk_X509_push(a,b) SKM_sk_push(X509, (a),(b))
-	#define sk_X509_unshift(a,b) SKM_sk_unshift(X509, (a),(b))
-	#define sk_X509_find(a,b) SKM_sk_find(X509, (a), (b))
-	#define sk_X509_delete(a,b) SKM_sk_delete(X509, (a),(b))
-	#define sk_X509_delete_ptr(a,b) SKM_sk_delete_ptr(X509, (a),(b))
-	#define sk_X509_insert(a,b,c) SKM_sk_insert(X509, (a),(b),(c))
-	#define sk_X509_set_cmp_func(a,b) SKM_sk_set_cmp_func(X509, (a),(b))
-	#define sk_X509_dup(a) SKM_sk_dup(X509, a)
-	#define sk_X509_pop_free(a,b) SKM_sk_pop_free(X509, (a),(b))
-	#define sk_X509_shift(a) SKM_sk_shift(X509, (a))
-	#define sk_X509_pop(a) SKM_sk_pop(X509, (a))
-	#define sk_X509_sort(a) SKM_sk_sort(X509, (a))
-
-	#define sk_X509_TRUST_new(a) SKM_sk_new(X509_TRUST, (a))
-	#define sk_X509_TRUST_new_null() SKM_sk_new_null(X509_TRUST)
-	#define sk_X509_TRUST_free(a) SKM_sk_free(X509_TRUST, (a))
-	#define sk_X509_TRUST_num(a) SKM_sk_num(X509_TRUST, (a))
-	#define sk_X509_TRUST_value(a,b) SKM_sk_value(X509_TRUST, (a), (b))
-	#define sk_X509_TRUST_set(a,b,c) SKM_sk_set(X509_TRUST, (a), (b), (c))
-	#define sk_X509_TRUST_zero(a) SKM_sk_zero(X509_TRUST, (a))
-	#define sk_X509_TRUST_push(a,b) SKM_sk_push(X509_TRUST, (a),(b))
-	#define sk_X509_TRUST_unshift(a,b) SKM_sk_unshift(X509_TRUST, (a),(b))
-	#define sk_X509_TRUST_find(a,b) SKM_sk_find(X509_TRUST, (a), (b))
-	#define sk_X509_TRUST_delete(a,b) SKM_sk_delete(X509_TRUST, (a),(b))
-	#define sk_X509_TRUST_delete_ptr(a,b) SKM_sk_delete_ptr(X509_TRUST, (a),(b))
-	#define sk_X509_TRUST_insert(a,b,c) SKM_sk_insert(X509_TRUST, (a),(b),(c))
-	#define sk_X509_TRUST_set_cmp_func(a,b) SKM_sk_set_cmp_func(X509_TRUST, (a),(b))
-	#define sk_X509_TRUST_dup(a) SKM_sk_dup(X509_TRUST, a)
-	#define sk_X509_TRUST_pop_free(a,b) SKM_sk_pop_free(X509_TRUST, (a),(b))
-	#define sk_X509_TRUST_shift(a) SKM_sk_shift(X509_TRUST, (a))
-	#define sk_X509_TRUST_pop(a) SKM_sk_pop(X509_TRUST, (a))
-	#define sk_X509_TRUST_sort(a) SKM_sk_sort(X509_TRUST, (a))
-
-	#define sk_X509_REVOKED_new(a) SKM_sk_new(X509_REVOKED, (a))
-	#define sk_X509_REVOKED_new_null() SKM_sk_new_null(X509_REVOKED)
-	#define sk_X509_REVOKED_free(a) SKM_sk_free(X509_REVOKED, (a))
-	#define sk_X509_REVOKED_num(a) SKM_sk_num(X509_REVOKED, (a))
-	#define sk_X509_REVOKED_value(a,b) SKM_sk_value(X509_REVOKED, (a), (b))
-	#define sk_X509_REVOKED_set(a,b,c) SKM_sk_set(X509_REVOKED, (a), (b), (c))
-	#define sk_X509_REVOKED_zero(a) SKM_sk_zero(X509_REVOKED, (a))
-	#define sk_X509_REVOKED_push(a,b) SKM_sk_push(X509_REVOKED, (a),(b))
-	#define sk_X509_REVOKED_unshift(a,b) SKM_sk_unshift(X509_REVOKED, (a),(b))
-	#define sk_X509_REVOKED_find(a,b) SKM_sk_find(X509_REVOKED, (a), (b))
-	#define sk_X509_REVOKED_delete(a,b) SKM_sk_delete(X509_REVOKED, (a),(b))
-	#define sk_X509_REVOKED_delete_ptr(a,b) SKM_sk_delete_ptr(X509_REVOKED, (a),(b))
-	#define sk_X509_REVOKED_insert(a,b,c) SKM_sk_insert(X509_REVOKED, (a),(b),(c))
-	#define sk_X509_REVOKED_set_cmp_func(a,b) SKM_sk_set_cmp_func(X509_REVOKED, (a),(b))
-	#define sk_X509_REVOKED_dup(a) SKM_sk_dup(X509_REVOKED, a)
-	#define sk_X509_REVOKED_pop_free(a,b) SKM_sk_pop_free(X509_REVOKED, (a),(b))
-	#define sk_X509_REVOKED_shift(a) SKM_sk_shift(X509_REVOKED, (a))
-	#define sk_X509_REVOKED_pop(a) SKM_sk_pop(X509_REVOKED, (a))
-	#define sk_X509_REVOKED_sort(a) SKM_sk_sort(X509_REVOKED, (a))
-
-	#define sk_X509_CRL_new(a) SKM_sk_new(X509_CRL, (a))
-	#define sk_X509_CRL_new_null() SKM_sk_new_null(X509_CRL)
-	#define sk_X509_CRL_free(a) SKM_sk_free(X509_CRL, (a))
-	#define sk_X509_CRL_num(a) SKM_sk_num(X509_CRL, (a))
-	#define sk_X509_CRL_value(a,b) SKM_sk_value(X509_CRL, (a), (b))
-	#define sk_X509_CRL_set(a,b,c) SKM_sk_set(X509_CRL, (a), (b), (c))
-	#define sk_X509_CRL_zero(a) SKM_sk_zero(X509_CRL, (a))
-	#define sk_X509_CRL_push(a,b) SKM_sk_push(X509_CRL, (a),(b))
-	#define sk_X509_CRL_unshift(a,b) SKM_sk_unshift(X509_CRL, (a),(b))
-	#define sk_X509_CRL_find(a,b) SKM_sk_find(X509_CRL, (a), (b))
-	#define sk_X509_CRL_delete(a,b) SKM_sk_delete(X509_CRL, (a),(b))
-	#define sk_X509_CRL_delete_ptr(a,b) SKM_sk_delete_ptr(X509_CRL, (a),(b))
-	#define sk_X509_CRL_insert(a,b,c) SKM_sk_insert(X509_CRL, (a),(b),(c))
-	#define sk_X509_CRL_set_cmp_func(a,b) SKM_sk_set_cmp_func(X509_CRL, (a),(b))
-	#define sk_X509_CRL_dup(a) SKM_sk_dup(X509_CRL, a)
-	#define sk_X509_CRL_pop_free(a,b) SKM_sk_pop_free(X509_CRL, (a),(b))
-	#define sk_X509_CRL_shift(a) SKM_sk_shift(X509_CRL, (a))
-	#define sk_X509_CRL_pop(a) SKM_sk_pop(X509_CRL, (a))
-	#define sk_X509_CRL_sort(a) SKM_sk_sort(X509_CRL, (a))
-
-	#define sk_X509_INFO_new(a) SKM_sk_new(X509_INFO, (a))
-	#define sk_X509_INFO_new_null() SKM_sk_new_null(X509_INFO)
-	#define sk_X509_INFO_free(a) SKM_sk_free(X509_INFO, (a))
-	#define sk_X509_INFO_num(a) SKM_sk_num(X509_INFO, (a))
-	#define sk_X509_INFO_value(a,b) SKM_sk_value(X509_INFO, (a), (b))
-	#define sk_X509_INFO_set(a,b,c) SKM_sk_set(X509_INFO, (a), (b), (c))
-	#define sk_X509_INFO_zero(a) SKM_sk_zero(X509_INFO, (a))
-	#define sk_X509_INFO_push(a,b) SKM_sk_push(X509_INFO, (a),(b))
-	#define sk_X509_INFO_unshift(a,b) SKM_sk_unshift(X509_INFO, (a),(b))
-	#define sk_X509_INFO_find(a,b) SKM_sk_find(X509_INFO, (a), (b))
-	#define sk_X509_INFO_delete(a,b) SKM_sk_delete(X509_INFO, (a),(b))
-	#define sk_X509_INFO_delete_ptr(a,b) SKM_sk_delete_ptr(X509_INFO, (a),(b))
-	#define sk_X509_INFO_insert(a,b,c) SKM_sk_insert(X509_INFO, (a),(b),(c))
-	#define sk_X509_INFO_set_cmp_func(a,b) SKM_sk_set_cmp_func(X509_INFO, (a),(b))
-	#define sk_X509_INFO_dup(a) SKM_sk_dup(X509_INFO, a)
-	#define sk_X509_INFO_pop_free(a,b) SKM_sk_pop_free(X509_INFO, (a),(b))
-	#define sk_X509_INFO_shift(a) SKM_sk_shift(X509_INFO, (a))
-	#define sk_X509_INFO_pop(a) SKM_sk_pop(X509_INFO, (a))
-	#define sk_X509_INFO_sort(a) SKM_sk_sort(X509_INFO, (a))
-
-	#define sk_X509_LOOKUP_new(a) SKM_sk_new(X509_LOOKUP, (a))
-	#define sk_X509_LOOKUP_new_null() SKM_sk_new_null(X509_LOOKUP)
-	#define sk_X509_LOOKUP_free(a) SKM_sk_free(X509_LOOKUP, (a))
-	#define sk_X509_LOOKUP_num(a) SKM_sk_num(X509_LOOKUP, (a))
-	#define sk_X509_LOOKUP_value(a,b) SKM_sk_value(X509_LOOKUP, (a), (b))
-	#define sk_X509_LOOKUP_set(a,b,c) SKM_sk_set(X509_LOOKUP, (a), (b), (c))
-	#define sk_X509_LOOKUP_zero(a) SKM_sk_zero(X509_LOOKUP, (a))
-	#define sk_X509_LOOKUP_push(a,b) SKM_sk_push(X509_LOOKUP, (a),(b))
-	#define sk_X509_LOOKUP_unshift(a,b) SKM_sk_unshift(X509_LOOKUP, (a),(b))
-	#define sk_X509_LOOKUP_find(a,b) SKM_sk_find(X509_LOOKUP, (a), (b))
-	#define sk_X509_LOOKUP_delete(a,b) SKM_sk_delete(X509_LOOKUP, (a),(b))
-	#define sk_X509_LOOKUP_delete_ptr(a,b) SKM_sk_delete_ptr(X509_LOOKUP, (a),(b))
-	#define sk_X509_LOOKUP_insert(a,b,c) SKM_sk_insert(X509_LOOKUP, (a),(b),(c))
-	#define sk_X509_LOOKUP_set_cmp_func(a,b) SKM_sk_set_cmp_func(X509_LOOKUP, (a),(b))
-	#define sk_X509_LOOKUP_dup(a) SKM_sk_dup(X509_LOOKUP, a)
-	#define sk_X509_LOOKUP_pop_free(a,b) SKM_sk_pop_free(X509_LOOKUP, (a),(b))
-	#define sk_X509_LOOKUP_shift(a) SKM_sk_shift(X509_LOOKUP, (a))
-	#define sk_X509_LOOKUP_pop(a) SKM_sk_pop(X509_LOOKUP, (a))
-	#define sk_X509_LOOKUP_sort(a) SKM_sk_sort(X509_LOOKUP, (a))
-
-	#define sk_X509V3_EXT_METHOD_new(a) SKM_sk_new(X509V3_EXT_METHOD, (a))
-	#define sk_X509V3_EXT_METHOD_new_null() SKM_sk_new_null(X509V3_EXT_METHOD)
-	#define sk_X509V3_EXT_METHOD_free(a) SKM_sk_free(X509V3_EXT_METHOD, (a))
-	#define sk_X509V3_EXT_METHOD_num(a) SKM_sk_num(X509V3_EXT_METHOD, (a))
-	#define sk_X509V3_EXT_METHOD_value(a,b) SKM_sk_value(X509V3_EXT_METHOD, (a), (b))
-	#define sk_X509V3_EXT_METHOD_set(a,b,c) SKM_sk_set(X509V3_EXT_METHOD, (a), (b), (c))
-	#define sk_X509V3_EXT_METHOD_zero(a) SKM_sk_zero(X509V3_EXT_METHOD, (a))
-	#define sk_X509V3_EXT_METHOD_push(a,b) SKM_sk_push(X509V3_EXT_METHOD, (a),(b))
-	#define sk_X509V3_EXT_METHOD_unshift(a,b) SKM_sk_unshift(X509V3_EXT_METHOD, (a),(b))
-	#define sk_X509V3_EXT_METHOD_find(a,b) SKM_sk_find(X509V3_EXT_METHOD, (a), (b))
-	#define sk_X509V3_EXT_METHOD_delete(a,b) SKM_sk_delete(X509V3_EXT_METHOD, (a),(b))
-	#define sk_X509V3_EXT_METHOD_delete_ptr(a,b) SKM_sk_delete_ptr(X509V3_EXT_METHOD, (a),(b))
-	#define sk_X509V3_EXT_METHOD_insert(a,b,c) SKM_sk_insert(X509V3_EXT_METHOD, (a),(b),(c))
-	#define sk_X509V3_EXT_METHOD_set_cmp_func(a,b) SKM_sk_set_cmp_func(X509V3_EXT_METHOD, (a),(b))
-	#define sk_X509V3_EXT_METHOD_dup(a) SKM_sk_dup(X509V3_EXT_METHOD, a)
-	#define sk_X509V3_EXT_METHOD_pop_free(a,b) SKM_sk_pop_free(X509V3_EXT_METHOD, (a),(b))
-	#define sk_X509V3_EXT_METHOD_shift(a) SKM_sk_shift(X509V3_EXT_METHOD, (a))
-	#define sk_X509V3_EXT_METHOD_pop(a) SKM_sk_pop(X509V3_EXT_METHOD, (a))
-	#define sk_X509V3_EXT_METHOD_sort(a