Commit 9bc62920 authored by Richard Levitte's avatar Richard Levitte
Browse files

With the new stack hack macros, there's no need to shorten the names

any more.
parent 4b88270b
Loading
Loading
Loading
Loading
+0 −104
Original line number Diff line number Diff line
@@ -59,110 +59,6 @@

/* Hack a long name in crypto/asn1/a_mbstr.c */
#define ASN1_STRING_set_default_mask_asc ASN1_STRING_set_def_mask_asc
/* Hack the names created with DECLARE_STACK_OF(PKCS7_SIGNER_INFO) */
#define sk_PKCS7_SIGNER_INFO_new		sk_PKCS7_SIGINF_new
#define sk_PKCS7_SIGNER_INFO_new_null		sk_PKCS7_SIGINF_new_null
#define sk_PKCS7_SIGNER_INFO_free		sk_PKCS7_SIGINF_free
#define sk_PKCS7_SIGNER_INFO_num		sk_PKCS7_SIGINF_num
#define sk_PKCS7_SIGNER_INFO_value		sk_PKCS7_SIGINF_value
#define sk_PKCS7_SIGNER_INFO_set		sk_PKCS7_SIGINF_set
#define sk_PKCS7_SIGNER_INFO_zero		sk_PKCS7_SIGINF_zero
#define sk_PKCS7_SIGNER_INFO_push		sk_PKCS7_SIGINF_push
#define sk_PKCS7_SIGNER_INFO_unshift		sk_PKCS7_SIGINF_unshift
#define sk_PKCS7_SIGNER_INFO_find		sk_PKCS7_SIGINF_find
#define sk_PKCS7_SIGNER_INFO_delete		sk_PKCS7_SIGINF_delete
#define sk_PKCS7_SIGNER_INFO_delete_ptr		sk_PKCS7_SIGINF_delete_ptr
#define sk_PKCS7_SIGNER_INFO_insert		sk_PKCS7_SIGINF_insert
#define sk_PKCS7_SIGNER_INFO_set_cmp_func	sk_PKCS7_SIGINF_set_cmp_func
#define sk_PKCS7_SIGNER_INFO_dup		sk_PKCS7_SIGINF_dup
#define sk_PKCS7_SIGNER_INFO_pop_free		sk_PKCS7_SIGINF_pop_free
#define sk_PKCS7_SIGNER_INFO_shift		sk_PKCS7_SIGINF_shift
#define sk_PKCS7_SIGNER_INFO_pop		sk_PKCS7_SIGINF_pop
#define sk_PKCS7_SIGNER_INFO_sort		sk_PKCS7_SIGINF_sort

/* Hack the names created with DECLARE_STACK_OF(PKCS7_RECIP_INFO) */
#define sk_PKCS7_RECIP_INFO_new			sk_PKCS7_RECINF_new
#define sk_PKCS7_RECIP_INFO_new_null		sk_PKCS7_RECINF_new_null
#define sk_PKCS7_RECIP_INFO_free		sk_PKCS7_RECINF_free
#define sk_PKCS7_RECIP_INFO_num			sk_PKCS7_RECINF_num
#define sk_PKCS7_RECIP_INFO_value		sk_PKCS7_RECINF_value
#define sk_PKCS7_RECIP_INFO_set			sk_PKCS7_RECINF_set
#define sk_PKCS7_RECIP_INFO_zero		sk_PKCS7_RECINF_zero
#define sk_PKCS7_RECIP_INFO_push		sk_PKCS7_RECINF_push
#define sk_PKCS7_RECIP_INFO_unshift		sk_PKCS7_RECINF_unshift
#define sk_PKCS7_RECIP_INFO_find		sk_PKCS7_RECINF_find
#define sk_PKCS7_RECIP_INFO_delete		sk_PKCS7_RECINF_delete
#define sk_PKCS7_RECIP_INFO_delete_ptr		sk_PKCS7_RECINF_delete_ptr
#define sk_PKCS7_RECIP_INFO_insert		sk_PKCS7_RECINF_insert
#define sk_PKCS7_RECIP_INFO_set_cmp_func	sk_PKCS7_RECINF_set_cmp_func
#define sk_PKCS7_RECIP_INFO_dup			sk_PKCS7_RECINF_dup
#define sk_PKCS7_RECIP_INFO_pop_free		sk_PKCS7_RECINF_pop_free
#define sk_PKCS7_RECIP_INFO_shift		sk_PKCS7_RECINF_shift
#define sk_PKCS7_RECIP_INFO_pop			sk_PKCS7_RECINF_pop
#define sk_PKCS7_RECIP_INFO_sort		sk_PKCS7_RECINF_sort

/* Hack the names created with DECLARE_STACK_OF(ASN1_STRING_TABLE) */
#define sk_ASN1_STRING_TABLE_new		sk_ASN1_STRTAB_new
#define sk_ASN1_STRING_TABLE_new_null		sk_ASN1_STRTAB_new_null
#define sk_ASN1_STRING_TABLE_free		sk_ASN1_STRTAB_free
#define sk_ASN1_STRING_TABLE_num		sk_ASN1_STRTAB_num
#define sk_ASN1_STRING_TABLE_value		sk_ASN1_STRTAB_value
#define sk_ASN1_STRING_TABLE_set		sk_ASN1_STRTAB_set
#define sk_ASN1_STRING_TABLE_zero		sk_ASN1_STRTAB_zero
#define sk_ASN1_STRING_TABLE_push		sk_ASN1_STRTAB_push
#define sk_ASN1_STRING_TABLE_unshift		sk_ASN1_STRTAB_unshift
#define sk_ASN1_STRING_TABLE_find		sk_ASN1_STRTAB_find
#define sk_ASN1_STRING_TABLE_delete		sk_ASN1_STRTAB_delete
#define sk_ASN1_STRING_TABLE_delete_ptr		sk_ASN1_STRTAB_delete_ptr
#define sk_ASN1_STRING_TABLE_insert		sk_ASN1_STRTAB_insert
#define sk_ASN1_STRING_TABLE_set_cmp_func	sk_ASN1_STRTAB_set_cmp_func
#define sk_ASN1_STRING_TABLE_dup		sk_ASN1_STRTAB_dup
#define sk_ASN1_STRING_TABLE_pop_free		sk_ASN1_STRTAB_pop_free
#define sk_ASN1_STRING_TABLE_shift		sk_ASN1_STRTAB_shift
#define sk_ASN1_STRING_TABLE_pop		sk_ASN1_STRTAB_pop
#define sk_ASN1_STRING_TABLE_sort		sk_ASN1_STRTAB_sort

/* Hack the names created with DECLARE_STACK_OF(ACCESS_DESCRIPTION) */
#define sk_ACCESS_DESCRIPTION_new		sk_ACC_DESC_new
#define sk_ACCESS_DESCRIPTION_new_null		sk_ACC_DESC_new_null
#define sk_ACCESS_DESCRIPTION_free		sk_ACC_DESC_free
#define sk_ACCESS_DESCRIPTION_num		sk_ACC_DESC_num
#define sk_ACCESS_DESCRIPTION_value		sk_ACC_DESC_value
#define sk_ACCESS_DESCRIPTION_set		sk_ACC_DESC_set
#define sk_ACCESS_DESCRIPTION_zero		sk_ACC_DESC_zero
#define sk_ACCESS_DESCRIPTION_push		sk_ACC_DESC_push
#define sk_ACCESS_DESCRIPTION_unshift		sk_ACC_DESC_unshift
#define sk_ACCESS_DESCRIPTION_find		sk_ACC_DESC_find
#define sk_ACCESS_DESCRIPTION_delete		sk_ACC_DESC_delete
#define sk_ACCESS_DESCRIPTION_delete_ptr	sk_ACC_DESC_delete_ptr
#define sk_ACCESS_DESCRIPTION_insert		sk_ACC_DESC_insert
#define sk_ACCESS_DESCRIPTION_set_cmp_func	sk_ACC_DESC_set_cmp_func
#define sk_ACCESS_DESCRIPTION_dup		sk_ACC_DESC_dup
#define sk_ACCESS_DESCRIPTION_pop_free		sk_ACC_DESC_pop_free
#define sk_ACCESS_DESCRIPTION_shift		sk_ACC_DESC_shift
#define sk_ACCESS_DESCRIPTION_pop		sk_ACC_DESC_pop
#define sk_ACCESS_DESCRIPTION_sort		sk_ACC_DESC_sort

/* Hack the names created with DECLARE_STACK_OF(CRYPTO_EX_DATA_FUNCS) */
#define sk_CRYPTO_EX_DATA_FUNCS_new		sk_CRYPT_EX_DATFNS_new
#define sk_CRYPTO_EX_DATA_FUNCS_new_null	sk_CRYPT_EX_DATFNS_new_null
#define sk_CRYPTO_EX_DATA_FUNCS_free		sk_CRYPT_EX_DATFNS_free
#define sk_CRYPTO_EX_DATA_FUNCS_num		sk_CRYPT_EX_DATFNS_num
#define sk_CRYPTO_EX_DATA_FUNCS_value		sk_CRYPT_EX_DATFNS_value
#define sk_CRYPTO_EX_DATA_FUNCS_set		sk_CRYPT_EX_DATFNS_set
#define sk_CRYPTO_EX_DATA_FUNCS_zero		sk_CRYPT_EX_DATFNS_zero
#define sk_CRYPTO_EX_DATA_FUNCS_push		sk_CRYPT_EX_DATFNS_push
#define sk_CRYPTO_EX_DATA_FUNCS_unshift		sk_CRYPT_EX_DATFNS_unshift
#define sk_CRYPTO_EX_DATA_FUNCS_find		sk_CRYPT_EX_DATFNS_find
#define sk_CRYPTO_EX_DATA_FUNCS_delete		sk_CRYPT_EX_DATFNS_delete
#define sk_CRYPTO_EX_DATA_FUNCS_delete_ptr	sk_CRYPT_EX_DATFNS_delete_ptr
#define sk_CRYPTO_EX_DATA_FUNCS_insert		sk_CRYPT_EX_DATFNS_insert
#define sk_CRYPTO_EX_DATA_FUNCS_set_cmp_func	sk_CRYPT_EX_DATFNS_set_cmp_func
#define sk_CRYPTO_EX_DATA_FUNCS_dup		sk_CRYPT_EX_DATFNS_dup
#define sk_CRYPTO_EX_DATA_FUNCS_pop_free	sk_CRYPT_EX_DATFNS_pop_free
#define sk_CRYPTO_EX_DATA_FUNCS_shift		sk_CRYPT_EX_DATFNS_shift
#define sk_CRYPTO_EX_DATA_FUNCS_pop		sk_CRYPT_EX_DATFNS_pop
#define sk_CRYPTO_EX_DATA_FUNCS_sort		sk_CRYPT_EX_DATFNS_sort

/* Hack the names created with DECLARE_ASN1_SET_OF(PKCS7_SIGNER_INFO) */
#define i2d_ASN1_SET_OF_PKCS7_SIGNER_INFO	i2d_ASN1_SET_OF_PKCS7_SIGINF