From: job <job@openbsd.org>
Date: Tue, 13 Feb 2024 22:44:21 +0000 (+0000)
Subject: Add explicit ASN1_ITEM_EXP prototypes
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=d3d2687347abd275151238572878c7a990c798c0;p=openbsd

Add explicit ASN1_ITEM_EXP prototypes

In LibreSSL *_it are variables, in other implementations they might
be a function. This helps squash compiler warnings in -portable.

Related: https://github.com/openbsd/src/commit/65af98848fc7a42e34d470d10fc1db8e23f9db93

OK tb@
---

diff --git a/usr.sbin/rpki-client/aspa.c b/usr.sbin/rpki-client/aspa.c
index e857c3068e5..a0719889046 100644
--- a/usr.sbin/rpki-client/aspa.c
+++ b/usr.sbin/rpki-client/aspa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aspa.c,v 1.25 2024/02/05 19:23:58 job Exp $ */
+/*	$OpenBSD: aspa.c,v 1.26 2024/02/13 22:44:21 job Exp $ */
 /*
  * Copyright (c) 2022 Job Snijders <job@fastly.com>
  * Copyright (c) 2022 Theo Buehler <tb@openbsd.org>
@@ -46,6 +46,8 @@ extern ASN1_OBJECT	*aspa_oid;
  * Types and templates for ASPA eContent draft-ietf-sidrops-aspa-profile-15
  */
 
+ASN1_ITEM_EXP ASProviderAttestation_it;
+
 typedef struct {
 	ASN1_INTEGER		*version;
 	ASN1_INTEGER		*customerASID;
diff --git a/usr.sbin/rpki-client/mft.c b/usr.sbin/rpki-client/mft.c
index 0effb92a5c8..3784e61949e 100644
--- a/usr.sbin/rpki-client/mft.c
+++ b/usr.sbin/rpki-client/mft.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mft.c,v 1.106 2024/02/05 19:23:58 job Exp $ */
+/*	$OpenBSD: mft.c,v 1.107 2024/02/13 22:44:21 job Exp $ */
 /*
  * Copyright (c) 2022 Theo Buehler <tb@openbsd.org>
  * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
@@ -49,6 +49,9 @@ extern ASN1_OBJECT	*mft_oid;
  * Types and templates for the Manifest eContent, RFC 6486, section 4.2.
  */
 
+ASN1_ITEM_EXP FileAndHash_it;
+ASN1_ITEM_EXP Manifest_it;
+
 typedef struct {
 	ASN1_IA5STRING	*file;
 	ASN1_BIT_STRING	*hash;
diff --git a/usr.sbin/rpki-client/roa.c b/usr.sbin/rpki-client/roa.c
index 5728189cbc1..227b642f17d 100644
--- a/usr.sbin/rpki-client/roa.c
+++ b/usr.sbin/rpki-client/roa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: roa.c,v 1.73 2024/02/05 19:23:58 job Exp $ */
+/*	$OpenBSD: roa.c,v 1.74 2024/02/13 22:44:21 job Exp $ */
 /*
  * Copyright (c) 2022 Theo Buehler <tb@openbsd.org>
  * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
@@ -45,6 +45,10 @@ extern ASN1_OBJECT	*roa_oid;
  * Types and templates for the ROA eContent, RFC 6482, section 3.
  */
 
+ASN1_ITEM_EXP ROAIPAddress_it;
+ASN1_ITEM_EXP ROAIPAddressFamily_it;
+ASN1_ITEM_EXP RouteOriginAttestation_it;
+
 typedef struct {
 	ASN1_BIT_STRING		*address;
 	ASN1_INTEGER		*maxLength;
diff --git a/usr.sbin/rpki-client/rsc.c b/usr.sbin/rpki-client/rsc.c
index cb58f73795a..316ae57ba93 100644
--- a/usr.sbin/rpki-client/rsc.c
+++ b/usr.sbin/rpki-client/rsc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rsc.c,v 1.30 2024/02/05 19:23:58 job Exp $ */
+/*	$OpenBSD: rsc.c,v 1.31 2024/02/13 22:44:21 job Exp $ */
 /*
  * Copyright (c) 2022 Theo Buehler <tb@openbsd.org>
  * Copyright (c) 2022 Job Snijders <job@fastly.com>
@@ -45,6 +45,13 @@ extern ASN1_OBJECT	*rsc_oid;
  * Types and templates for RSC eContent - RFC 9323
  */
 
+ASN1_ITEM_EXP ConstrainedASIdentifiers_it;
+ASN1_ITEM_EXP ConstrainedIPAddressFamily_it;
+ASN1_ITEM_EXP ConstrainedIPAddrBlocks_it;
+ASN1_ITEM_EXP FileNameAndHash_it;
+ASN1_ITEM_EXP ResourceBlock_it;
+ASN1_ITEM_EXP RpkiSignedChecklist_it;
+
 typedef struct {
 	ASIdOrRanges		*asnum;
 } ConstrainedASIdentifiers;
diff --git a/usr.sbin/rpki-client/tak.c b/usr.sbin/rpki-client/tak.c
index b7ae61bbc5f..e786630a974 100644
--- a/usr.sbin/rpki-client/tak.c
+++ b/usr.sbin/rpki-client/tak.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tak.c,v 1.15 2024/02/13 21:18:55 job Exp $ */
+/*	$OpenBSD: tak.c,v 1.16 2024/02/13 22:44:21 job Exp $ */
 /*
  * Copyright (c) 2022 Job Snijders <job@fastly.com>
  * Copyright (c) 2022 Theo Buehler <tb@openbsd.org>
@@ -45,6 +45,9 @@ extern ASN1_OBJECT	*tak_oid;
  * ASN.1 templates for Trust Anchor Keys (draft-ietf-sidrops-signed-tal-12)
  */
 
+ASN1_ITEM_EXP TAKey_it;
+ASN1_ITEM_EXP TAK_it;
+
 DECLARE_STACK_OF(ASN1_IA5STRING);
 
 #ifndef DEFINE_STACK_OF