Beautification and a few entries added.

VMS/vms_idhacks.h

@@ -122,6 +122,27 @@
 #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_ASN1_SET_OF(PKCS7_SIGNER_INFO) */
 #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
@@ -130,6 +151,10 @@
 #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
 
+/* 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
 #define PEM_write_NETSCAPE_CERT_SEQUENCE	PEM_write_NS_CERT_SEQUENCE
@@ -142,7 +167,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 */