From c4305e2ecb1706d9c567bc563a0e1edb0f3921ef Mon Sep 17 00:00:00 2001 From: beck Date: Wed, 26 Apr 2023 19:02:25 +0000 Subject: [PATCH] Change OPENSSL_malloc|free|memset and friends to the normal versions. ok tb@ jsing@ --- lib/libcrypto/x509/x509_policy.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/libcrypto/x509/x509_policy.c b/lib/libcrypto/x509/x509_policy.c index e4b6ed6011d..5a0053d7b40 100644 --- a/lib/libcrypto/x509/x509_policy.c +++ b/lib/libcrypto/x509/x509_policy.c @@ -103,17 +103,17 @@ static void x509_policy_node_free(X509_POLICY_NODE *node) { if (node != NULL) { ASN1_OBJECT_free(node->policy); sk_ASN1_OBJECT_pop_free(node->parent_policies, ASN1_OBJECT_free); - OPENSSL_free(node); + free(node); } } static X509_POLICY_NODE *x509_policy_node_new(const ASN1_OBJECT *policy) { assert(!is_any_policy(policy)); - X509_POLICY_NODE *node = OPENSSL_malloc(sizeof(X509_POLICY_NODE)); + X509_POLICY_NODE *node = malloc(sizeof(X509_POLICY_NODE)); if (node == NULL) { return NULL; } - OPENSSL_memset(node, 0, sizeof(X509_POLICY_NODE)); + memset(node, 0, sizeof(X509_POLICY_NODE)); node->policy = OBJ_dup(policy); node->parent_policies = sk_ASN1_OBJECT_new_null(); if (node->policy == NULL || node->parent_policies == NULL) { @@ -131,16 +131,16 @@ static int x509_policy_node_cmp(const X509_POLICY_NODE *const *a, static void x509_policy_level_free(X509_POLICY_LEVEL *level) { if (level != NULL) { sk_X509_POLICY_NODE_pop_free(level->nodes, x509_policy_node_free); - OPENSSL_free(level); + free(level); } } static X509_POLICY_LEVEL *x509_policy_level_new(void) { - X509_POLICY_LEVEL *level = OPENSSL_malloc(sizeof(X509_POLICY_LEVEL)); + X509_POLICY_LEVEL *level = malloc(sizeof(X509_POLICY_LEVEL)); if (level == NULL) { return NULL; } - OPENSSL_memset(level, 0, sizeof(X509_POLICY_LEVEL)); + memset(level, 0, sizeof(X509_POLICY_LEVEL)); level->nodes = sk_X509_POLICY_NODE_new(x509_policy_node_cmp); if (level->nodes == NULL) { x509_policy_level_free(level); -- 2.20.1