Make sure not to read beyond end of buffer

[oweals/openssl.git] / crypto / symhacks.h

diff --git a/crypto/symhacks.h b/crypto/symhacks.h
index 40237178d96b10c9073c572ca5c1f695059ee529..64528ad5c2ef7f0f0d57a24bee4f77c34379ec4c 100644 (file)
--- a/crypto/symhacks.h
+++ b/crypto/symhacks.h
@@ -131,6 +131,8 @@
 #define X509_policy_tree_get0_user_policies    X509_pcy_tree_get0_usr_policies
 #undef X509_policy_node_get0_qualifiers
 #define X509_policy_node_get0_qualifiers       X509_pcy_node_get0_qualifiers
+#undef X509_STORE_CTX_get_explicit_policy
+#define X509_STORE_CTX_get_explicit_policy     X509_STORE_CTX_get_expl_policy
 
 /* Hack some long CRYPTO names */
 #undef CRYPTO_set_dynlock_destroy_callback
@@ -340,6 +342,20 @@
 #undef STORE_method_get_unlock_store_function
 #define STORE_method_get_unlock_store_function STORE_meth_get_unlock_store_fn
 
+/* Hack some long CMS names */
+#undef CMS_RecipientInfo_ktri_get0_algs
+#define CMS_RecipientInfo_ktri_get0_algs       CMS_RecipInfo_ktri_get0_algs
+#undef CMS_RecipientInfo_ktri_get0_signer_id
+#define CMS_RecipientInfo_ktri_get0_signer_id  CMS_RecipInfo_ktri_get0_sigr_id
+#undef CMS_OtherRevocationInfoFormat_it
+#define CMS_OtherRevocationInfoFormat_it       CMS_OtherRevocInfoFormat_it
+#undef CMS_KeyAgreeRecipientIdentifier_it
+#define CMS_KeyAgreeRecipientIdentifier_it     CMS_KeyAgreeRecipIdentifier_it
+#undef CMS_OriginatorIdentifierOrKey_it
+#define CMS_OriginatorIdentifierOrKey_it       CMS_OriginatorIdOrKey_it
+#undef cms_SignerIdentifier_get0_signer_id
+#define cms_SignerIdentifier_get0_signer_id    cms_SignerId_get0_signer_id
+
 #endif /* defined OPENSSL_SYS_VMS */
 
 
@@ -379,3 +395,6 @@
 
 
 #endif /* ! defined HEADER_VMS_IDHACKS_H */
+/* This one clashes with CMS_data_create */
+#undef cms_Data_create
+#define cms_Data_create                                priv_cms_Data_create