From: Alberto Leiva Popper <ydahhrk@gmail.com>
Date: Fri, 7 Jul 2023 16:15:06 +0000 (-0600)
Subject: Move policy initialization to resources constructor
X-Git-Tag: 1.6.0~72^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=095ed703059a4bd7b6ded0948a8208ab75956465;p=thirdparty%2FFORT-validator.git

Move policy initialization to resources constructor

Yields cleaner resources initialization code.

Part of a series of patches meant to manually rebase the issue58-proper
branch.
---

diff --git a/src/asn1/signed_data.c b/src/asn1/signed_data.c
index 7d27dff9..535b51d6 100644
--- a/src/asn1/signed_data.c
+++ b/src/asn1/signed_data.c
@@ -27,10 +27,7 @@ signed_object_args_init(struct signed_object_args *args,
     STACK_OF(X509_CRL) *crls,
     bool force_inherit)
 {
-	args->res = resources_create(force_inherit);
-	if (args->res == NULL)
-		enomem_panic();
-
+	args->res = resources_create(RPKI_POLICY_RFC6484, force_inherit);
 	args->uri = uri;
 	args->crls = crls;
 	memset(&args->refs, 0, sizeof(args->refs));
diff --git a/src/cert_stack.c b/src/cert_stack.c
index f7a2520f..492414df 100644
--- a/src/cert_stack.c
+++ b/src/cert_stack.c
@@ -248,11 +248,8 @@ init_resources(X509 *x509, enum rpki_policy policy, enum cert_type type,
 	struct resources *result;
 	int error;
 
-	result = resources_create(false);
-	if (result == NULL)
-		enomem_panic();
+	result = resources_create(policy, false);
 
-	resources_set_policy(result, policy);
 	error = certificate_get_resources(x509, result, type);
 	if (error)
 		goto fail;
diff --git a/src/resource.c b/src/resource.c
index df8d4a06..0be670af 100644
--- a/src/resource.c
+++ b/src/resource.c
@@ -31,7 +31,7 @@ struct resources {
 };
 
 struct resources *
-resources_create(bool force_inherit)
+resources_create(enum rpki_policy policy, bool force_inherit)
 {
 	struct resources *result;
 
@@ -40,7 +40,7 @@ resources_create(bool force_inherit)
 	result->ip4s = NULL;
 	result->ip6s = NULL;
 	result->asns = NULL;
-	result->policy = RPKI_POLICY_RFC6484;
+	result->policy = policy;
 	result->force_inherit = force_inherit;
 
 	return result;
diff --git a/src/resource.h b/src/resource.h
index 23055fd2..e18bed10 100644
--- a/src/resource.h
+++ b/src/resource.h
@@ -24,7 +24,7 @@ int get_addr_family(OCTET_STRING_t *);
 
 struct resources;
 
-struct resources *resources_create(bool);
+struct resources *resources_create(enum rpki_policy, bool);
 void resources_destroy(struct resources *);
 
 int resources_add_ip(struct resources *, struct IPAddressFamily *);