1 files changed, 113 insertions, 41 deletions
diff --git a/src/lib/libssl/src/VMS/vms_idhacks.h b/src/lib/libssl/src/VMS/vms_idhacks.h
index 8cf9e9c61f..c2010c91e4 100644
--- a/src/lib/libssl/src/VMS/vms_idhacks.h
+++ b/src/lib/libssl/src/VMS/vms_idhacks.h
@@ -57,55 +57,124 @@
 #ifdef VMS
+/* 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                sk_PKCS7_SIGINF_new
-#define sk_PKCS7_SIGNER_INFO_new_null   sk_PKCS7_SIGINF_new_null
+#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_free               sk_PKCS7_SIGINF_free
-#define sk_PKCS7_SIGNER_INFO_num        sk_PKCS7_SIGINF_num
+#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_value              sk_PKCS7_SIGINF_value
-#define sk_PKCS7_SIGNER_INFO_set        sk_PKCS7_SIGINF_set
+#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_zero               sk_PKCS7_SIGINF_zero
-#define sk_PKCS7_SIGNER_INFO_push       sk_PKCS7_SIGINF_push
+#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_unshift            sk_PKCS7_SIGINF_unshift
-#define sk_PKCS7_SIGNER_INFO_find       sk_PKCS7_SIGINF_find
+#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             sk_PKCS7_SIGINF_delete
-#define sk_PKCS7_SIGNER_INFO_delete_ptr sk_PKCS7_SIGINF_delete_ptr
+#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_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_dup                sk_PKCS7_SIGINF_dup
-#define sk_PKCS7_SIGNER_INFO_pop_free   sk_PKCS7_SIGINF_pop_free
+#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_shift              sk_PKCS7_SIGINF_shift
-#define sk_PKCS7_SIGNER_INFO_pop        sk_PKCS7_SIGINF_pop
+#define sk_PKCS7_SIGNER_INFO_pop                sk_PKCS7_SIGINF_pop
-#define sk_PKCS7_SIGNER_INFO_sort       sk_PKCS7_SIGINF_sort
+#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                 sk_PKCS7_RECINF_new
-#define sk_PKCS7_RECIP_INFO_new_null    sk_PKCS7_RECINF_new_null
+#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_free                sk_PKCS7_RECINF_free
-#define sk_PKCS7_RECIP_INFO_num         sk_PKCS7_RECINF_num
+#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_value               sk_PKCS7_RECINF_value
-#define sk_PKCS7_RECIP_INFO_set         sk_PKCS7_RECINF_set
+#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_zero                sk_PKCS7_RECINF_zero
-#define sk_PKCS7_RECIP_INFO_push        sk_PKCS7_RECINF_push
+#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_unshift             sk_PKCS7_RECINF_unshift
-#define sk_PKCS7_RECIP_INFO_find        sk_PKCS7_RECINF_find
+#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              sk_PKCS7_RECINF_delete
-#define sk_PKCS7_RECIP_INFO_delete_ptr  sk_PKCS7_RECINF_delete_ptr
+#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_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_dup                 sk_PKCS7_RECINF_dup
-#define sk_PKCS7_RECIP_INFO_pop_free    sk_PKCS7_RECINF_pop_free
+#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_shift               sk_PKCS7_RECINF_shift
-#define sk_PKCS7_RECIP_INFO_pop         sk_PKCS7_RECINF_pop
+#define sk_PKCS7_RECIP_INFO_pop                 sk_PKCS7_RECINF_pop
-#define sk_PKCS7_RECIP_INFO_sort        sk_PKCS7_RECINF_sort
+#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
+#define i2d_ASN1_SET_OF_PKCS7_SIGNER_INFO       i2d_ASN1_SET_OF_PKCS7_SIGINF
-#define d2i_ASN1_SET_OF_PKCS7_SIGNER_INFO d2i_ASN1_SET_OF_PKCS7_SIGINF
+#define d2i_ASN1_SET_OF_PKCS7_SIGNER_INFO       d2i_ASN1_SET_OF_PKCS7_SIGINF
 /* Hack the names created with DECLARE_ASN1_SET_OF(PKCS7_RECIP_INFO) */
-#define i2d_ASN1_SET_OF_PKCS7_RECIP_INFO i2d_ASN1_SET_OF_PKCS7_RECGINF
+#define i2d_ASN1_SET_OF_PKCS7_RECIP_INFO        i2d_ASN1_SET_OF_PKCS7_RECGINF
-#define d2i_ASN1_SET_OF_PKCS7_RECIP_INFO d2i_ASN1_SET_OF_PKCS7_RECGINF
+#define d2i_ASN1_SET_OF_PKCS7_RECIP_INFO        d2i_ASN1_SET_OF_PKCS7_RECGINF
+/* Hack the names created with DECLARE_ASN1_SET_OF(ACCESS_DESCRIPTION) */
+#define i2d_ASN1_SET_OF_ACCESS_DESCRIPTION      i2d_ASN1_SET_OF_ACC_DESC
+#define d2i_ASN1_SET_OF_ACCESS_DESCRIPTION      d2i_ASN1_SET_OF_ACC_DESC
 /* Hack the names created with DECLARE_PEM_rw(NETSCAPE_CERT_SEQUENCE) */
 #define PEM_read_NETSCAPE_CERT_SEQUENCE         PEM_read_NS_CERT_SEQUENCE
@@ -119,7 +188,10 @@
 #define PEM_write_PKCS8_PRIV_KEY_INFO           PEM_write_P8_PRIV_KEY_INFO
 #define PEM_read_bio_PKCS8_PRIV_KEY_INFO        PEM_read_bio_P8_PRIV_KEY_INFO
 #define PEM_write_bio_PKCS8_PRIV_KEY_INFO       PEM_write_bio_P8_PRIV_KEY_INFO
-#define PEM_write_cb_bio_PKCS8_PRIV_KEY_INFO    PEM_write_cb_bio_P8_PRIV_KEY_INFO
+#define PEM_write_cb_bio_PKCS8_PRIV_KEY_INFO    PEM_wrt_cb_bio_P8_PRIV_KEY_INFO
+/* Hack other PEM names */
+#define PEM_write_bio_PKCS8PrivateKey_nid       PEM_write_bio_PKCS8PrivKey_nid
 #endif /* defined VMS */

diff --git a/src/lib/libssl/src/VMS/vms_idhacks.h b/src/lib/libssl/src/VMS/vms_idhacks.h index 8cf9e9c61f..c2010c91e4 100644 --- a/src/lib/libssl/src/VMS/vms_idhacks.h +++ b/src/lib/libssl/src/VMS/vms_idhacks.h
@@ -57,55 +57,124 @@
57		57
58	#ifdef VMS	58	#ifdef VMS
59		59
		60	/* Hack a long name in crypto/asn1/a_mbstr.c */
		61	#define ASN1_STRING_set_default_mask_asc ASN1_STRING_set_def_mask_asc
60	/* Hack the names created with DECLARE_STACK_OF(PKCS7_SIGNER_INFO) */	62	/* Hack the names created with DECLARE_STACK_OF(PKCS7_SIGNER_INFO) */
61	#define sk_PKCS7_SIGNER_INFO_new sk_PKCS7_SIGINF_new	63	#define sk_PKCS7_SIGNER_INFO_new sk_PKCS7_SIGINF_new
62	#define sk_PKCS7_SIGNER_INFO_new_null sk_PKCS7_SIGINF_new_null	64	#define sk_PKCS7_SIGNER_INFO_new_null sk_PKCS7_SIGINF_new_null
63	#define sk_PKCS7_SIGNER_INFO_free sk_PKCS7_SIGINF_free	65	#define sk_PKCS7_SIGNER_INFO_free sk_PKCS7_SIGINF_free
64	#define sk_PKCS7_SIGNER_INFO_num sk_PKCS7_SIGINF_num	66	#define sk_PKCS7_SIGNER_INFO_num sk_PKCS7_SIGINF_num
65	#define sk_PKCS7_SIGNER_INFO_value sk_PKCS7_SIGINF_value	67	#define sk_PKCS7_SIGNER_INFO_value sk_PKCS7_SIGINF_value
66	#define sk_PKCS7_SIGNER_INFO_set sk_PKCS7_SIGINF_set	68	#define sk_PKCS7_SIGNER_INFO_set sk_PKCS7_SIGINF_set
67	#define sk_PKCS7_SIGNER_INFO_zero sk_PKCS7_SIGINF_zero	69	#define sk_PKCS7_SIGNER_INFO_zero sk_PKCS7_SIGINF_zero
68	#define sk_PKCS7_SIGNER_INFO_push sk_PKCS7_SIGINF_push	70	#define sk_PKCS7_SIGNER_INFO_push sk_PKCS7_SIGINF_push
69	#define sk_PKCS7_SIGNER_INFO_unshift sk_PKCS7_SIGINF_unshift	71	#define sk_PKCS7_SIGNER_INFO_unshift sk_PKCS7_SIGINF_unshift
70	#define sk_PKCS7_SIGNER_INFO_find sk_PKCS7_SIGINF_find	72	#define sk_PKCS7_SIGNER_INFO_find sk_PKCS7_SIGINF_find
71	#define sk_PKCS7_SIGNER_INFO_delete sk_PKCS7_SIGINF_delete	73	#define sk_PKCS7_SIGNER_INFO_delete sk_PKCS7_SIGINF_delete
72	#define sk_PKCS7_SIGNER_INFO_delete_ptr sk_PKCS7_SIGINF_delete_ptr	74	#define sk_PKCS7_SIGNER_INFO_delete_ptr sk_PKCS7_SIGINF_delete_ptr
73	#define sk_PKCS7_SIGNER_INFO_insert sk_PKCS7_SIGINF_insert	75	#define sk_PKCS7_SIGNER_INFO_insert sk_PKCS7_SIGINF_insert
74	#define sk_PKCS7_SIGNER_INFO_set_cmp_func sk_PKCS7_SIGINF_set_cmp_func	76	#define sk_PKCS7_SIGNER_INFO_set_cmp_func sk_PKCS7_SIGINF_set_cmp_func
75	#define sk_PKCS7_SIGNER_INFO_dup sk_PKCS7_SIGINF_dup	77	#define sk_PKCS7_SIGNER_INFO_dup sk_PKCS7_SIGINF_dup
76	#define sk_PKCS7_SIGNER_INFO_pop_free sk_PKCS7_SIGINF_pop_free	78	#define sk_PKCS7_SIGNER_INFO_pop_free sk_PKCS7_SIGINF_pop_free
77	#define sk_PKCS7_SIGNER_INFO_shift sk_PKCS7_SIGINF_shift	79	#define sk_PKCS7_SIGNER_INFO_shift sk_PKCS7_SIGINF_shift
78	#define sk_PKCS7_SIGNER_INFO_pop sk_PKCS7_SIGINF_pop	80	#define sk_PKCS7_SIGNER_INFO_pop sk_PKCS7_SIGINF_pop
79	#define sk_PKCS7_SIGNER_INFO_sort sk_PKCS7_SIGINF_sort	81	#define sk_PKCS7_SIGNER_INFO_sort sk_PKCS7_SIGINF_sort
80		82
81	/* Hack the names created with DECLARE_STACK_OF(PKCS7_RECIP_INFO) */	83	/* Hack the names created with DECLARE_STACK_OF(PKCS7_RECIP_INFO) */
82	#define sk_PKCS7_RECIP_INFO_new sk_PKCS7_RECINF_new	84	#define sk_PKCS7_RECIP_INFO_new sk_PKCS7_RECINF_new
83	#define sk_PKCS7_RECIP_INFO_new_null sk_PKCS7_RECINF_new_null	85	#define sk_PKCS7_RECIP_INFO_new_null sk_PKCS7_RECINF_new_null
84	#define sk_PKCS7_RECIP_INFO_free sk_PKCS7_RECINF_free	86	#define sk_PKCS7_RECIP_INFO_free sk_PKCS7_RECINF_free
85	#define sk_PKCS7_RECIP_INFO_num sk_PKCS7_RECINF_num	87	#define sk_PKCS7_RECIP_INFO_num sk_PKCS7_RECINF_num
86	#define sk_PKCS7_RECIP_INFO_value sk_PKCS7_RECINF_value	88	#define sk_PKCS7_RECIP_INFO_value sk_PKCS7_RECINF_value
87	#define sk_PKCS7_RECIP_INFO_set sk_PKCS7_RECINF_set	89	#define sk_PKCS7_RECIP_INFO_set sk_PKCS7_RECINF_set
88	#define sk_PKCS7_RECIP_INFO_zero sk_PKCS7_RECINF_zero	90	#define sk_PKCS7_RECIP_INFO_zero sk_PKCS7_RECINF_zero
89	#define sk_PKCS7_RECIP_INFO_push sk_PKCS7_RECINF_push	91	#define sk_PKCS7_RECIP_INFO_push sk_PKCS7_RECINF_push
90	#define sk_PKCS7_RECIP_INFO_unshift sk_PKCS7_RECINF_unshift	92	#define sk_PKCS7_RECIP_INFO_unshift sk_PKCS7_RECINF_unshift
91	#define sk_PKCS7_RECIP_INFO_find sk_PKCS7_RECINF_find	93	#define sk_PKCS7_RECIP_INFO_find sk_PKCS7_RECINF_find
92	#define sk_PKCS7_RECIP_INFO_delete sk_PKCS7_RECINF_delete	94	#define sk_PKCS7_RECIP_INFO_delete sk_PKCS7_RECINF_delete
93	#define sk_PKCS7_RECIP_INFO_delete_ptr sk_PKCS7_RECINF_delete_ptr	95	#define sk_PKCS7_RECIP_INFO_delete_ptr sk_PKCS7_RECINF_delete_ptr
94	#define sk_PKCS7_RECIP_INFO_insert sk_PKCS7_RECINF_insert	96	#define sk_PKCS7_RECIP_INFO_insert sk_PKCS7_RECINF_insert
95	#define sk_PKCS7_RECIP_INFO_set_cmp_func sk_PKCS7_RECINF_set_cmp_func	97	#define sk_PKCS7_RECIP_INFO_set_cmp_func sk_PKCS7_RECINF_set_cmp_func
96	#define sk_PKCS7_RECIP_INFO_dup sk_PKCS7_RECINF_dup	98	#define sk_PKCS7_RECIP_INFO_dup sk_PKCS7_RECINF_dup
97	#define sk_PKCS7_RECIP_INFO_pop_free sk_PKCS7_RECINF_pop_free	99	#define sk_PKCS7_RECIP_INFO_pop_free sk_PKCS7_RECINF_pop_free
98	#define sk_PKCS7_RECIP_INFO_shift sk_PKCS7_RECINF_shift	100	#define sk_PKCS7_RECIP_INFO_shift sk_PKCS7_RECINF_shift
99	#define sk_PKCS7_RECIP_INFO_pop sk_PKCS7_RECINF_pop	101	#define sk_PKCS7_RECIP_INFO_pop sk_PKCS7_RECINF_pop
100	#define sk_PKCS7_RECIP_INFO_sort sk_PKCS7_RECINF_sort	102	#define sk_PKCS7_RECIP_INFO_sort sk_PKCS7_RECINF_sort
		103
		104	/* Hack the names created with DECLARE_STACK_OF(ASN1_STRING_TABLE) */
		105	#define sk_ASN1_STRING_TABLE_new sk_ASN1_STRTAB_new
		106	#define sk_ASN1_STRING_TABLE_new_null sk_ASN1_STRTAB_new_null
		107	#define sk_ASN1_STRING_TABLE_free sk_ASN1_STRTAB_free
		108	#define sk_ASN1_STRING_TABLE_num sk_ASN1_STRTAB_num
		109	#define sk_ASN1_STRING_TABLE_value sk_ASN1_STRTAB_value
		110	#define sk_ASN1_STRING_TABLE_set sk_ASN1_STRTAB_set
		111	#define sk_ASN1_STRING_TABLE_zero sk_ASN1_STRTAB_zero
		112	#define sk_ASN1_STRING_TABLE_push sk_ASN1_STRTAB_push
		113	#define sk_ASN1_STRING_TABLE_unshift sk_ASN1_STRTAB_unshift
		114	#define sk_ASN1_STRING_TABLE_find sk_ASN1_STRTAB_find
		115	#define sk_ASN1_STRING_TABLE_delete sk_ASN1_STRTAB_delete
		116	#define sk_ASN1_STRING_TABLE_delete_ptr sk_ASN1_STRTAB_delete_ptr
		117	#define sk_ASN1_STRING_TABLE_insert sk_ASN1_STRTAB_insert
		118	#define sk_ASN1_STRING_TABLE_set_cmp_func sk_ASN1_STRTAB_set_cmp_func
		119	#define sk_ASN1_STRING_TABLE_dup sk_ASN1_STRTAB_dup
		120	#define sk_ASN1_STRING_TABLE_pop_free sk_ASN1_STRTAB_pop_free
		121	#define sk_ASN1_STRING_TABLE_shift sk_ASN1_STRTAB_shift
		122	#define sk_ASN1_STRING_TABLE_pop sk_ASN1_STRTAB_pop
		123	#define sk_ASN1_STRING_TABLE_sort sk_ASN1_STRTAB_sort
		124
		125	/* Hack the names created with DECLARE_STACK_OF(ACCESS_DESCRIPTION) */
		126	#define sk_ACCESS_DESCRIPTION_new sk_ACC_DESC_new
		127	#define sk_ACCESS_DESCRIPTION_new_null sk_ACC_DESC_new_null
		128	#define sk_ACCESS_DESCRIPTION_free sk_ACC_DESC_free
		129	#define sk_ACCESS_DESCRIPTION_num sk_ACC_DESC_num
		130	#define sk_ACCESS_DESCRIPTION_value sk_ACC_DESC_value
		131	#define sk_ACCESS_DESCRIPTION_set sk_ACC_DESC_set
		132	#define sk_ACCESS_DESCRIPTION_zero sk_ACC_DESC_zero
		133	#define sk_ACCESS_DESCRIPTION_push sk_ACC_DESC_push
		134	#define sk_ACCESS_DESCRIPTION_unshift sk_ACC_DESC_unshift
		135	#define sk_ACCESS_DESCRIPTION_find sk_ACC_DESC_find
		136	#define sk_ACCESS_DESCRIPTION_delete sk_ACC_DESC_delete
		137	#define sk_ACCESS_DESCRIPTION_delete_ptr sk_ACC_DESC_delete_ptr
		138	#define sk_ACCESS_DESCRIPTION_insert sk_ACC_DESC_insert
		139	#define sk_ACCESS_DESCRIPTION_set_cmp_func sk_ACC_DESC_set_cmp_func
		140	#define sk_ACCESS_DESCRIPTION_dup sk_ACC_DESC_dup
		141	#define sk_ACCESS_DESCRIPTION_pop_free sk_ACC_DESC_pop_free
		142	#define sk_ACCESS_DESCRIPTION_shift sk_ACC_DESC_shift
		143	#define sk_ACCESS_DESCRIPTION_pop sk_ACC_DESC_pop
		144	#define sk_ACCESS_DESCRIPTION_sort sk_ACC_DESC_sort
		145
		146	/* Hack the names created with DECLARE_STACK_OF(CRYPTO_EX_DATA_FUNCS) */
		147	#define sk_CRYPTO_EX_DATA_FUNCS_new sk_CRYPT_EX_DATFNS_new
		148	#define sk_CRYPTO_EX_DATA_FUNCS_new_null sk_CRYPT_EX_DATFNS_new_null
		149	#define sk_CRYPTO_EX_DATA_FUNCS_free sk_CRYPT_EX_DATFNS_free
		150	#define sk_CRYPTO_EX_DATA_FUNCS_num sk_CRYPT_EX_DATFNS_num
		151	#define sk_CRYPTO_EX_DATA_FUNCS_value sk_CRYPT_EX_DATFNS_value
		152	#define sk_CRYPTO_EX_DATA_FUNCS_set sk_CRYPT_EX_DATFNS_set
		153	#define sk_CRYPTO_EX_DATA_FUNCS_zero sk_CRYPT_EX_DATFNS_zero
		154	#define sk_CRYPTO_EX_DATA_FUNCS_push sk_CRYPT_EX_DATFNS_push
		155	#define sk_CRYPTO_EX_DATA_FUNCS_unshift sk_CRYPT_EX_DATFNS_unshift
		156	#define sk_CRYPTO_EX_DATA_FUNCS_find sk_CRYPT_EX_DATFNS_find
		157	#define sk_CRYPTO_EX_DATA_FUNCS_delete sk_CRYPT_EX_DATFNS_delete
		158	#define sk_CRYPTO_EX_DATA_FUNCS_delete_ptr sk_CRYPT_EX_DATFNS_delete_ptr
		159	#define sk_CRYPTO_EX_DATA_FUNCS_insert sk_CRYPT_EX_DATFNS_insert
		160	#define sk_CRYPTO_EX_DATA_FUNCS_set_cmp_func sk_CRYPT_EX_DATFNS_set_cmp_func
		161	#define sk_CRYPTO_EX_DATA_FUNCS_dup sk_CRYPT_EX_DATFNS_dup
		162	#define sk_CRYPTO_EX_DATA_FUNCS_pop_free sk_CRYPT_EX_DATFNS_pop_free
		163	#define sk_CRYPTO_EX_DATA_FUNCS_shift sk_CRYPT_EX_DATFNS_shift
		164	#define sk_CRYPTO_EX_DATA_FUNCS_pop sk_CRYPT_EX_DATFNS_pop
		165	#define sk_CRYPTO_EX_DATA_FUNCS_sort sk_CRYPT_EX_DATFNS_sort
101		166
102	/* Hack the names created with DECLARE_ASN1_SET_OF(PKCS7_SIGNER_INFO) */	167	/* Hack the names created with DECLARE_ASN1_SET_OF(PKCS7_SIGNER_INFO) */
103	#define i2d_ASN1_SET_OF_PKCS7_SIGNER_INFO i2d_ASN1_SET_OF_PKCS7_SIGINF	168	#define i2d_ASN1_SET_OF_PKCS7_SIGNER_INFO i2d_ASN1_SET_OF_PKCS7_SIGINF
104	#define d2i_ASN1_SET_OF_PKCS7_SIGNER_INFO d2i_ASN1_SET_OF_PKCS7_SIGINF	169	#define d2i_ASN1_SET_OF_PKCS7_SIGNER_INFO d2i_ASN1_SET_OF_PKCS7_SIGINF
105		170
106	/* Hack the names created with DECLARE_ASN1_SET_OF(PKCS7_RECIP_INFO) */	171	/* Hack the names created with DECLARE_ASN1_SET_OF(PKCS7_RECIP_INFO) */
107	#define i2d_ASN1_SET_OF_PKCS7_RECIP_INFO i2d_ASN1_SET_OF_PKCS7_RECGINF	172	#define i2d_ASN1_SET_OF_PKCS7_RECIP_INFO i2d_ASN1_SET_OF_PKCS7_RECGINF
108	#define d2i_ASN1_SET_OF_PKCS7_RECIP_INFO d2i_ASN1_SET_OF_PKCS7_RECGINF	173	#define d2i_ASN1_SET_OF_PKCS7_RECIP_INFO d2i_ASN1_SET_OF_PKCS7_RECGINF
		174
		175	/* Hack the names created with DECLARE_ASN1_SET_OF(ACCESS_DESCRIPTION) */
		176	#define i2d_ASN1_SET_OF_ACCESS_DESCRIPTION i2d_ASN1_SET_OF_ACC_DESC
		177	#define d2i_ASN1_SET_OF_ACCESS_DESCRIPTION d2i_ASN1_SET_OF_ACC_DESC
109		178
110	/* Hack the names created with DECLARE_PEM_rw(NETSCAPE_CERT_SEQUENCE) */	179	/* Hack the names created with DECLARE_PEM_rw(NETSCAPE_CERT_SEQUENCE) */
111	#define PEM_read_NETSCAPE_CERT_SEQUENCE PEM_read_NS_CERT_SEQUENCE	180	#define PEM_read_NETSCAPE_CERT_SEQUENCE PEM_read_NS_CERT_SEQUENCE
@@ -119,7 +188,10 @@
119	#define PEM_write_PKCS8_PRIV_KEY_INFO PEM_write_P8_PRIV_KEY_INFO	188	#define PEM_write_PKCS8_PRIV_KEY_INFO PEM_write_P8_PRIV_KEY_INFO
120	#define PEM_read_bio_PKCS8_PRIV_KEY_INFO PEM_read_bio_P8_PRIV_KEY_INFO	189	#define PEM_read_bio_PKCS8_PRIV_KEY_INFO PEM_read_bio_P8_PRIV_KEY_INFO
121	#define PEM_write_bio_PKCS8_PRIV_KEY_INFO PEM_write_bio_P8_PRIV_KEY_INFO	190	#define PEM_write_bio_PKCS8_PRIV_KEY_INFO PEM_write_bio_P8_PRIV_KEY_INFO
122	#define PEM_write_cb_bio_PKCS8_PRIV_KEY_INFO PEM_write_cb_bio_P8_PRIV_KEY_INFO	191	#define PEM_write_cb_bio_PKCS8_PRIV_KEY_INFO PEM_wrt_cb_bio_P8_PRIV_KEY_INFO
		192
		193	/* Hack other PEM names */
		194	#define PEM_write_bio_PKCS8PrivateKey_nid PEM_write_bio_PKCS8PrivKey_nid
123		195
124	#endif /* defined VMS */	196	#endif /* defined VMS */
125		197