From: Alberto Leiva Popper Date: Thu, 15 Aug 2024 23:48:25 +0000 (-0600) Subject: Review of #includes X-Git-Tag: 1.6.3~1 X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=b61de098128350f95036b6c293b73d27c91bc293;p=thirdparty%2FFORT-validator.git Review of #includes Now featuring local includes too. --- diff --git a/src/algorithm.h b/src/algorithm.h index 322e09f9..d028657f 100644 --- a/src/algorithm.h +++ b/src/algorithm.h @@ -4,7 +4,6 @@ #include #include "asn1/asn1c/AlgorithmIdentifier.h" -#include "asn1/asn1c/OBJECT_IDENTIFIER.h" /** * This file is an implementation of RFC 7935 (previously 6485) plus RFC 8608 diff --git a/src/asn1/asn1c/ANY.h b/src/asn1/asn1c/ANY.h index 462ddb75..580e5a8a 100644 --- a/src/asn1/asn1c/ANY.h +++ b/src/asn1/asn1c/ANY.h @@ -6,7 +6,6 @@ #define ASN_TYPE_ANY_H #include "asn1/asn1c/OCTET_STRING.h" -#include "asn1/asn1c/constraints.h" typedef struct ANY { uint8_t *buf; /* BER-encoded ANY contents */ diff --git a/src/asn1/asn1c/ASId.h b/src/asn1/asn1c/ASId.h index 1355d95f..5ef5b512 100644 --- a/src/asn1/asn1c/ASId.h +++ b/src/asn1/asn1c/ASId.h @@ -9,7 +9,6 @@ #define _ASId_H_ #include "asn1/asn1c/INTEGER.h" -#include "asn1/asn1c/constr_TYPE.h" /* ASId */ typedef INTEGER_t ASId_t; diff --git a/src/asn1/asn1c/ASIdOrRange.h b/src/asn1/asn1c/ASIdOrRange.h index 2f47e307..f33c5338 100644 --- a/src/asn1/asn1c/ASIdOrRange.h +++ b/src/asn1/asn1c/ASIdOrRange.h @@ -8,10 +8,8 @@ #ifndef _ASIdOrRange_H_ #define _ASIdOrRange_H_ -#include "asn1/asn1c/ASId.h" #include "asn1/asn1c/ASRange.h" #include "asn1/asn1c/constr_CHOICE.h" -#include "asn1/asn1c/constr_TYPE.h" /* Dependencies */ typedef enum ASIdOrRange_PR { diff --git a/src/asn1/asn1c/ASIdentifierChoice.c b/src/asn1/asn1c/ASIdentifierChoice.c index 83cea854..75598f51 100644 --- a/src/asn1/asn1c/ASIdentifierChoice.c +++ b/src/asn1/asn1c/ASIdentifierChoice.c @@ -7,6 +7,8 @@ #include "asn1/asn1c/ASIdentifierChoice.h" +#include "asn1/asn1c/constr_SEQUENCE_OF.h" + static asn_TYPE_member_t asn_MBR_asIdsOrRanges_3[] = { { ATF_POINTER, 0, 0, -1 /* Ambiguous tag (CHOICE?) */, diff --git a/src/asn1/asn1c/ASIdentifierChoice.h b/src/asn1/asn1c/ASIdentifierChoice.h index ede383be..21877e74 100644 --- a/src/asn1/asn1c/ASIdentifierChoice.h +++ b/src/asn1/asn1c/ASIdentifierChoice.h @@ -11,9 +11,6 @@ #include "asn1/asn1c/ASIdOrRange.h" #include "asn1/asn1c/NULL.h" #include "asn1/asn1c/asn_SEQUENCE_OF.h" -#include "asn1/asn1c/constr_CHOICE.h" -#include "asn1/asn1c/constr_SEQUENCE_OF.h" -#include "asn1/asn1c/constr_TYPE.h" /* Dependencies */ typedef enum ASIdentifierChoice_PR { diff --git a/src/asn1/asn1c/ASIdentifiers.h b/src/asn1/asn1c/ASIdentifiers.h index 6f63d002..91ae46e4 100644 --- a/src/asn1/asn1c/ASIdentifiers.h +++ b/src/asn1/asn1c/ASIdentifiers.h @@ -9,8 +9,6 @@ #define _ASIdentifiers_H_ #include "asn1/asn1c/ASIdentifierChoice.h" -#include "asn1/asn1c/constr_SEQUENCE.h" -#include "asn1/asn1c/constr_TYPE.h" /* ASIdentifiers */ typedef struct ASIdentifiers { diff --git a/src/asn1/asn1c/ASRange.h b/src/asn1/asn1c/ASRange.h index 99e14d13..08bce8a9 100644 --- a/src/asn1/asn1c/ASRange.h +++ b/src/asn1/asn1c/ASRange.h @@ -10,7 +10,6 @@ #include "asn1/asn1c/ASId.h" #include "asn1/asn1c/constr_SEQUENCE.h" -#include "asn1/asn1c/constr_TYPE.h" /* ASRange */ typedef struct ASRange { diff --git a/src/asn1/asn1c/AlgorithmIdentifier.h b/src/asn1/asn1c/AlgorithmIdentifier.h index 08bd7e9a..f8030154 100644 --- a/src/asn1/asn1c/AlgorithmIdentifier.h +++ b/src/asn1/asn1c/AlgorithmIdentifier.h @@ -11,7 +11,6 @@ #include "asn1/asn1c/ANY.h" #include "asn1/asn1c/OBJECT_IDENTIFIER.h" #include "asn1/asn1c/constr_SEQUENCE.h" -#include "asn1/asn1c/constr_TYPE.h" /* AlgorithmIdentifier */ typedef struct AlgorithmIdentifier { diff --git a/src/asn1/asn1c/AttributeType.h b/src/asn1/asn1c/AttributeType.h index 99881aeb..bc23b4e4 100644 --- a/src/asn1/asn1c/AttributeType.h +++ b/src/asn1/asn1c/AttributeType.h @@ -9,7 +9,6 @@ #define _AttributeType_H_ #include "asn1/asn1c/OBJECT_IDENTIFIER.h" -#include "asn1/asn1c/constr_TYPE.h" /* AttributeType */ typedef OBJECT_IDENTIFIER_t AttributeType_t; diff --git a/src/asn1/asn1c/AttributeTypeAndValue.h b/src/asn1/asn1c/AttributeTypeAndValue.h index 7de860b3..720adc59 100644 --- a/src/asn1/asn1c/AttributeTypeAndValue.h +++ b/src/asn1/asn1c/AttributeTypeAndValue.h @@ -11,7 +11,6 @@ #include "asn1/asn1c/AttributeType.h" #include "asn1/asn1c/AttributeValue.h" #include "asn1/asn1c/constr_SEQUENCE.h" -#include "asn1/asn1c/constr_TYPE.h" /* AttributeTypeAndValue */ typedef struct AttributeTypeAndValue { diff --git a/src/asn1/asn1c/AttributeValue.h b/src/asn1/asn1c/AttributeValue.h index 81f0b07f..d83e2197 100644 --- a/src/asn1/asn1c/AttributeValue.h +++ b/src/asn1/asn1c/AttributeValue.h @@ -9,7 +9,6 @@ #define _AttributeValue_H_ #include "asn1/asn1c/ANY.h" -#include "asn1/asn1c/constr_TYPE.h" /* AttributeValue */ typedef ANY_t AttributeValue_t; diff --git a/src/asn1/asn1c/BOOLEAN.c b/src/asn1/asn1c/BOOLEAN.c index 95706a1c..ce0a23cc 100644 --- a/src/asn1/asn1c/BOOLEAN.c +++ b/src/asn1/asn1c/BOOLEAN.c @@ -4,10 +4,8 @@ */ #include "asn1/asn1c/BOOLEAN.h" -#include "asn1/asn1c/asn_codecs_prim.h" #include "asn1/asn1c/asn_internal.h" #include "asn1/asn1c/ber_decoder.h" -#include "asn1/asn1c/constraints.h" #include "asn1/asn1c/der_encoder.h" /* diff --git a/src/asn1/asn1c/BOOLEAN.h b/src/asn1/asn1c/BOOLEAN.h index fb2411ba..6259aa0d 100644 --- a/src/asn1/asn1c/BOOLEAN.h +++ b/src/asn1/asn1c/BOOLEAN.h @@ -5,7 +5,7 @@ #ifndef _BOOLEAN_H_ #define _BOOLEAN_H_ -#include "asn1/asn1c/constr_TYPE.h" +#include "asn1/asn1c/constraints.h" /* * The underlying integer may contain various values, but everything diff --git a/src/asn1/asn1c/BinarySigningTime.h b/src/asn1/asn1c/BinarySigningTime.h index f118b85f..c147d75c 100644 --- a/src/asn1/asn1c/BinarySigningTime.h +++ b/src/asn1/asn1c/BinarySigningTime.h @@ -9,7 +9,6 @@ #define _BinarySigningTime_H_ #include "asn1/asn1c/BinaryTime.h" -#include "asn1/asn1c/constr_TYPE.h" /* BinarySigningTime */ typedef BinaryTime_t BinarySigningTime_t; diff --git a/src/asn1/asn1c/BinaryTime.h b/src/asn1/asn1c/BinaryTime.h index 25d18883..67640424 100644 --- a/src/asn1/asn1c/BinaryTime.h +++ b/src/asn1/asn1c/BinaryTime.h @@ -9,7 +9,6 @@ #define _BinaryTime_H_ #include "asn1/asn1c/INTEGER.h" -#include "asn1/asn1c/constr_TYPE.h" /* BinaryTime */ typedef INTEGER_t BinaryTime_t; diff --git a/src/asn1/asn1c/CMSAttribute.c b/src/asn1/asn1c/CMSAttribute.c index 79c755d1..12c284b9 100644 --- a/src/asn1/asn1c/CMSAttribute.c +++ b/src/asn1/asn1c/CMSAttribute.c @@ -12,6 +12,7 @@ #include "asn1/asn1c/ContentType.h" #include "asn1/asn1c/MessageDigest.h" #include "asn1/asn1c/SigningTime.h" +#include "asn1/asn1c/constr_SET_OF.h" #include "json_util.h" static json_t * diff --git a/src/asn1/asn1c/CMSAttribute.h b/src/asn1/asn1c/CMSAttribute.h index 414cd5c6..a43a6d0f 100644 --- a/src/asn1/asn1c/CMSAttribute.h +++ b/src/asn1/asn1c/CMSAttribute.h @@ -12,8 +12,6 @@ #include "asn1/asn1c/OBJECT_IDENTIFIER.h" #include "asn1/asn1c/asn_SET_OF.h" #include "asn1/asn1c/constr_SEQUENCE.h" -#include "asn1/asn1c/constr_SET_OF.h" -#include "asn1/asn1c/constr_TYPE.h" /* CMSAttribute */ typedef struct CMSAttribute { diff --git a/src/asn1/asn1c/CMSAttributeValue.h b/src/asn1/asn1c/CMSAttributeValue.h index 9bb9d85e..fe3afc31 100644 --- a/src/asn1/asn1c/CMSAttributeValue.h +++ b/src/asn1/asn1c/CMSAttributeValue.h @@ -9,7 +9,6 @@ #define _CMSAttributeValue_H_ #include "asn1/asn1c/ANY.h" -#include "asn1/asn1c/constr_TYPE.h" /* CMSAttributeValue */ typedef ANY_t CMSAttributeValue_t; diff --git a/src/asn1/asn1c/CMSSubjectKeyIdentifier.h b/src/asn1/asn1c/CMSSubjectKeyIdentifier.h index 8e6a468b..05caf9ea 100644 --- a/src/asn1/asn1c/CMSSubjectKeyIdentifier.h +++ b/src/asn1/asn1c/CMSSubjectKeyIdentifier.h @@ -9,7 +9,6 @@ #define _CMSSubjectKeyIdentifier_H_ #include "asn1/asn1c/OCTET_STRING.h" -#include "asn1/asn1c/constr_TYPE.h" /* CMSSubjectKeyIdentifier */ typedef OCTET_STRING_t CMSSubjectKeyIdentifier_t; diff --git a/src/asn1/asn1c/CMSVersion.h b/src/asn1/asn1c/CMSVersion.h index ffd6ee50..19fdfe0c 100644 --- a/src/asn1/asn1c/CMSVersion.h +++ b/src/asn1/asn1c/CMSVersion.h @@ -9,7 +9,6 @@ #define _CMSVersion_H_ #include "asn1/asn1c/INTEGER.h" -#include "asn1/asn1c/constr_TYPE.h" /* Dependencies */ typedef enum CMSVersion { diff --git a/src/asn1/asn1c/CRL.c b/src/asn1/asn1c/CRL.c index fbcc02ec..ec5d11e2 100644 --- a/src/asn1/asn1c/CRL.c +++ b/src/asn1/asn1c/CRL.c @@ -2,7 +2,6 @@ #include -#include "extension.h" #include "json_util.h" #include "libcrypto_util.h" diff --git a/src/asn1/asn1c/Certificate.c b/src/asn1/asn1c/Certificate.c index 807b890d..ca506047 100644 --- a/src/asn1/asn1c/Certificate.c +++ b/src/asn1/asn1c/Certificate.c @@ -2,7 +2,6 @@ #include -#include "extension.h" #include "json_util.h" #include "libcrypto_util.h" #include "log.h" diff --git a/src/asn1/asn1c/CertificateList.h b/src/asn1/asn1c/CertificateList.h index 19c92520..1eebc422 100644 --- a/src/asn1/asn1c/CertificateList.h +++ b/src/asn1/asn1c/CertificateList.h @@ -8,11 +8,8 @@ #ifndef _CertificateList_H_ #define _CertificateList_H_ -#include "asn1/asn1c/AlgorithmIdentifier.h" #include "asn1/asn1c/BIT_STRING.h" #include "asn1/asn1c/TBSCertList.h" -#include "asn1/asn1c/constr_SEQUENCE.h" -#include "asn1/asn1c/constr_TYPE.h" /* CertificateList */ typedef struct CertificateList { diff --git a/src/asn1/asn1c/CertificateSerialNumber.h b/src/asn1/asn1c/CertificateSerialNumber.h index b02927cb..ae5f39d6 100644 --- a/src/asn1/asn1c/CertificateSerialNumber.h +++ b/src/asn1/asn1c/CertificateSerialNumber.h @@ -9,7 +9,6 @@ #define _CertificateSerialNumber_H_ #include "asn1/asn1c/INTEGER.h" -#include "asn1/asn1c/constr_TYPE.h" /* CertificateSerialNumber */ typedef INTEGER_t CertificateSerialNumber_t; diff --git a/src/asn1/asn1c/CertificateSet.h b/src/asn1/asn1c/CertificateSet.h index 09027225..f822c997 100644 --- a/src/asn1/asn1c/CertificateSet.h +++ b/src/asn1/asn1c/CertificateSet.h @@ -11,7 +11,6 @@ #include "asn1/asn1c/ANY.h" #include "asn1/asn1c/asn_SET_OF.h" #include "asn1/asn1c/constr_SET_OF.h" -#include "asn1/asn1c/constr_TYPE.h" /* CertificateSet */ typedef struct CertificateSet { diff --git a/src/asn1/asn1c/ContentInfo.h b/src/asn1/asn1c/ContentInfo.h index 8bc91ad7..53b06345 100644 --- a/src/asn1/asn1c/ContentInfo.h +++ b/src/asn1/asn1c/ContentInfo.h @@ -10,8 +10,6 @@ #include "asn1/asn1c/ANY.h" #include "asn1/asn1c/ContentType.h" -#include "asn1/asn1c/constr_SEQUENCE.h" -#include "asn1/asn1c/constr_TYPE.h" /* ContentInfo */ typedef struct ContentInfo { diff --git a/src/asn1/asn1c/ContentType.h b/src/asn1/asn1c/ContentType.h index 0fcff7a8..1c3324ca 100644 --- a/src/asn1/asn1c/ContentType.h +++ b/src/asn1/asn1c/ContentType.h @@ -9,7 +9,6 @@ #define _ContentType_H_ #include "asn1/asn1c/OBJECT_IDENTIFIER.h" -#include "asn1/asn1c/constr_TYPE.h" /* ContentType */ typedef OBJECT_IDENTIFIER_t ContentType_t; diff --git a/src/asn1/asn1c/ContentTypePKCS7.h b/src/asn1/asn1c/ContentTypePKCS7.h index d3050ed1..3efcfd91 100644 --- a/src/asn1/asn1c/ContentTypePKCS7.h +++ b/src/asn1/asn1c/ContentTypePKCS7.h @@ -9,7 +9,6 @@ #define _ContentTypePKCS7_H_ #include "asn1/asn1c/OCTET_STRING.h" -#include "asn1/asn1c/constr_TYPE.h" /* ContentTypePKCS7 */ typedef OCTET_STRING_t ContentTypePKCS7_t; diff --git a/src/asn1/asn1c/Countersignature.h b/src/asn1/asn1c/Countersignature.h index 755b76db..0b93d74f 100644 --- a/src/asn1/asn1c/Countersignature.h +++ b/src/asn1/asn1c/Countersignature.h @@ -9,7 +9,6 @@ #define _Countersignature_H_ #include "asn1/asn1c/SignerInfo.h" -#include "asn1/asn1c/constr_TYPE.h" /* Countersignature */ typedef SignerInfo_t Countersignature_t; diff --git a/src/asn1/asn1c/DigestAlgorithmIdentifier.h b/src/asn1/asn1c/DigestAlgorithmIdentifier.h index cc360663..3e26c511 100644 --- a/src/asn1/asn1c/DigestAlgorithmIdentifier.h +++ b/src/asn1/asn1c/DigestAlgorithmIdentifier.h @@ -9,7 +9,6 @@ #define _DigestAlgorithmIdentifier_H_ #include "asn1/asn1c/AlgorithmIdentifier.h" -#include "asn1/asn1c/constr_TYPE.h" /* DigestAlgorithmIdentifier */ typedef AlgorithmIdentifier_t DigestAlgorithmIdentifier_t; diff --git a/src/asn1/asn1c/DigestAlgorithmIdentifiers.c b/src/asn1/asn1c/DigestAlgorithmIdentifiers.c index 86406cb0..76fdbfdb 100644 --- a/src/asn1/asn1c/DigestAlgorithmIdentifiers.c +++ b/src/asn1/asn1c/DigestAlgorithmIdentifiers.c @@ -7,6 +7,8 @@ #include "asn1/asn1c/DigestAlgorithmIdentifiers.h" +#include "asn1/asn1c/DigestAlgorithmIdentifier.h" + asn_TYPE_member_t asn_MBR_DigestAlgorithmIdentifiers_1[] = { { ATF_POINTER, 0, 0, (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), diff --git a/src/asn1/asn1c/DigestAlgorithmIdentifiers.h b/src/asn1/asn1c/DigestAlgorithmIdentifiers.h index 27783eeb..ae1d932a 100644 --- a/src/asn1/asn1c/DigestAlgorithmIdentifiers.h +++ b/src/asn1/asn1c/DigestAlgorithmIdentifiers.h @@ -8,10 +8,8 @@ #ifndef _DigestAlgorithmIdentifiers_H_ #define _DigestAlgorithmIdentifiers_H_ -#include "asn1/asn1c/DigestAlgorithmIdentifier.h" #include "asn1/asn1c/asn_SET_OF.h" #include "asn1/asn1c/constr_SET_OF.h" -#include "asn1/asn1c/constr_TYPE.h" /* Forward declarations */ struct DigestAlgorithmIdentifier; diff --git a/src/asn1/asn1c/DistinguishedName.c b/src/asn1/asn1c/DistinguishedName.c index 38beeed5..9838a165 100644 --- a/src/asn1/asn1c/DistinguishedName.c +++ b/src/asn1/asn1c/DistinguishedName.c @@ -7,6 +7,8 @@ #include "asn1/asn1c/DistinguishedName.h" +#include "asn1/asn1c/constr_SEQUENCE_OF.h" + /* * This type is implemented using RDNSequence, * so here we adjust the DEF accordingly. diff --git a/src/asn1/asn1c/DistinguishedName.h b/src/asn1/asn1c/DistinguishedName.h index 698b589f..c31ba50b 100644 --- a/src/asn1/asn1c/DistinguishedName.h +++ b/src/asn1/asn1c/DistinguishedName.h @@ -9,7 +9,6 @@ #define _DistinguishedName_H_ #include "asn1/asn1c/RDNSequence.h" -#include "asn1/asn1c/constr_TYPE.h" /* DistinguishedName */ typedef RDNSequence_t DistinguishedName_t; diff --git a/src/asn1/asn1c/EncapsulatedContentInfo.h b/src/asn1/asn1c/EncapsulatedContentInfo.h index 57683b55..6379d9a5 100644 --- a/src/asn1/asn1c/EncapsulatedContentInfo.h +++ b/src/asn1/asn1c/EncapsulatedContentInfo.h @@ -9,9 +9,7 @@ #define _EncapsulatedContentInfo_H_ #include "asn1/asn1c/ContentType.h" -#include "asn1/asn1c/OCTET_STRING.h" #include "asn1/asn1c/constr_SEQUENCE.h" -#include "asn1/asn1c/constr_TYPE.h" /* EncapsulatedContentInfo */ typedef struct EncapsulatedContentInfo { diff --git a/src/asn1/asn1c/EncapsulatedContentInfoPKCS7.h b/src/asn1/asn1c/EncapsulatedContentInfoPKCS7.h index 0a80e0ba..e2b63b6d 100644 --- a/src/asn1/asn1c/EncapsulatedContentInfoPKCS7.h +++ b/src/asn1/asn1c/EncapsulatedContentInfoPKCS7.h @@ -11,7 +11,6 @@ #include "asn1/asn1c/ANY.h" #include "asn1/asn1c/ContentType.h" #include "asn1/asn1c/constr_SEQUENCE.h" -#include "asn1/asn1c/constr_TYPE.h" /* EncapsulatedContentInfoPKCS7 */ typedef struct EncapsulatedContentInfoPKCS7 { diff --git a/src/asn1/asn1c/Extension.h b/src/asn1/asn1c/Extension.h index ad427001..75aed911 100644 --- a/src/asn1/asn1c/Extension.h +++ b/src/asn1/asn1c/Extension.h @@ -10,9 +10,7 @@ #include "asn1/asn1c/BOOLEAN.h" #include "asn1/asn1c/OBJECT_IDENTIFIER.h" -#include "asn1/asn1c/OCTET_STRING.h" #include "asn1/asn1c/constr_SEQUENCE.h" -#include "asn1/asn1c/constr_TYPE.h" /* Extension */ typedef struct Extension { diff --git a/src/asn1/asn1c/Extensions.c b/src/asn1/asn1c/Extensions.c index d5e02c3c..9374cefe 100644 --- a/src/asn1/asn1c/Extensions.c +++ b/src/asn1/asn1c/Extensions.c @@ -7,6 +7,8 @@ #include "asn1/asn1c/Extensions.h" +#include "asn1/asn1c/constr_SEQUENCE_OF.h" + asn_TYPE_member_t asn_MBR_Extensions_1[] = { { ATF_POINTER, 0, 0, (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), diff --git a/src/asn1/asn1c/Extensions.h b/src/asn1/asn1c/Extensions.h index 8f879994..811866fd 100644 --- a/src/asn1/asn1c/Extensions.h +++ b/src/asn1/asn1c/Extensions.h @@ -10,8 +10,7 @@ #include "asn1/asn1c/Extension.h" #include "asn1/asn1c/asn_SEQUENCE_OF.h" -#include "asn1/asn1c/constr_SEQUENCE_OF.h" -#include "asn1/asn1c/constr_TYPE.h" +#include "asn1/asn1c/constr_SET_OF.h" /* Extensions */ typedef struct Extensions { diff --git a/src/asn1/asn1c/FileAndHash.h b/src/asn1/asn1c/FileAndHash.h index 52d90096..f1e9adf6 100644 --- a/src/asn1/asn1c/FileAndHash.h +++ b/src/asn1/asn1c/FileAndHash.h @@ -11,7 +11,6 @@ #include "asn1/asn1c/BIT_STRING.h" #include "asn1/asn1c/IA5String.h" #include "asn1/asn1c/constr_SEQUENCE.h" -#include "asn1/asn1c/constr_TYPE.h" /* FileAndHash */ typedef struct FileAndHash { diff --git a/src/asn1/asn1c/INTEGER.c b/src/asn1/asn1c/INTEGER.c index 30a5d041..e2a67e87 100644 --- a/src/asn1/asn1c/INTEGER.c +++ b/src/asn1/asn1c/INTEGER.c @@ -8,7 +8,6 @@ #include #include -#include "asn1/asn1c/asn_codecs_prim.h" #include "asn1/asn1c/asn_internal.h" #include "json_util.h" diff --git a/src/asn1/asn1c/INTEGER.h b/src/asn1/asn1c/INTEGER.h index b09933a7..84dcc09c 100644 --- a/src/asn1/asn1c/INTEGER.h +++ b/src/asn1/asn1c/INTEGER.h @@ -6,7 +6,6 @@ #define _INTEGER_H_ #include "asn1/asn1c/asn_codecs_prim.h" -#include "asn1/asn1c/constr_TYPE.h" #include "asn1/asn1c/constraints.h" typedef ASN__PRIMITIVE_TYPE_t INTEGER_t; diff --git a/src/asn1/asn1c/IPAddrBlocks.c b/src/asn1/asn1c/IPAddrBlocks.c index 8a440885..276f0459 100644 --- a/src/asn1/asn1c/IPAddrBlocks.c +++ b/src/asn1/asn1c/IPAddrBlocks.c @@ -7,6 +7,8 @@ #include "asn1/asn1c/IPAddrBlocks.h" +#include "asn1/asn1c/constr_SEQUENCE_OF.h" + static asn_TYPE_member_t asn_MBR_IPAddrBlocks_1[] = { { ATF_POINTER, 0, 0, (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), diff --git a/src/asn1/asn1c/IPAddrBlocks.h b/src/asn1/asn1c/IPAddrBlocks.h index c5e1e887..d7beb170 100644 --- a/src/asn1/asn1c/IPAddrBlocks.h +++ b/src/asn1/asn1c/IPAddrBlocks.h @@ -9,9 +9,6 @@ #define _IPAddrBlocks_H_ #include "asn1/asn1c/IPAddressFamily.h" -#include "asn1/asn1c/asn_SEQUENCE_OF.h" -#include "asn1/asn1c/constr_SEQUENCE_OF.h" -#include "asn1/asn1c/constr_TYPE.h" /* IPAddrBlocks */ typedef struct IPAddrBlocks { diff --git a/src/asn1/asn1c/IPAddress.h b/src/asn1/asn1c/IPAddress.h index ea139996..ee3cd60a 100644 --- a/src/asn1/asn1c/IPAddress.h +++ b/src/asn1/asn1c/IPAddress.h @@ -9,7 +9,6 @@ #define _IPAddress_H_ #include "asn1/asn1c/BIT_STRING.h" -#include "asn1/asn1c/constr_TYPE.h" /* IPAddress */ typedef BIT_STRING_t IPAddress_t; diff --git a/src/asn1/asn1c/IPAddressChoice.c b/src/asn1/asn1c/IPAddressChoice.c index 490dd454..6ddda4c1 100644 --- a/src/asn1/asn1c/IPAddressChoice.c +++ b/src/asn1/asn1c/IPAddressChoice.c @@ -7,6 +7,8 @@ #include "asn1/asn1c/IPAddressChoice.h" +#include "asn1/asn1c/constr_SEQUENCE_OF.h" + static asn_TYPE_member_t asn_MBR_addressesOrRanges_3[] = { { ATF_POINTER, 0, 0, -1 /* Ambiguous tag (CHOICE?) */, diff --git a/src/asn1/asn1c/IPAddressChoice.h b/src/asn1/asn1c/IPAddressChoice.h index 62cbdffd..908c53c6 100644 --- a/src/asn1/asn1c/IPAddressChoice.h +++ b/src/asn1/asn1c/IPAddressChoice.h @@ -11,9 +11,6 @@ #include "asn1/asn1c/IPAddressOrRange.h" #include "asn1/asn1c/NULL.h" #include "asn1/asn1c/asn_SEQUENCE_OF.h" -#include "asn1/asn1c/constr_CHOICE.h" -#include "asn1/asn1c/constr_SEQUENCE_OF.h" -#include "asn1/asn1c/constr_TYPE.h" /* Dependencies */ typedef enum IPAddressChoice_PR { diff --git a/src/asn1/asn1c/IPAddressFamily.h b/src/asn1/asn1c/IPAddressFamily.h index b1619214..7310d3ea 100644 --- a/src/asn1/asn1c/IPAddressFamily.h +++ b/src/asn1/asn1c/IPAddressFamily.h @@ -9,9 +9,6 @@ #define _IPAddressFamily_H_ #include "asn1/asn1c/IPAddressChoice.h" -#include "asn1/asn1c/OCTET_STRING.h" -#include "asn1/asn1c/constr_SEQUENCE.h" -#include "asn1/asn1c/constr_TYPE.h" /* IPAddressFamily */ typedef struct IPAddressFamily { diff --git a/src/asn1/asn1c/IPAddressOrRange.h b/src/asn1/asn1c/IPAddressOrRange.h index b7cd15e2..77196252 100644 --- a/src/asn1/asn1c/IPAddressOrRange.h +++ b/src/asn1/asn1c/IPAddressOrRange.h @@ -8,10 +8,8 @@ #ifndef _IPAddressOrRange_H_ #define _IPAddressOrRange_H_ -#include "asn1/asn1c/IPAddress.h" #include "asn1/asn1c/IPAddressRange.h" #include "asn1/asn1c/constr_CHOICE.h" -#include "asn1/asn1c/constr_TYPE.h" /* Dependencies */ typedef enum IPAddressOrRange_PR { diff --git a/src/asn1/asn1c/IPAddressRange.h b/src/asn1/asn1c/IPAddressRange.h index d218d8cc..2a319935 100644 --- a/src/asn1/asn1c/IPAddressRange.h +++ b/src/asn1/asn1c/IPAddressRange.h @@ -10,7 +10,6 @@ #include "asn1/asn1c/IPAddress.h" #include "asn1/asn1c/constr_SEQUENCE.h" -#include "asn1/asn1c/constr_TYPE.h" /* IPAddressRange */ typedef struct IPAddressRange { diff --git a/src/asn1/asn1c/IssuerAndSerialNumber.h b/src/asn1/asn1c/IssuerAndSerialNumber.h index 18820a9f..7779c99a 100644 --- a/src/asn1/asn1c/IssuerAndSerialNumber.h +++ b/src/asn1/asn1c/IssuerAndSerialNumber.h @@ -10,8 +10,6 @@ #include "asn1/asn1c/CertificateSerialNumber.h" #include "asn1/asn1c/Name.h" -#include "asn1/asn1c/constr_SEQUENCE.h" -#include "asn1/asn1c/constr_TYPE.h" /* IssuerAndSerialNumber */ typedef struct IssuerAndSerialNumber { diff --git a/src/asn1/asn1c/Manifest.c b/src/asn1/asn1c/Manifest.c index 29069a5c..110e3fe9 100644 --- a/src/asn1/asn1c/Manifest.c +++ b/src/asn1/asn1c/Manifest.c @@ -8,6 +8,7 @@ #include "asn1/asn1c/Manifest.h" #include "asn1/asn1c/asn_internal.h" +#include "asn1/asn1c/constr_SEQUENCE_OF.h" static int memb_manifestNumber_constraint_1(const asn_TYPE_descriptor_t *td, const void *sptr, diff --git a/src/asn1/asn1c/Manifest.h b/src/asn1/asn1c/Manifest.h index c865229f..44277a6c 100644 --- a/src/asn1/asn1c/Manifest.h +++ b/src/asn1/asn1c/Manifest.h @@ -13,9 +13,6 @@ #include "asn1/asn1c/INTEGER.h" #include "asn1/asn1c/OBJECT_IDENTIFIER.h" #include "asn1/asn1c/asn_SEQUENCE_OF.h" -#include "asn1/asn1c/constr_SEQUENCE.h" -#include "asn1/asn1c/constr_SEQUENCE_OF.h" -#include "asn1/asn1c/constr_TYPE.h" /* Manifest */ typedef struct Manifest { diff --git a/src/asn1/asn1c/MessageDigest.h b/src/asn1/asn1c/MessageDigest.h index 5b72392e..dc3fff8f 100644 --- a/src/asn1/asn1c/MessageDigest.h +++ b/src/asn1/asn1c/MessageDigest.h @@ -9,7 +9,6 @@ #define _MessageDigest_H_ #include "asn1/asn1c/OCTET_STRING.h" -#include "asn1/asn1c/constr_TYPE.h" /* MessageDigest */ typedef OCTET_STRING_t MessageDigest_t; diff --git a/src/asn1/asn1c/NULL.c b/src/asn1/asn1c/NULL.c index 477eb0f5..77ad15cd 100644 --- a/src/asn1/asn1c/NULL.c +++ b/src/asn1/asn1c/NULL.c @@ -4,10 +4,8 @@ */ #include "asn1/asn1c/NULL.h" -#include "asn1/asn1c/asn_codecs_prim.h" #include "asn1/asn1c/asn_internal.h" #include "asn1/asn1c/ber_decoder.h" -#include "asn1/asn1c/constraints.h" #include "asn1/asn1c/der_encoder.h" /* diff --git a/src/asn1/asn1c/NULL.h b/src/asn1/asn1c/NULL.h index b19d853c..d2a43628 100644 --- a/src/asn1/asn1c/NULL.h +++ b/src/asn1/asn1c/NULL.h @@ -5,7 +5,7 @@ #ifndef ASN_TYPE_NULL_H #define ASN_TYPE_NULL_H -#include "asn1/asn1c/constr_TYPE.h" +#include "asn1/asn1c/constraints.h" /* * The value of the NULL type is meaningless. diff --git a/src/asn1/asn1c/Name.h b/src/asn1/asn1c/Name.h index 431506e9..d61cc9b0 100644 --- a/src/asn1/asn1c/Name.h +++ b/src/asn1/asn1c/Name.h @@ -10,7 +10,6 @@ #include "asn1/asn1c/RDNSequence.h" #include "asn1/asn1c/constr_CHOICE.h" -#include "asn1/asn1c/constr_TYPE.h" /* Dependencies */ typedef enum Name_PR { diff --git a/src/asn1/asn1c/OBJECT_IDENTIFIER.c b/src/asn1/asn1c/OBJECT_IDENTIFIER.c index e2a86942..53acaaea 100644 --- a/src/asn1/asn1c/OBJECT_IDENTIFIER.c +++ b/src/asn1/asn1c/OBJECT_IDENTIFIER.c @@ -12,7 +12,6 @@ #include #include "asn1/asn1c/INTEGER.h" -#include "asn1/asn1c/OCTET_STRING.h" #include "asn1/asn1c/asn_internal.h" #include "json_util.h" diff --git a/src/asn1/asn1c/OBJECT_IDENTIFIER.h b/src/asn1/asn1c/OBJECT_IDENTIFIER.h index db74cae5..91b4604d 100644 --- a/src/asn1/asn1c/OBJECT_IDENTIFIER.h +++ b/src/asn1/asn1c/OBJECT_IDENTIFIER.h @@ -9,7 +9,6 @@ #include "asn1/asn1c/OCTET_STRING.h" #include "asn1/asn1c/asn_codecs_prim.h" -#include "asn1/asn1c/constr_TYPE.h" typedef uint32_t asn_oid_arc_t; #define ASN_OID_ARC_MAX (~((asn_oid_arc_t)0)) diff --git a/src/asn1/asn1c/OCTET_STRING.h b/src/asn1/asn1c/OCTET_STRING.h index 10060518..5f834766 100644 --- a/src/asn1/asn1c/OCTET_STRING.h +++ b/src/asn1/asn1c/OCTET_STRING.h @@ -5,7 +5,6 @@ #ifndef _OCTET_STRING_H_ #define _OCTET_STRING_H_ -#include "asn1/asn1c/constr_TYPE.h" #include "asn1/asn1c/constraints.h" /* diff --git a/src/asn1/asn1c/OPEN_TYPE.c b/src/asn1/asn1c/OPEN_TYPE.c index 995f1d51..ca970a8a 100644 --- a/src/asn1/asn1c/OPEN_TYPE.c +++ b/src/asn1/asn1c/OPEN_TYPE.c @@ -5,7 +5,6 @@ #include "asn1/asn1c/OPEN_TYPE.h" #include "asn1/asn1c/asn_internal.h" -#include "asn1/asn1c/constr_CHOICE.h" asn_TYPE_operation_t asn_OP_OPEN_TYPE = { OPEN_TYPE_free, diff --git a/src/asn1/asn1c/OPEN_TYPE.h b/src/asn1/asn1c/OPEN_TYPE.h index 75ed60ef..ef4e1221 100644 --- a/src/asn1/asn1c/OPEN_TYPE.h +++ b/src/asn1/asn1c/OPEN_TYPE.h @@ -5,7 +5,7 @@ #ifndef ASN_OPEN_TYPE_H #define ASN_OPEN_TYPE_H -#include "asn1/asn1c/constr_TYPE.h" +#include "asn1/asn1c/constr_CHOICE.h" #define OPEN_TYPE_free CHOICE_free #define OPEN_TYPE_print CHOICE_print diff --git a/src/asn1/asn1c/OtherRevocationInfoFormat.h b/src/asn1/asn1c/OtherRevocationInfoFormat.h index dabc56cd..5ee24a32 100644 --- a/src/asn1/asn1c/OtherRevocationInfoFormat.h +++ b/src/asn1/asn1c/OtherRevocationInfoFormat.h @@ -11,7 +11,6 @@ #include "asn1/asn1c/ANY.h" #include "asn1/asn1c/OBJECT_IDENTIFIER.h" #include "asn1/asn1c/constr_SEQUENCE.h" -#include "asn1/asn1c/constr_TYPE.h" /* OtherRevocationInfoFormat */ typedef struct OtherRevocationInfoFormat { diff --git a/src/asn1/asn1c/RDNSequence.c b/src/asn1/asn1c/RDNSequence.c index 129a8ec1..df48b872 100644 --- a/src/asn1/asn1c/RDNSequence.c +++ b/src/asn1/asn1c/RDNSequence.c @@ -7,6 +7,8 @@ #include "asn1/asn1c/RDNSequence.h" +#include "asn1/asn1c/constr_SEQUENCE_OF.h" + asn_TYPE_member_t asn_MBR_RDNSequence_1[] = { { ATF_POINTER, 0, 0, (ASN_TAG_CLASS_UNIVERSAL | (17 << 2)), diff --git a/src/asn1/asn1c/RDNSequence.h b/src/asn1/asn1c/RDNSequence.h index dcf98295..3db55e3e 100644 --- a/src/asn1/asn1c/RDNSequence.h +++ b/src/asn1/asn1c/RDNSequence.h @@ -10,8 +10,6 @@ #include "asn1/asn1c/RelativeDistinguishedName.h" #include "asn1/asn1c/asn_SEQUENCE_OF.h" -#include "asn1/asn1c/constr_SEQUENCE_OF.h" -#include "asn1/asn1c/constr_TYPE.h" /* RDNSequence */ typedef struct RDNSequence { diff --git a/src/asn1/asn1c/ROAIPAddress.h b/src/asn1/asn1c/ROAIPAddress.h index ff60eec3..e712c83e 100644 --- a/src/asn1/asn1c/ROAIPAddress.h +++ b/src/asn1/asn1c/ROAIPAddress.h @@ -11,7 +11,6 @@ #include "asn1/asn1c/INTEGER.h" #include "asn1/asn1c/IPAddress.h" #include "asn1/asn1c/constr_SEQUENCE.h" -#include "asn1/asn1c/constr_TYPE.h" /* ROAIPAddress */ typedef struct ROAIPAddress { diff --git a/src/asn1/asn1c/ROAIPAddressFamily.c b/src/asn1/asn1c/ROAIPAddressFamily.c index 29f1aa51..439fc2e7 100644 --- a/src/asn1/asn1c/ROAIPAddressFamily.c +++ b/src/asn1/asn1c/ROAIPAddressFamily.c @@ -7,6 +7,7 @@ #include "asn1/asn1c/ROAIPAddressFamily.h" +#include "asn1/asn1c/constr_SEQUENCE_OF.h" #include "json_util.h" #include "types/address.h" diff --git a/src/asn1/asn1c/ROAIPAddressFamily.h b/src/asn1/asn1c/ROAIPAddressFamily.h index d676528c..90ac0ffe 100644 --- a/src/asn1/asn1c/ROAIPAddressFamily.h +++ b/src/asn1/asn1c/ROAIPAddressFamily.h @@ -8,12 +8,8 @@ #ifndef _ROAIPAddressFamily_H_ #define _ROAIPAddressFamily_H_ -#include "asn1/asn1c/OCTET_STRING.h" #include "asn1/asn1c/ROAIPAddress.h" #include "asn1/asn1c/asn_SEQUENCE_OF.h" -#include "asn1/asn1c/constr_SEQUENCE.h" -#include "asn1/asn1c/constr_SEQUENCE_OF.h" -#include "asn1/asn1c/constr_TYPE.h" /* ROAIPAddressFamily */ typedef struct ROAIPAddressFamily { diff --git a/src/asn1/asn1c/RelativeDistinguishedName.h b/src/asn1/asn1c/RelativeDistinguishedName.h index 89365e99..2dafa8de 100644 --- a/src/asn1/asn1c/RelativeDistinguishedName.h +++ b/src/asn1/asn1c/RelativeDistinguishedName.h @@ -11,7 +11,6 @@ #include "asn1/asn1c/AttributeTypeAndValue.h" #include "asn1/asn1c/asn_SET_OF.h" #include "asn1/asn1c/constr_SET_OF.h" -#include "asn1/asn1c/constr_TYPE.h" /* RelativeDistinguishedName */ typedef struct RelativeDistinguishedName { diff --git a/src/asn1/asn1c/RevocationInfoChoice.h b/src/asn1/asn1c/RevocationInfoChoice.h index 97407314..ef5dd6ed 100644 --- a/src/asn1/asn1c/RevocationInfoChoice.h +++ b/src/asn1/asn1c/RevocationInfoChoice.h @@ -10,8 +10,6 @@ #include "asn1/asn1c/CertificateList.h" #include "asn1/asn1c/OtherRevocationInfoFormat.h" -#include "asn1/asn1c/constr_CHOICE.h" -#include "asn1/asn1c/constr_TYPE.h" /* Dependencies */ typedef enum RevocationInfoChoice_PR { diff --git a/src/asn1/asn1c/RevocationInfoChoices.h b/src/asn1/asn1c/RevocationInfoChoices.h index 707aa319..1d986fe3 100644 --- a/src/asn1/asn1c/RevocationInfoChoices.h +++ b/src/asn1/asn1c/RevocationInfoChoices.h @@ -9,9 +9,6 @@ #define _RevocationInfoChoices_H_ #include "asn1/asn1c/RevocationInfoChoice.h" -#include "asn1/asn1c/asn_SET_OF.h" -#include "asn1/asn1c/constr_SET_OF.h" -#include "asn1/asn1c/constr_TYPE.h" /* RevocationInfoChoices */ typedef struct RevocationInfoChoices { diff --git a/src/asn1/asn1c/RouteOriginAttestation.c b/src/asn1/asn1c/RouteOriginAttestation.c index a9c22f7f..826b639f 100644 --- a/src/asn1/asn1c/RouteOriginAttestation.c +++ b/src/asn1/asn1c/RouteOriginAttestation.c @@ -8,6 +8,7 @@ #include "asn1/asn1c/RouteOriginAttestation.h" #include "asn1/asn1c/asn_internal.h" +#include "asn1/asn1c/constr_SEQUENCE_OF.h" static int memb_ipAddrBlocks_constraint_1(const asn_TYPE_descriptor_t *td, const void *sptr, diff --git a/src/asn1/asn1c/RouteOriginAttestation.h b/src/asn1/asn1c/RouteOriginAttestation.h index 5a7e2b10..b1fdd2e0 100644 --- a/src/asn1/asn1c/RouteOriginAttestation.h +++ b/src/asn1/asn1c/RouteOriginAttestation.h @@ -9,12 +9,7 @@ #define _RouteOriginAttestation_H_ #include "asn1/asn1c/ASId.h" -#include "asn1/asn1c/INTEGER.h" #include "asn1/asn1c/ROAIPAddressFamily.h" -#include "asn1/asn1c/asn_SEQUENCE_OF.h" -#include "asn1/asn1c/constr_SEQUENCE.h" -#include "asn1/asn1c/constr_SEQUENCE_OF.h" -#include "asn1/asn1c/constr_TYPE.h" /* RouteOriginAttestation */ typedef struct RouteOriginAttestation { diff --git a/src/asn1/asn1c/SignatureAlgorithmIdentifier.h b/src/asn1/asn1c/SignatureAlgorithmIdentifier.h index 6575c3d3..a65845d9 100644 --- a/src/asn1/asn1c/SignatureAlgorithmIdentifier.h +++ b/src/asn1/asn1c/SignatureAlgorithmIdentifier.h @@ -9,7 +9,6 @@ #define _SignatureAlgorithmIdentifier_H_ #include "asn1/asn1c/AlgorithmIdentifier.h" -#include "asn1/asn1c/constr_TYPE.h" /* SignatureAlgorithmIdentifier */ typedef AlgorithmIdentifier_t SignatureAlgorithmIdentifier_t; diff --git a/src/asn1/asn1c/SignatureValue.h b/src/asn1/asn1c/SignatureValue.h index 2c5dbd82..c020bfc5 100644 --- a/src/asn1/asn1c/SignatureValue.h +++ b/src/asn1/asn1c/SignatureValue.h @@ -9,7 +9,6 @@ #define _SignatureValue_H_ #include "asn1/asn1c/OCTET_STRING.h" -#include "asn1/asn1c/constr_TYPE.h" /* SignatureValue */ typedef OCTET_STRING_t SignatureValue_t; diff --git a/src/asn1/asn1c/SignedAttributes.h b/src/asn1/asn1c/SignedAttributes.h index e54fc9eb..57043797 100644 --- a/src/asn1/asn1c/SignedAttributes.h +++ b/src/asn1/asn1c/SignedAttributes.h @@ -9,9 +9,7 @@ #define _SignedAttributes_H_ #include "asn1/asn1c/CMSAttribute.h" -#include "asn1/asn1c/asn_SET_OF.h" #include "asn1/asn1c/constr_SET_OF.h" -#include "asn1/asn1c/constr_TYPE.h" /* SignedAttributes */ typedef struct SignedAttributes { diff --git a/src/asn1/asn1c/SignedData.h b/src/asn1/asn1c/SignedData.h index 1d3a2d18..344ac834 100644 --- a/src/asn1/asn1c/SignedData.h +++ b/src/asn1/asn1c/SignedData.h @@ -8,14 +8,11 @@ #ifndef _SignedData_H_ #define _SignedData_H_ -#include "asn1/asn1c/CMSVersion.h" #include "asn1/asn1c/CertificateSet.h" #include "asn1/asn1c/DigestAlgorithmIdentifiers.h" #include "asn1/asn1c/EncapsulatedContentInfo.h" #include "asn1/asn1c/RevocationInfoChoices.h" #include "asn1/asn1c/SignerInfos.h" -#include "asn1/asn1c/constr_SEQUENCE.h" -#include "asn1/asn1c/constr_TYPE.h" /* SignedData */ typedef struct SignedData { diff --git a/src/asn1/asn1c/SignedDataPKCS7.h b/src/asn1/asn1c/SignedDataPKCS7.h index af3484ef..eaaa7523 100644 --- a/src/asn1/asn1c/SignedDataPKCS7.h +++ b/src/asn1/asn1c/SignedDataPKCS7.h @@ -8,14 +8,11 @@ #ifndef _SignedDataPKCS7_H_ #define _SignedDataPKCS7_H_ -#include "asn1/asn1c/CMSVersion.h" #include "asn1/asn1c/CertificateSet.h" #include "asn1/asn1c/DigestAlgorithmIdentifiers.h" #include "asn1/asn1c/EncapsulatedContentInfoPKCS7.h" #include "asn1/asn1c/RevocationInfoChoices.h" #include "asn1/asn1c/SignerInfos.h" -#include "asn1/asn1c/constr_SEQUENCE.h" -#include "asn1/asn1c/constr_TYPE.h" /* SignedDataPKCS7 */ typedef struct SignedDataPKCS7 { diff --git a/src/asn1/asn1c/SignerIdentifier.h b/src/asn1/asn1c/SignerIdentifier.h index 5cb7a84b..59059b6b 100644 --- a/src/asn1/asn1c/SignerIdentifier.h +++ b/src/asn1/asn1c/SignerIdentifier.h @@ -10,8 +10,6 @@ #include "asn1/asn1c/CMSSubjectKeyIdentifier.h" #include "asn1/asn1c/IssuerAndSerialNumber.h" -#include "asn1/asn1c/constr_CHOICE.h" -#include "asn1/asn1c/constr_TYPE.h" /* Dependencies */ typedef enum SignerIdentifier_PR { diff --git a/src/asn1/asn1c/SignerInfo.h b/src/asn1/asn1c/SignerInfo.h index 929ac402..292858d5 100644 --- a/src/asn1/asn1c/SignerInfo.h +++ b/src/asn1/asn1c/SignerInfo.h @@ -15,8 +15,6 @@ #include "asn1/asn1c/SignedAttributes.h" #include "asn1/asn1c/SignerIdentifier.h" #include "asn1/asn1c/UnsignedAttributes.h" -#include "asn1/asn1c/constr_SEQUENCE.h" -#include "asn1/asn1c/constr_TYPE.h" /* SignerInfo */ typedef struct SignerInfo { diff --git a/src/asn1/asn1c/SignerInfos.h b/src/asn1/asn1c/SignerInfos.h index 86430b09..6dd70404 100644 --- a/src/asn1/asn1c/SignerInfos.h +++ b/src/asn1/asn1c/SignerInfos.h @@ -9,9 +9,6 @@ #define _SignerInfos_H_ #include "asn1/asn1c/SignerInfo.h" -#include "asn1/asn1c/asn_SET_OF.h" -#include "asn1/asn1c/constr_SET_OF.h" -#include "asn1/asn1c/constr_TYPE.h" /* SignerInfos */ typedef struct SignerInfos { diff --git a/src/asn1/asn1c/SigningTime.h b/src/asn1/asn1c/SigningTime.h index a396e3e9..a37677e0 100644 --- a/src/asn1/asn1c/SigningTime.h +++ b/src/asn1/asn1c/SigningTime.h @@ -9,7 +9,6 @@ #define _SigningTime_H_ #include "asn1/asn1c/Time.h" -#include "asn1/asn1c/constr_TYPE.h" /* SigningTime */ typedef Time_t SigningTime_t; diff --git a/src/asn1/asn1c/TBSCertList.c b/src/asn1/asn1c/TBSCertList.c index 31b25b02..9d0dfb8d 100644 --- a/src/asn1/asn1c/TBSCertList.c +++ b/src/asn1/asn1c/TBSCertList.c @@ -7,6 +7,8 @@ #include "asn1/asn1c/TBSCertList.h" +#include "asn1/asn1c/constr_SEQUENCE_OF.h" + static asn_TYPE_member_t asn_MBR_Member_8[] = { { ATF_NOFLAGS, 0, offsetof(struct TBSCertList__revokedCertificates__Member, userCertificate), (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), diff --git a/src/asn1/asn1c/TBSCertList.h b/src/asn1/asn1c/TBSCertList.h index 8f083b5c..8bc70e49 100644 --- a/src/asn1/asn1c/TBSCertList.h +++ b/src/asn1/asn1c/TBSCertList.h @@ -14,10 +14,6 @@ #include "asn1/asn1c/Name.h" #include "asn1/asn1c/Time.h" #include "asn1/asn1c/Version.h" -#include "asn1/asn1c/asn_SEQUENCE_OF.h" -#include "asn1/asn1c/constr_SEQUENCE.h" -#include "asn1/asn1c/constr_SEQUENCE_OF.h" -#include "asn1/asn1c/constr_TYPE.h" /* Forward definitions */ typedef struct TBSCertList__revokedCertificates__Member { diff --git a/src/asn1/asn1c/Time.h b/src/asn1/asn1c/Time.h index 3ed85802..968514c8 100644 --- a/src/asn1/asn1c/Time.h +++ b/src/asn1/asn1c/Time.h @@ -11,7 +11,6 @@ #include "asn1/asn1c/GeneralizedTime.h" #include "asn1/asn1c/UTCTime.h" #include "asn1/asn1c/constr_CHOICE.h" -#include "asn1/asn1c/constr_TYPE.h" /* Dependencies */ typedef enum Time_PR { diff --git a/src/asn1/asn1c/UnsignedAttributes.h b/src/asn1/asn1c/UnsignedAttributes.h index a19a0c65..0356054b 100644 --- a/src/asn1/asn1c/UnsignedAttributes.h +++ b/src/asn1/asn1c/UnsignedAttributes.h @@ -9,9 +9,7 @@ #define _UnsignedAttributes_H_ #include "asn1/asn1c/CMSAttribute.h" -#include "asn1/asn1c/asn_SET_OF.h" #include "asn1/asn1c/constr_SET_OF.h" -#include "asn1/asn1c/constr_TYPE.h" /* UnsignedAttributes */ typedef struct UnsignedAttributes { diff --git a/src/asn1/asn1c/Version.h b/src/asn1/asn1c/Version.h index 1c744c1f..10052081 100644 --- a/src/asn1/asn1c/Version.h +++ b/src/asn1/asn1c/Version.h @@ -9,7 +9,6 @@ #define _Version_H_ #include "asn1/asn1c/INTEGER.h" -#include "asn1/asn1c/constr_TYPE.h" /* Dependencies */ typedef enum Version { diff --git a/src/asn1/asn1c/asn_SEQUENCE_OF.c b/src/asn1/asn1c/asn_SEQUENCE_OF.c index 39f873a8..af8b86e4 100644 --- a/src/asn1/asn1c/asn_SEQUENCE_OF.c +++ b/src/asn1/asn1c/asn_SEQUENCE_OF.c @@ -5,9 +5,6 @@ #include "asn1/asn1c/asn_SEQUENCE_OF.h" #include -#include -#include -#include typedef A_SEQUENCE_OF(void) asn_sequence; diff --git a/src/asn1/asn1c/asn_internal.h b/src/asn1/asn1c/asn_internal.h index 54aa25e1..d60826fb 100644 --- a/src/asn1/asn1c/asn_internal.h +++ b/src/asn1/asn1c/asn_internal.h @@ -10,7 +10,8 @@ #ifndef __EXTENSIONS__ #define __EXTENSIONS__ /* for Sun */ #endif -#include "asn1/asn1c/constr_TYPE.h" +#include "asn1/asn1c/asn_codecs.h" +#include "asn1/asn1c/asn_system.h" /* Environment version might be used to avoid running with the old library */ #define ASN1C_ENVIRONMENT_VERSION 923 /* Compile-time version */ diff --git a/src/asn1/asn1c/asn_ioc.h b/src/asn1/asn1c/asn_ioc.h index 0db8154c..c4500da5 100644 --- a/src/asn1/asn1c/asn_ioc.h +++ b/src/asn1/asn1c/asn_ioc.h @@ -6,7 +6,6 @@ #ifndef ASN_IOC_H #define ASN_IOC_H -#include "asn1/asn1c/asn_system.h" #include "asn1/asn1c/constr_TYPE.h" struct asn_ioc_cell_s; diff --git a/src/asn1/asn1c/constr_CHOICE.h b/src/asn1/asn1c/constr_CHOICE.h index 87c473e5..508731b9 100644 --- a/src/asn1/asn1c/constr_CHOICE.h +++ b/src/asn1/asn1c/constr_CHOICE.h @@ -46,7 +46,7 @@ extern asn_TYPE_operation_t asn_OP_CHOICE; * Return the 1-based choice variant presence index. * Returns 0 in case of error. */ -unsigned CHOICE_variant_get_presence(const asn_TYPE_descriptor_t *td, +unsigned int CHOICE_variant_get_presence(const asn_TYPE_descriptor_t *td, const void *structure_ptr); /* diff --git a/src/asn1/asn1c/constr_SEQUENCE_OF.h b/src/asn1/asn1c/constr_SEQUENCE_OF.h index ec2e4389..f789487e 100644 --- a/src/asn1/asn1c/constr_SEQUENCE_OF.h +++ b/src/asn1/asn1c/constr_SEQUENCE_OF.h @@ -6,7 +6,6 @@ #define _CONSTR_SEQUENCE_OF_H_ #include "asn1/asn1c/constr_SET_OF.h" -#include "asn1/asn1c/constr_TYPE.h" /* * A set specialized functions dealing with the SEQUENCE OF type. diff --git a/src/asn1/asn1c/constraints.h b/src/asn1/asn1c/constraints.h index 230bc232..d66e250d 100644 --- a/src/asn1/asn1c/constraints.h +++ b/src/asn1/asn1c/constraints.h @@ -5,7 +5,6 @@ #ifndef ASN1_CONSTRAINTS_VALIDATOR_H #define ASN1_CONSTRAINTS_VALIDATOR_H -#include "asn1/asn1c/asn_system.h" #include "asn1/asn1c/constr_TYPE.h" /* diff --git a/src/asn1/asn1c/json_encoder.h b/src/asn1/asn1c/json_encoder.h index 9acdc8ed..97bcefce 100644 --- a/src/asn1/asn1c/json_encoder.h +++ b/src/asn1/asn1c/json_encoder.h @@ -1,17 +1,6 @@ #ifndef SRC_ASN1_ASN1C_JSON_ENCODER_H_ #define SRC_ASN1_ASN1C_JSON_ENCODER_H_ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - #include "asn1/asn1c/constr_TYPE.h" json_t *json_encode( diff --git a/src/asn1/content_info.c b/src/asn1/content_info.c index 8088c632..ad657f6c 100644 --- a/src/asn1/content_info.c +++ b/src/asn1/content_info.c @@ -1,9 +1,7 @@ #include "asn1/content_info.h" -#include "asn1/asn1c/ContentType.h" #include "asn1/decode.h" #include "asn1/oid.h" -#include "file.h" #include "log.h" static int diff --git a/src/asn1/decode.c b/src/asn1/decode.c index 66862451..e531cf26 100644 --- a/src/asn1/decode.c +++ b/src/asn1/decode.c @@ -1,9 +1,6 @@ #include "asn1/decode.h" #include "asn1/asn1c/ber_decoder.h" -#include "asn1/asn1c/constraints.h" -#include "common.h" -#include "incidence/incidence.h" #include "log.h" #define COND_LOG(log, pr) (log ? pr : -EINVAL) diff --git a/src/asn1/decode.h b/src/asn1/decode.h index f16cbccb..beb9b269 100644 --- a/src/asn1/decode.h +++ b/src/asn1/decode.h @@ -4,7 +4,6 @@ #include #include "asn1/asn1c/ANY.h" -#include "asn1/asn1c/constr_TYPE.h" #include "file.h" int asn1_decode(const void *, size_t, asn_TYPE_descriptor_t const *, void **, diff --git a/src/asn1/oid.c b/src/asn1/oid.c index 5a331c06..a57dda89 100644 --- a/src/asn1/oid.c +++ b/src/asn1/oid.c @@ -1,8 +1,8 @@ #include "asn1/oid.h" +#include + #include "alloc.h" -#include "asn1/decode.h" -#include "common.h" #include "log.h" void diff --git a/src/asn1/oid.h b/src/asn1/oid.h index 4fb051c5..4022ace0 100644 --- a/src/asn1/oid.h +++ b/src/asn1/oid.h @@ -1,7 +1,6 @@ #ifndef SRC_OID_H_ #define SRC_OID_H_ -#include "asn1/asn1c/ANY.h" #include "asn1/asn1c/OBJECT_IDENTIFIER.h" #include "common.h" diff --git a/src/asn1/signed_data.c b/src/asn1/signed_data.c index 0d74bf16..5f9948ec 100644 --- a/src/asn1/signed_data.c +++ b/src/asn1/signed_data.c @@ -1,18 +1,15 @@ #include "asn1/signed_data.h" #include "algorithm.h" -#include "alloc.h" -#include "asn1/asn1c/ContentType.h" #include "asn1/asn1c/ContentTypePKCS7.h" #include "asn1/asn1c/MessageDigest.h" #include "asn1/asn1c/SignedDataPKCS7.h" #include "asn1/decode.h" #include "asn1/oid.h" -#include "config.h" #include "crypto/hash.h" #include "log.h" #include "object/certificate.h" -#include "thread_var.h" +#include "object/name.h" static const OID oid_cta = OID_CONTENT_TYPE_ATTR; static const OID oid_mda = OID_MESSAGE_DIGEST_ATTR; diff --git a/src/asn1/signed_data.h b/src/asn1/signed_data.h index 3ab2d03c..81b5f105 100644 --- a/src/asn1/signed_data.h +++ b/src/asn1/signed_data.h @@ -4,7 +4,7 @@ /* Some wrappers for asn1/asn1c/SignedData.h. */ #include "asn1/asn1c/SignedData.h" -#include "object/certificate.h" +#include "certificate_refs.h" #include "resource.h" struct ee_cert { diff --git a/src/cache/local_cache.c b/src/cache/local_cache.c index 506f7309..c509c744 100644 --- a/src/cache/local_cache.c +++ b/src/cache/local_cache.c @@ -4,17 +4,16 @@ #include #include -#include "alloc.h" #include "common.h" #include "config.h" #include "configure_ac.h" -#include "data_structure/array_list.h" #include "data_structure/path_builder.h" #include "data_structure/uthash.h" #include "file.h" #include "http/http.h" #include "json_util.h" #include "log.h" +#include "object/tal.h" #include "rrdp.h" #include "rsync/rsync.h" diff --git a/src/cert_stack.c b/src/cert_stack.c index be29978f..8f21a070 100644 --- a/src/cert_stack.c +++ b/src/cert_stack.c @@ -3,10 +3,7 @@ #include #include -#include "alloc.h" -#include "data_structure/array_list.h" -#include "object/name.h" -#include "resource.h" +#include "log.h" #include "str_token.h" #include "thread_var.h" diff --git a/src/cert_stack.h b/src/cert_stack.h index 8801ea42..3b7c324a 100644 --- a/src/cert_stack.h +++ b/src/cert_stack.h @@ -5,8 +5,6 @@ #include "object/certificate.h" #include "object/name.h" -#include "resource.h" -#include "types/uri.h" /* * One certificate stack is allocated per validation cycle, and it is used diff --git a/src/certificate_refs.c b/src/certificate_refs.c index acbf3ba7..1485bc48 100644 --- a/src/certificate_refs.c +++ b/src/certificate_refs.c @@ -1,7 +1,6 @@ #include "certificate_refs.h" #include "log.h" -#include "thread_var.h" void refs_init(struct certificate_refs *refs) diff --git a/src/config.c b/src/config.c index eb3e84b9..e010a973 100644 --- a/src/config.c +++ b/src/config.c @@ -1,11 +1,9 @@ #include "config.h" +#include #include -#include -#include #include -#include "alloc.h" #include "common.h" #include "config/boolean.h" #include "config/incidences.h" @@ -14,10 +12,11 @@ #include "config/work_offline.h" #include "configure_ac.h" #include "daemon.h" -#include "file.h" #include "init.h" #include "json_handler.h" #include "log.h" +#include "state.h" +#include "thread/thread_pool.h" /** * To add a member to this structure, diff --git a/src/config.h b/src/config.h index f4a480f3..32dd17fd 100644 --- a/src/config.h +++ b/src/config.h @@ -12,7 +12,6 @@ #include "config/mode.h" #include "config/output_format.h" #include "config/string_array.h" -#include "config/types.h" /* Init/destroy */ int handle_flags_config(int , char **); diff --git a/src/config/work_offline.h b/src/config/work_offline.h index 3815f0fd..f9797c30 100644 --- a/src/config/work_offline.h +++ b/src/config/work_offline.h @@ -1,6 +1,8 @@ #ifndef SRC_CONFIG_WORK_OFFLINE_H_ #define SRC_CONFIG_WORK_OFFLINE_H_ +#include "config/types.h" + extern const struct global_type gt_work_offline; #endif /* SRC_CONFIG_WORK_OFFLINE_H_ */ diff --git a/src/crypto/hash.c b/src/crypto/hash.c index fb967bfc..003df53b 100644 --- a/src/crypto/hash.c +++ b/src/crypto/hash.c @@ -2,8 +2,6 @@ #include -#include "alloc.h" -#include "asn1/oid.h" #include "common.h" #include "file.h" #include "log.h" diff --git a/src/data_structure/array_list.h b/src/data_structure/array_list.h index 7777ec25..4d027b38 100644 --- a/src/data_structure/array_list.h +++ b/src/data_structure/array_list.h @@ -1,8 +1,8 @@ #ifndef SRC_DATA_STRUCTURE_ARRAY_LIST_H_ #define SRC_DATA_STRUCTURE_ARRAY_LIST_H_ +#include "alloc.h" #include "data_structure/common.h" -#include "log.h" #define DEFINE_ARRAY_LIST_STRUCT(name, elem_type) \ struct name { \ diff --git a/src/data_structure/path_builder.c b/src/data_structure/path_builder.c index 4653379b..7731ba4f 100644 --- a/src/data_structure/path_builder.c +++ b/src/data_structure/path_builder.c @@ -2,10 +2,9 @@ #include -#include "alloc.h" #include "config.h" -#include "crypto/hash.h" #include "log.h" +#include "object/tal.h" #define SHA256_LEN (256 >> 3) /* 256 / 8, bits -> bytes */ diff --git a/src/data_structure/path_builder.h b/src/data_structure/path_builder.h index a3c39cd8..3f922ffc 100644 --- a/src/data_structure/path_builder.h +++ b/src/data_structure/path_builder.h @@ -1,9 +1,18 @@ #ifndef SRC_DATA_STRUCTURE_PATH_BUILDER_H_ #define SRC_DATA_STRUCTURE_PATH_BUILDER_H_ +#include #include - -#include "types/uri.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include struct path_builder { char *string; diff --git a/src/extension.c b/src/extension.c index 85ce331d..72531a36 100644 --- a/src/extension.c +++ b/src/extension.c @@ -4,8 +4,6 @@ #include #include -#include "cert_stack.h" -#include "common.h" #include "crypto/hash.h" #include "json_util.h" #include "libcrypto_util.h" diff --git a/src/file.c b/src/file.c index 72c34b49..29b1dce9 100644 --- a/src/file.c +++ b/src/file.c @@ -3,7 +3,7 @@ #include #include "alloc.h" -#include "data_structure/uthash.h" +#include "config/mode.h" #include "log.h" int diff --git a/src/http/http.c b/src/http/http.c index cfbcd356..2c4da138 100644 --- a/src/http/http.c +++ b/src/http/http.c @@ -2,11 +2,9 @@ #include -#include "alloc.h" #include "cache/local_cache.h" #include "common.h" #include "config.h" -#include "data_structure/uthash.h" #include "file.h" #include "log.h" diff --git a/src/init.c b/src/init.c index dd90fcec..a4d7e7e6 100644 --- a/src/init.c +++ b/src/init.c @@ -3,7 +3,6 @@ #include "config.h" #include "data_structure/path_builder.h" #include "http/http.h" -#include "log.h" static int fetch_url(char const *url, char const *filename) diff --git a/src/json_handler.c b/src/json_handler.c index 79504090..5c56c2a1 100644 --- a/src/json_handler.c +++ b/src/json_handler.c @@ -4,7 +4,6 @@ #include "alloc.h" #include "config.h" -#include "config/types.h" #include "log.h" static json_t * diff --git a/src/libcrypto_util.c b/src/libcrypto_util.c index db2e344b..f6ab8efe 100644 --- a/src/libcrypto_util.c +++ b/src/libcrypto_util.c @@ -7,7 +7,6 @@ #include #include -#include "alloc.h" #include "asn1/asn1c/OBJECT_IDENTIFIER.h" #include "extension.h" #include "json_util.h" diff --git a/src/main.c b/src/main.c index 4336a129..1d6295a3 100644 --- a/src/main.c +++ b/src/main.c @@ -3,11 +3,9 @@ #include "config.h" #include "extension.h" #include "http/http.h" -#include "incidence/incidence.h" #include "log.h" #include "nid.h" #include "print_file.h" -#include "rtr/db/vrps.h" #include "rtr/rtr.h" #include "thread_var.h" #include "xml/relax_ng.h" diff --git a/src/object/bgpsec.c b/src/object/bgpsec.c index 7847405d..8f5a45d6 100644 --- a/src/object/bgpsec.c +++ b/src/object/bgpsec.c @@ -1,6 +1,5 @@ #include "object/bgpsec.h" -#include "alloc.h" #include "log.h" #include "object/certificate.h" #include "validation_handler.h" diff --git a/src/object/certificate.c b/src/object/certificate.c index 1552afed..78d5abb8 100644 --- a/src/object/certificate.c +++ b/src/object/certificate.c @@ -11,26 +11,17 @@ #include #include #include +#include #include "algorithm.h" -#include "alloc.h" #include "asn1/asn1c/IPAddrBlocks.h" #include "asn1/decode.h" -#include "asn1/oid.h" -#include "cache/local_cache.h" -#include "cert_stack.h" +#include "common.h" #include "config.h" -#include "crypto/hash.h" -#include "data_structure/array_list.h" #include "extension.h" -#include "incidence/incidence.h" #include "log.h" #include "nid.h" -#include "object/bgpsec.h" #include "object/manifest.h" -#include "object/name.h" -#include "object/signed_object.h" -#include "rrdp.h" #include "str_token.h" #include "thread_var.h" diff --git a/src/object/certificate.h b/src/object/certificate.h index 80454258..37413f52 100644 --- a/src/object/certificate.h +++ b/src/object/certificate.h @@ -5,8 +5,6 @@ #include "asn1/asn1c/SignatureValue.h" #include "certificate_refs.h" #include "resource.h" -#include "rpp.h" -#include "types/uri.h" /* Certificate types in the RPKI */ enum cert_type { diff --git a/src/object/crl.c b/src/object/crl.c index b075dca6..62c5efdd 100644 --- a/src/object/crl.c +++ b/src/object/crl.c @@ -8,7 +8,6 @@ #include "extension.h" #include "log.h" #include "object/name.h" -#include "thread_var.h" static int __crl_load(struct rpki_uri *uri, X509_CRL **result) diff --git a/src/object/ghostbusters.c b/src/object/ghostbusters.c index b25cc084..2aae9912 100644 --- a/src/object/ghostbusters.c +++ b/src/object/ghostbusters.c @@ -1,6 +1,5 @@ #include "object/ghostbusters.h" -#include "asn1/oid.h" #include "log.h" #include "object/signed_object.h" #include "object/vcard.h" diff --git a/src/object/ghostbusters.h b/src/object/ghostbusters.h index f93db38b..84087b75 100644 --- a/src/object/ghostbusters.h +++ b/src/object/ghostbusters.h @@ -2,7 +2,6 @@ #define SRC_OBJECT_GHOSTBUSTERS_H_ #include "rpp.h" -#include "types/uri.h" int ghostbusters_traverse(struct rpki_uri *, struct rpp *); diff --git a/src/object/manifest.c b/src/object/manifest.c index bee421ce..50e0d4fa 100644 --- a/src/object/manifest.c +++ b/src/object/manifest.c @@ -1,18 +1,10 @@ -#include - #include "object/manifest.h" #include "algorithm.h" -#include "asn1/asn1c/GeneralizedTime.h" #include "asn1/asn1c/Manifest.h" #include "asn1/decode.h" -#include "asn1/oid.h" -#include "common.h" #include "crypto/hash.h" #include "log.h" -#include "object/certificate.h" -#include "object/crl.h" -#include "object/roa.h" #include "object/signed_object.h" #include "thread_var.h" diff --git a/src/object/name.c b/src/object/name.c index f1b66b39..e8c3d728 100644 --- a/src/object/name.c +++ b/src/object/name.c @@ -5,8 +5,6 @@ #include #include -#include "alloc.h" -#include "cert_stack.h" #include "log.h" #include "thread_var.h" diff --git a/src/object/roa.c b/src/object/roa.c index 42e0379f..0b4067ab 100644 --- a/src/object/roa.c +++ b/src/object/roa.c @@ -2,8 +2,6 @@ #include "asn1/asn1c/RouteOriginAttestation.h" #include "asn1/decode.h" -#include "asn1/oid.h" -#include "config.h" #include "log.h" #include "object/signed_object.h" #include "thread_var.h" diff --git a/src/object/roa.h b/src/object/roa.h index e8de49b5..3efb97a3 100644 --- a/src/object/roa.h +++ b/src/object/roa.h @@ -2,8 +2,6 @@ #define SRC_OBJECT_ROA_H_ #include "rpp.h" -#include "types/address.h" -#include "types/uri.h" int roa_traverse(struct rpki_uri *, struct rpp *); diff --git a/src/object/signed_object.h b/src/object/signed_object.h index 07cfdf1a..89155dd5 100644 --- a/src/object/signed_object.h +++ b/src/object/signed_object.h @@ -1,6 +1,7 @@ #ifndef SRC_OBJECT_SIGNED_OBJECT_H_ #define SRC_OBJECT_SIGNED_OBJECT_H_ +#include "asn1/asn1c/ContentInfo.h" #include "asn1/oid.h" #include "asn1/signed_data.h" diff --git a/src/object/tal.c b/src/object/tal.c index 2a60f655..41d8d17a 100644 --- a/src/object/tal.c +++ b/src/object/tal.c @@ -5,19 +5,12 @@ #include #include -#include "alloc.h" -#include "cache/local_cache.h" -#include "cert_stack.h" #include "common.h" #include "config.h" #include "crypto/base64.h" #include "line_file.h" #include "log.h" -#include "object/certificate.h" -#include "rtr/db/vrps.h" -#include "state.h" #include "thread_var.h" -#include "validation_handler.h" typedef int (*foreach_uri_cb)(struct tal *, struct rpki_uri *, void *); diff --git a/src/object/tal.h b/src/object/tal.h index cd909464..2fa1ef8f 100644 --- a/src/object/tal.h +++ b/src/object/tal.h @@ -3,8 +3,8 @@ /* This is RFC 8630. */ +#include "cache/local_cache.h" #include "rtr/db/db_table.h" -#include "types/uri.h" struct tal; diff --git a/src/output_printer.c b/src/output_printer.c index c4f8fb8d..8ef4ae51 100644 --- a/src/output_printer.c +++ b/src/output_printer.c @@ -1,11 +1,9 @@ #include "output_printer.h" -#include "common.h" #include "config.h" #include "crypto/base64.h" #include "file.h" #include "log.h" -#include "types/vrp.h" typedef struct json_out { FILE *file; diff --git a/src/print_file.c b/src/print_file.c index 404cd4ac..dcd601ad 100644 --- a/src/print_file.c +++ b/src/print_file.c @@ -1,18 +1,19 @@ #include "print_file.h" +#include + #include "asn1/asn1c/CRL.h" #include "asn1/asn1c/Certificate.h" +#include "asn1/asn1c/ContentInfo.h" #include "asn1/asn1c/ber_decoder.h" #include "asn1/asn1c/json_encoder.h" -#include "asn1/content_info.h" #include "common.h" #include "config.h" #include "data_structure/path_builder.h" -#include "file.h" #include "log.h" +#include "object/tal.h" #include "rsync/rsync.h" #include "types/bio_seq.h" -#include "types/uri.h" #define HDRSIZE 32 diff --git a/src/resource.c b/src/resource.c index 33ee85e6..793acfc7 100644 --- a/src/resource.c +++ b/src/resource.c @@ -2,14 +2,11 @@ #include -#include "alloc.h" -#include "cert_stack.h" #include "log.h" #include "resource/ip4.h" #include "resource/ip6.h" #include "sorted_array.h" #include "thread_var.h" -#include "types/address.h" /* The resources we extracted from one certificate. */ struct resources { diff --git a/src/resource/asn.c b/src/resource/asn.c index cdc51346..d9bebdc0 100644 --- a/src/resource/asn.c +++ b/src/resource/asn.c @@ -1,6 +1,5 @@ #include "resource/asn.h" -#include "log.h" #include "sorted_array.h" struct asn_cb { diff --git a/src/resource/asn.h b/src/resource/asn.h index 058cbd33..2d16c28e 100644 --- a/src/resource/asn.h +++ b/src/resource/asn.h @@ -4,7 +4,6 @@ #include #include "as_number.h" -#include "asn1/asn1c/ASId.h" /* * Implementation note: This is just a casted struct sorted_array. diff --git a/src/rpp.c b/src/rpp.c index 42b0e4af..5854efaf 100644 --- a/src/rpp.c +++ b/src/rpp.c @@ -1,15 +1,10 @@ #include "rpp.h" -#include "alloc.h" -#include "cert_stack.h" -#include "data_structure/array_list.h" #include "log.h" -#include "object/certificate.h" #include "object/crl.h" #include "object/ghostbusters.h" #include "object/roa.h" #include "thread_var.h" -#include "types/uri.h" /** A Repository Publication Point (RFC 6481), as described by some manifest. */ struct rpp { diff --git a/src/rrdp.c b/src/rrdp.c index 4e2a74eb..98638e4d 100644 --- a/src/rrdp.c +++ b/src/rrdp.c @@ -1,12 +1,9 @@ #include "rrdp.h" #include -#include #include #include -#include "alloc.h" -#include "cache/local_cache.h" #include "common.h" #include "crypto/base64.h" #include "crypto/hash.h" diff --git a/src/rtr/db/db_table.h b/src/rtr/db/db_table.h index af86cdfd..a763c957 100644 --- a/src/rtr/db/db_table.h +++ b/src/rtr/db/db_table.h @@ -3,7 +3,6 @@ #include "rtr/db/delta.h" #include "types/address.h" -#include "types/vrp.h" struct db_table; diff --git a/src/rtr/db/delta.c b/src/rtr/db/delta.c index 1689e3f5..c5611bca 100644 --- a/src/rtr/db/delta.c +++ b/src/rtr/db/delta.c @@ -2,8 +2,8 @@ #include -#include "alloc.h" #include "data_structure/array_list.h" +#include "log.h" #include "types/address.h" struct delta_v4 { diff --git a/src/rtr/db/deltas_array.c b/src/rtr/db/deltas_array.c index 48b9069e..85025fe3 100644 --- a/src/rtr/db/deltas_array.c +++ b/src/rtr/db/deltas_array.c @@ -5,7 +5,6 @@ #include "alloc.h" #include "config.h" -#include "log.h" struct deltas_array { struct deltas **array; /* It's a circular array. */ diff --git a/src/rtr/db/vrps.c b/src/rtr/db/vrps.c index 97a95175..f23107d6 100644 --- a/src/rtr/db/vrps.c +++ b/src/rtr/db/vrps.c @@ -3,17 +3,14 @@ #include #include -#include "alloc.h" #include "common.h" #include "config.h" -#include "data_structure/array_list.h" +#include "log.h" #include "object/tal.h" #include "output_printer.h" -#include "rtr/db/db_table.h" -#include "rtr/rtr.h" +#include "rtr/db/deltas_array.h" +#include "rtr/pdu.h" #include "slurm/slurm_loader.h" -#include "types/router_key.h" -#include "validation_handler.h" struct vrp_node { struct delta_vrp delta; diff --git a/src/rtr/db/vrps.h b/src/rtr/db/vrps.h index 0020f6d1..f3a65211 100644 --- a/src/rtr/db/vrps.h +++ b/src/rtr/db/vrps.h @@ -8,8 +8,9 @@ */ #include "as_number.h" -#include "rtr/db/deltas_array.h" #include "types/address.h" +#include "types/delta.h" +#include "types/serial.h" int vrps_init(void); void vrps_destroy(void); diff --git a/src/rtr/err_pdu.c b/src/rtr/err_pdu.c index bf032def..6af11313 100644 --- a/src/rtr/err_pdu.c +++ b/src/rtr/err_pdu.c @@ -3,7 +3,6 @@ #include #include "alloc.h" -#include "log.h" #include "rtr/pdu_sender.h" typedef enum rtr_error_code { diff --git a/src/rtr/pdu.h b/src/rtr/pdu.h index b25c1dda..3a364b09 100644 --- a/src/rtr/pdu.h +++ b/src/rtr/pdu.h @@ -1,17 +1,18 @@ #ifndef RTR_PDU_H_ #define RTR_PDU_H_ +#include +#include +#include #include +#include #include #include #include #include +#include #include -#include "common.h" -#include "rtr/rtr.h" -#include "types/router_key.h" - enum rtr_version { RTR_V0 = 0, RTR_V1 = 1, diff --git a/src/rtr/pdu_handler.c b/src/rtr/pdu_handler.c index dd82eb01..5a419140 100644 --- a/src/rtr/pdu_handler.c +++ b/src/rtr/pdu_handler.c @@ -3,9 +3,9 @@ #include #include "log.h" +#include "rtr/db/vrps.h" #include "rtr/err_pdu.h" #include "rtr/pdu_sender.h" -#include "rtr/pdu_stream.h" struct send_delta_args { int fd; diff --git a/src/rtr/pdu_sender.c b/src/rtr/pdu_sender.c index dfdf8343..41e10e6b 100644 --- a/src/rtr/pdu_sender.c +++ b/src/rtr/pdu_sender.c @@ -4,7 +4,6 @@ #include #include "alloc.h" -#include "common.h" #include "config.h" #include "log.h" #include "rtr/db/vrps.h" diff --git a/src/rtr/pdu_sender.h b/src/rtr/pdu_sender.h index a3009be1..ed1b709e 100644 --- a/src/rtr/pdu_sender.h +++ b/src/rtr/pdu_sender.h @@ -1,9 +1,10 @@ #ifndef SRC_RTR_PDU_SENDER_H_ #define SRC_RTR_PDU_SENDER_H_ -#include "rtr/db/vrps.h" #include "rtr/pdu.h" #include "types/router_key.h" +#include "types/serial.h" +#include "types/vrp.h" int send_serial_notify_pdu(int, uint8_t, serial_t); int send_cache_reset_pdu(int, uint8_t); diff --git a/src/rtr/pdu_stream.c b/src/rtr/pdu_stream.c index f28906f3..416dc05d 100644 --- a/src/rtr/pdu_stream.c +++ b/src/rtr/pdu_stream.c @@ -5,7 +5,6 @@ #include "alloc.h" #include "log.h" #include "rtr/err_pdu.h" -#include "rtr/pdu.h" enum buffer_state { /* We've read all available bytes for now. */ diff --git a/src/rtr/pdu_stream.h b/src/rtr/pdu_stream.h index 46222914..e827aa9e 100644 --- a/src/rtr/pdu_stream.h +++ b/src/rtr/pdu_stream.h @@ -1,9 +1,9 @@ #ifndef SRC_RTR_PDU_STREAM_H_ #define SRC_RTR_PDU_STREAM_H_ -#include "data_structure/array_list.h" +#include + #include "rtr/pdu.h" -#include "rtr/rtr.h" struct pdu_stream; /* It's an *input* stream. */ diff --git a/src/rtr/rtr.c b/src/rtr/rtr.c index 69d9e96a..3fc7501d 100644 --- a/src/rtr/rtr.c +++ b/src/rtr/rtr.c @@ -4,18 +4,14 @@ #include #include -#include "alloc.h" +#include "common.h" #include "config.h" #include "data_structure/array_list.h" +#include "log.h" #include "rtr/db/vrps.h" -#include "rtr/err_pdu.h" -#include "rtr/pdu.h" #include "rtr/pdu_handler.h" #include "rtr/pdu_sender.h" -#include "rtr/pdu_stream.h" #include "thread/thread_pool.h" -#include "types/address.h" -#include "types/serial.h" struct rtr_server { int fd; diff --git a/src/slurm/db_slurm.c b/src/slurm/db_slurm.c index 44d38dca..ab9329e7 100644 --- a/src/slurm/db_slurm.c +++ b/src/slurm/db_slurm.c @@ -3,11 +3,10 @@ #include #include -#include "alloc.h" #include "common.h" #include "crypto/base64.h" #include "data_structure/array_list.h" -#include "types/router_key.h" +#include "log.h" struct slurm_prefix_wrap { struct slurm_prefix element; diff --git a/src/slurm/slurm_loader.c b/src/slurm/slurm_loader.c index 91ace54b..883a57dd 100644 --- a/src/slurm/slurm_loader.c +++ b/src/slurm/slurm_loader.c @@ -2,7 +2,6 @@ #include -#include "alloc.h" #include "common.h" #include "config.h" #include "crypto/hash.h" diff --git a/src/slurm/slurm_parser.c b/src/slurm/slurm_parser.c index 9c236e09..690106f7 100644 --- a/src/slurm/slurm_parser.c +++ b/src/slurm/slurm_parser.c @@ -10,7 +10,6 @@ #include "log.h" #include "slurm/db_slurm.h" #include "types/address.h" -#include "types/router_key.h" /* JSON members */ #define SLURM_VERSION "slurmVersion" diff --git a/src/state.c b/src/state.c index 5b1d30f0..40449939 100644 --- a/src/state.c +++ b/src/state.c @@ -1,8 +1,5 @@ #include "state.h" -#include "alloc.h" -#include "cache/local_cache.h" -#include "cert_stack.h" #include "log.h" #include "thread_var.h" diff --git a/src/state.h b/src/state.h index 1da419a7..431cc58f 100644 --- a/src/state.h +++ b/src/state.h @@ -1,6 +1,7 @@ #ifndef SRC_STATE_H_ #define SRC_STATE_H_ +#include "cert_stack.h" #include "object/tal.h" #include "validation_handler.h" diff --git a/src/thread_var.c b/src/thread_var.c index 1cc35be9..1d891011 100644 --- a/src/thread_var.c +++ b/src/thread_var.c @@ -2,8 +2,6 @@ #include -#include "alloc.h" -#include "config.h" #include "log.h" static pthread_key_t state_key; diff --git a/src/types/address.h b/src/types/address.h index 188c89b2..7dbe6ecf 100644 --- a/src/types/address.h +++ b/src/types/address.h @@ -5,7 +5,6 @@ #include #include -#include "asn1/asn1c/IPAddress.h" #include "asn1/asn1c/IPAddressRange.h" struct ipv4_prefix { diff --git a/src/types/uri.c b/src/types/uri.c index cdc0f4dd..e1dfd873 100644 --- a/src/types/uri.c +++ b/src/types/uri.c @@ -1,15 +1,10 @@ #include "types/uri.h" -#include "alloc.h" #include "common.h" #include "config.h" -#include "config/filename_format.h" #include "data_structure/path_builder.h" #include "log.h" -#include "rrdp.h" -#include "state.h" -#include "str_token.h" -#include "thread_var.h" +#include "object/tal.h" /** * Design notes: diff --git a/src/types/uri.h b/src/types/uri.h index 8e7392fb..9eb27915 100644 --- a/src/types/uri.h +++ b/src/types/uri.h @@ -1,6 +1,8 @@ #ifndef SRC_TYPES_URI_H_ #define SRC_TYPES_URI_H_ +#include + #include "asn1/asn1c/IA5String.h" #include "data_structure/array_list.h" diff --git a/src/validation_handler.h b/src/validation_handler.h index 9beec0a0..2e284c1f 100644 --- a/src/validation_handler.h +++ b/src/validation_handler.h @@ -1,10 +1,7 @@ #ifndef SRC_VALIDATION_HANDLER_H_ #define SRC_VALIDATION_HANDLER_H_ -#include "as_number.h" -#include "object/name.h" -#include "types/address.h" -#include "types/router_key.h" +#include "rtr/db/vrps.h" /** * Functions that handle validation results. diff --git a/src/xml/relax_ng.c b/src/xml/relax_ng.c index 21f28314..070e24d3 100644 --- a/src/xml/relax_ng.c +++ b/src/xml/relax_ng.c @@ -2,7 +2,6 @@ #include #include -#include #include #include "log.h"