summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorbeck <>2023-04-26 19:02:25 +0000
committerbeck <>2023-04-26 19:02:25 +0000
commit269ae0df1399e8a722c283d380803eba537d81f0 (patch)
treecd97a0d9b16ba034287bf9e9ce9171b3e5d78752 /src
parent2cddbeb9146f5236aad7baccb59e3bdc4da45da7 (diff)
downloadopenbsd-269ae0df1399e8a722c283d380803eba537d81f0.tar.gz
openbsd-269ae0df1399e8a722c283d380803eba537d81f0.tar.bz2
openbsd-269ae0df1399e8a722c283d380803eba537d81f0.zip
Change OPENSSL_malloc|free|memset and friends to the normal versions.
ok tb@ jsing@
Diffstat (limited to 'src')
-rw-r--r--src/lib/libcrypto/x509/x509_policy.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/libcrypto/x509/x509_policy.c b/src/lib/libcrypto/x509/x509_policy.c
index e4b6ed6011..5a0053d7b4 100644
--- a/src/lib/libcrypto/x509/x509_policy.c
+++ b/src/lib/libcrypto/x509/x509_policy.c
@@ -103,17 +103,17 @@ static void x509_policy_node_free(X509_POLICY_NODE *node) {
103 if (node != NULL) { 103 if (node != NULL) {
104 ASN1_OBJECT_free(node->policy); 104 ASN1_OBJECT_free(node->policy);
105 sk_ASN1_OBJECT_pop_free(node->parent_policies, ASN1_OBJECT_free); 105 sk_ASN1_OBJECT_pop_free(node->parent_policies, ASN1_OBJECT_free);
106 OPENSSL_free(node); 106 free(node);
107 } 107 }
108} 108}
109 109
110static X509_POLICY_NODE *x509_policy_node_new(const ASN1_OBJECT *policy) { 110static X509_POLICY_NODE *x509_policy_node_new(const ASN1_OBJECT *policy) {
111 assert(!is_any_policy(policy)); 111 assert(!is_any_policy(policy));
112 X509_POLICY_NODE *node = OPENSSL_malloc(sizeof(X509_POLICY_NODE)); 112 X509_POLICY_NODE *node = malloc(sizeof(X509_POLICY_NODE));
113 if (node == NULL) { 113 if (node == NULL) {
114 return NULL; 114 return NULL;
115 } 115 }
116 OPENSSL_memset(node, 0, sizeof(X509_POLICY_NODE)); 116 memset(node, 0, sizeof(X509_POLICY_NODE));
117 node->policy = OBJ_dup(policy); 117 node->policy = OBJ_dup(policy);
118 node->parent_policies = sk_ASN1_OBJECT_new_null(); 118 node->parent_policies = sk_ASN1_OBJECT_new_null();
119 if (node->policy == NULL || node->parent_policies == NULL) { 119 if (node->policy == NULL || node->parent_policies == NULL) {
@@ -131,16 +131,16 @@ static int x509_policy_node_cmp(const X509_POLICY_NODE *const *a,
131static void x509_policy_level_free(X509_POLICY_LEVEL *level) { 131static void x509_policy_level_free(X509_POLICY_LEVEL *level) {
132 if (level != NULL) { 132 if (level != NULL) {
133 sk_X509_POLICY_NODE_pop_free(level->nodes, x509_policy_node_free); 133 sk_X509_POLICY_NODE_pop_free(level->nodes, x509_policy_node_free);
134 OPENSSL_free(level); 134 free(level);
135 } 135 }
136} 136}
137 137
138static X509_POLICY_LEVEL *x509_policy_level_new(void) { 138static X509_POLICY_LEVEL *x509_policy_level_new(void) {
139 X509_POLICY_LEVEL *level = OPENSSL_malloc(sizeof(X509_POLICY_LEVEL)); 139 X509_POLICY_LEVEL *level = malloc(sizeof(X509_POLICY_LEVEL));
140 if (level == NULL) { 140 if (level == NULL) {
141 return NULL; 141 return NULL;
142 } 142 }
143 OPENSSL_memset(level, 0, sizeof(X509_POLICY_LEVEL)); 143 memset(level, 0, sizeof(X509_POLICY_LEVEL));
144 level->nodes = sk_X509_POLICY_NODE_new(x509_policy_node_cmp); 144 level->nodes = sk_X509_POLICY_NODE_new(x509_policy_node_cmp);
145 if (level->nodes == NULL) { 145 if (level->nodes == NULL) {
146 x509_policy_level_free(level); 146 x509_policy_level_free(level);