aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/openac/Makefile.am10
-rw-r--r--src/openac/build.c3
-rw-r--r--src/pluto/Makefile.am15
-rw-r--r--src/pluto/ac.c2
-rw-r--r--src/pluto/asn1.c2
-rw-r--r--src/pluto/crl.c2
-rw-r--r--src/pluto/ocsp.c2
-rw-r--r--src/pluto/oid.pl123
-rw-r--r--src/pluto/oid.txt194
-rw-r--r--src/pluto/pkcs1.c2
-rw-r--r--src/pluto/pkcs7.c2
-rw-r--r--src/pluto/x509.c2
-rw-r--r--src/scepclient/Makefile.am27
-rw-r--r--src/scepclient/pkcs10.c2
-rw-r--r--src/scepclient/scep.c2
-rw-r--r--src/scepclient/scepclient.c2
16 files changed, 40 insertions, 352 deletions
diff --git a/src/openac/Makefile.am b/src/openac/Makefile.am
index c1e2a593a..27dba295a 100644
--- a/src/openac/Makefile.am
+++ b/src/openac/Makefile.am
@@ -1,9 +1,13 @@
ipsec_PROGRAMS = openac
openac_SOURCES = openac.c build.c build.h loglite.c
+PLUTODIR=$(top_srcdir)/src/pluto
+LIBSTRONGSWANDIR=$(top_srcdir)/src/libstrongswan
+
INCLUDES = \
-I$(top_srcdir)/src/libfreeswan \
--I$(top_srcdir)/src/pluto \
+-I$(LIBSTRONGSWANDIR)\
+-I$(PLUTODIR) \
-I$(top_srcdir)/src/libcrypto \
-I$(top_srcdir)/src/whack
@@ -25,8 +29,6 @@ endif
dist_man_MANS = openac.8
-PLUTODIR=$(top_srcdir)/src/pluto
-
ac.o : $(PLUTODIR)/ac.c $(PLUTODIR)/ac.h
$(COMPILE) -c -o $@ $<
@@ -72,7 +74,7 @@ md5.o : $(PLUTODIR)/md5.c $(PLUTODIR)/md5.h
ocsp.o : $(PLUTODIR)/ocsp.c $(PLUTODIR)/ocsp.h
$(COMPILE) -c -o $@ $<
-oid.o : $(PLUTODIR)/oid.c $(PLUTODIR)/oid.h
+oid.o : $(LIBSTRONGSWANDIR)/asn1/oid.c $(LIBSTRONGSWANDIR)/asn1/oid.h
$(COMPILE) -c -o $@ $<
pem.o : $(PLUTODIR)/pem.c $(PLUTODIR)/pem.h
diff --git a/src/openac/build.c b/src/openac/build.c
index 0c6a2be3b..9d97ed539 100644
--- a/src/openac/build.c
+++ b/src/openac/build.c
@@ -21,9 +21,10 @@
#include <freeswan.h>
+#include <asn1/oid.h>
+
#include "../pluto/constants.h"
#include "../pluto/defs.h"
-#include "../pluto/oid.h"
#include "../pluto/asn1.h"
#include "../pluto/x509.h"
#include "../pluto/log.h"
diff --git a/src/pluto/Makefile.am b/src/pluto/Makefile.am
index 9aeac029d..38fb1cbf9 100644
--- a/src/pluto/Makefile.am
+++ b/src/pluto/Makefile.am
@@ -42,7 +42,6 @@ modecfg.c modecfg.h \
mp_defs.c mp_defs.h \
nat_traversal.c nat_traversal.h \
ocsp.c ocsp.h \
-oid.c oid.h \
packet.c packet.h \
pem.c pem.h \
pgp.c pgp.h \
@@ -68,8 +67,11 @@ rsaref/pkcs11t.h rsaref/pkcs11.h rsaref/unix.h rsaref/pkcs11f.h
_pluto_adns_SOURCES = adns.c adns.h
+LIBSTRONGSWANDIR=$(top_srcdir)/src/libstrongswan
+
INCLUDES = \
-I${linuxdir} \
+-I$(LIBSTRONGSWANDIR)\
-I$(top_srcdir)/src/libfreeswan \
-I$(top_srcdir)/src/libcrypto \
-I$(top_srcdir)/src/whack
@@ -83,6 +85,7 @@ AM_CFLAGS = \
-DPLUTO -DKLIPS -DDEBUG -DTHREADS
pluto_LDADD = \
+oid.o \
$(top_srcdir)/src/libfreeswan/libfreeswan.a \
$(top_srcdir)/src/libcrypto/libcrypto.a \
-lgmp -lresolv -lpthread -ldl
@@ -92,15 +95,9 @@ $(top_srcdir)/src/libfreeswan/libfreeswan.a \
-lresolv -ldl
dist_man_MANS = pluto.8 ipsec.secrets.5
-EXTRA_DIST = oid.pl oid.txt
-BUILT_SOURCES = oid.c oid.h
-MAINTAINERCLEANFILES = oid.c oid.h
-
-oid.c: oid.txt oid.pl
- $(PERL) oid.pl
-oid.h: oid.txt oid.pl
- $(PERL) oid.pl
+oid.o : $(LIBSTRONGSWANDIR)/asn1/oid.c $(LIBSTRONGSWANDIR)/asn1/oid.h
+ $(COMPILE) -c -o $@ $<
# This compile option activates the sending of a strongSwan VID
if USE_VENDORID
diff --git a/src/pluto/ac.c b/src/pluto/ac.c
index bcf5f80d1..3eea23936 100644
--- a/src/pluto/ac.c
+++ b/src/pluto/ac.c
@@ -28,7 +28,7 @@
#include "constants.h"
#include "defs.h"
#include "asn1.h"
-#include "oid.h"
+#include <asn1/oid.h>
#include "ac.h"
#include "x509.h"
#include "crl.h"
diff --git a/src/pluto/asn1.c b/src/pluto/asn1.c
index 0663bc490..3b79c24b4 100644
--- a/src/pluto/asn1.c
+++ b/src/pluto/asn1.c
@@ -24,7 +24,7 @@
#include "defs.h"
#include "mp_defs.h"
#include "asn1.h"
-#include "oid.h"
+#include <asn1/oid.h>
#include "log.h"
/* some common prefabricated ASN.1 constants */
diff --git a/src/pluto/crl.c b/src/pluto/crl.c
index dc8932769..bb4105120 100644
--- a/src/pluto/crl.c
+++ b/src/pluto/crl.c
@@ -29,7 +29,7 @@
#include "defs.h"
#include "log.h"
#include "asn1.h"
-#include "oid.h"
+#include <asn1/oid.h>
#include "x509.h"
#include "crl.h"
#include "ca.h"
diff --git a/src/pluto/ocsp.c b/src/pluto/ocsp.c
index a338be446..e3d6514c6 100644
--- a/src/pluto/ocsp.c
+++ b/src/pluto/ocsp.c
@@ -35,7 +35,7 @@
#include "asn1.h"
#include "certs.h"
#include "smartcard.h"
-#include "oid.h"
+#include <asn1/oid.h>
#include "whack.h"
#include "pkcs1.h"
#include "keys.h"
diff --git a/src/pluto/oid.pl b/src/pluto/oid.pl
deleted file mode 100644
index 52ac8eae0..000000000
--- a/src/pluto/oid.pl
+++ /dev/null
@@ -1,123 +0,0 @@
-#!/usr/bin/perl
-# Generates oid.h and oid.c out of oid.txt
-# Copyright (C) 2003-2004 Andreas Steffen, Zuercher Hochschule Winterthur
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation; either version 2 of the License, or (at your
-# option) any later version. See <http://www.fsf.org/copyleft/gpl.txt>.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# for more details.
-#
-
-$copyright="Copyright (C) 2003-2004 Andreas Steffen, Zuercher Hochschule Winterthur";
-$automatic="This file has been automatically generated by the script oid.pl";
-$warning="Do not edit manually!";
-
-print "oid.pl generating oid.h and oid.c\n";
-
-# Generate oid.h
-
-open(OID_H, ">oid.h")
- or die "could not open 'oid.h': $!";
-
-print OID_H "/* Object identifiers (OIDs) used by FreeS/WAN\n",
- " * ", $copyright, "\n",
- " * \n",
- " * ", $automatic, "\n",
- " * ", $warning, "\n",
- " */\n\n",
- "typedef struct {\n",
- " u_char octet;\n",
- " u_int next;\n",
- " u_int down;\n",
- " const u_char *name;\n",
- "} oid_t;\n",
- "\n",
- "extern const oid_t oid_names[];\n",
- "\n",
- "#define OID_UNKNOWN -1\n";
-
-# parse oid.txt
-
-open(SRC, "<oid.txt")
- or die "could not open 'oid.txt': $!";
-
-$counter = 0;
-$max_name = 0;
-$max_order = 0;
-
-while ($line = <SRC>)
-{
- $line =~ m/( *?)(0x\w{2})\s+(".*?")[ \t]*?([\w_]*?)\Z/;
-
- @order[$counter] = length($1);
- @octet[$counter] = $2;
- @name[$counter] = $3;
-
- if (length($1) > $max_order)
- {
- $max_order = length($1);
- }
- if (length($3) > $max_name)
- {
- $max_name = length($3);
- }
- if (length($4) > 0)
- {
- printf OID_H "#define %s%s%d\n", $4, "\t" x ((39-length($4))/8), $counter;
- }
- $counter++;
-}
-
-close SRC;
-close OID_H;
-
-# Generate oid.c
-
-open(OID_C, ">oid.c")
- or die "could not open 'oid.c': $!";
-
-print OID_C "/* List of some useful object identifiers (OIDs)\n",
- " * ", $copyright, "\n",
- " * \n",
- " * ", $automatic, "\n",
- " * ", $warning, "\n",
- " */\n",
- "\n",
- "#include <stdlib.h>\n",
- "\n",
- "#include \"oid.h\"\n",
- "\n",
- "const oid_t oid_names[] = {\n";
-
-for ($c = 0; $c < $counter; $c++)
-{
- $next = 0;
-
- for ($d = $c+1; $d < $counter && @order[$d] >= @order[$c]; $d++)
- {
- if (@order[$d] == @order[$c])
- {
- @next[$c] = $d;
- last;
- }
- }
-
- printf OID_C " {%s%s,%s%3d, %d, %s%s}%s /* %3d */\n"
- ,' ' x @order[$c]
- , @octet[$c]
- , ' ' x (1 + $max_order - @order[$c])
- , @next[$c]
- , @order[$c+1] > @order[$c]
- , @name[$c]
- , ' ' x ($max_name - length(@name[$c]))
- , $c != $counter-1 ? "," : " "
- , $c;
-}
-
-print OID_C "};\n" ;
-close OID_C;
diff --git a/src/pluto/oid.txt b/src/pluto/oid.txt
deleted file mode 100644
index c297adc19..000000000
--- a/src/pluto/oid.txt
+++ /dev/null
@@ -1,194 +0,0 @@
-0x02 "ITU-T Administration"
- 0x82 ""
- 0x06 "Germany ITU-T member"
- 0x01 "Deutsche Telekom AG"
- 0x0A ""
- 0x07 ""
- 0x14 "ND"
-0x09 "data"
- 0x92 ""
- 0x26 ""
- 0x89 ""
- 0x93 ""
- 0xF2 ""
- 0x2C ""
- 0x64 "pilot"
- 0x01 "pilotAttributeType"
- 0x01 "UID"
- 0x19 "DC"
-0x55 "X.500"
- 0x04 "X.509"
- 0x03 "CN"
- 0x04 "S"
- 0x05 "SN"
- 0x06 "C"
- 0x07 "L"
- 0x08 "ST"
- 0x0A "O"
- 0x0B "OU"
- 0x0C "T"
- 0x0D "D"
- 0x24 "userCertificate"
- 0x29 "N"
- 0x2A "G"
- 0x2B "I"
- 0x2D "ID"
- 0x48 "role" OID_ROLE
- 0x1D "id-ce"
- 0x09 "subjectDirectoryAttrs"
- 0x0E "subjectKeyIdentifier" OID_SUBJECT_KEY_ID
- 0x0F "keyUsage"
- 0x10 "privateKeyUsagePeriod"
- 0x11 "subjectAltName" OID_SUBJECT_ALT_NAME
- 0x12 "issuerAltName"
- 0x13 "basicConstraints" OID_BASIC_CONSTRAINTS
- 0x14 "crlNumber" OID_CRL_NUMBER
- 0x15 "reasonCode" OID_CRL_REASON_CODE
- 0x1F "crlDistributionPoints" OID_CRL_DISTRIBUTION_POINTS
- 0x20 "certificatePolicies"
- 0x23 "authorityKeyIdentifier" OID_AUTHORITY_KEY_ID
- 0x25 "extendedKeyUsage" OID_EXTENDED_KEY_USAGE
- 0x37 "targetInformation" OID_TARGET_INFORMATION
- 0x38 "noRevAvail" OID_NO_REV_AVAIL
-0x2A ""
- 0x86 ""
- 0x48 ""
- 0x86 ""
- 0xF6 ""
- 0x7D "NortelNetworks"
- 0x07 "Entrust"
- 0x41 "nsn-ce"
- 0x00 "entrustVersInfo"
- 0xF7 ""
- 0x0D "RSADSI"
- 0x01 "PKCS"
- 0x01 "PKCS-1"
- 0x01 "rsaEncryption" OID_RSA_ENCRYPTION
- 0x02 "md2WithRSAEncryption" OID_MD2_WITH_RSA
- 0x04 "md5WithRSAEncryption" OID_MD5_WITH_RSA
- 0x05 "sha-1WithRSAEncryption" OID_SHA1_WITH_RSA
- 0x0B "sha256WithRSAEncryption" OID_SHA256_WITH_RSA
- 0x0C "sha384WithRSAEncryption" OID_SHA384_WITH_RSA
- 0x0D "sha512WithRSAEncryption" OID_SHA512_WITH_RSA
- 0x07 "PKCS-7"
- 0x01 "data" OID_PKCS7_DATA
- 0x02 "signedData" OID_PKCS7_SIGNED_DATA
- 0x03 "envelopedData" OID_PKCS7_ENVELOPED_DATA
- 0x04 "signedAndEnvelopedData" OID_PKCS7_SIGNED_ENVELOPED_DATA
- 0x05 "digestedData" OID_PKCS7_DIGESTED_DATA
- 0x06 "encryptedData" OID_PKCS7_ENCRYPTED_DATA
- 0x09 "PKCS-9"
- 0x01 "E" OID_PKCS9_EMAIL
- 0x02 "unstructuredName"
- 0x03 "contentType" OID_PKCS9_CONTENT_TYPE
- 0x04 "messageDigest" OID_PKCS9_MESSAGE_DIGEST
- 0x05 "signingTime" OID_PKCS9_SIGNING_TIME
- 0x06 "counterSignature"
- 0x07 "challengePassword"
- 0x08 "unstructuredAddress"
- 0x0E "extensionRequest"
- 0x02 "digestAlgorithm"
- 0x02 "md2" OID_MD2
- 0x05 "md5" OID_MD5
- 0x03 "encryptionAlgorithm"
- 0x07 "3des-ede-cbc" OID_3DES_EDE_CBC
-0x2B ""
- 0x06 "dod"
- 0x01 "internet"
- 0x04 "private"
- 0x01 "enterprise"
- 0x82 ""
- 0x37 "Microsoft"
- 0x0A ""
- 0x03 ""
- 0x03 "msSGC"
- 0x04 "msEncryptingFileSystem"
- 0x14 "msEnrollmentInfrastructure"
- 0x02 "msCertificateTypeExtension"
- 0x02 "msSmartcardLogon"
- 0x89 ""
- 0x31 ""
- 0x01 ""
- 0x01 ""
- 0x02 ""
- 0x02 ""
- 0x4B "TCGID"
- 0x05 "security"
- 0x05 "mechanisms"
- 0x07 "id-pkix"
- 0x01 "id-pe"
- 0x01 "authorityInfoAccess" OID_AUTHORITY_INFO_ACCESS
- 0x03 "id-kp"
- 0x01 "serverAuth"
- 0x02 "clientAuth"
- 0x03 "codeSigning"
- 0x04 "emailProtection"
- 0x05 "ipsecEndSystem"
- 0x06 "ipsecTunnel"
- 0x07 "ipsecUser"
- 0x08 "timeStamping"
- 0x09 "ocspSigning" OID_OCSP_SIGNING
- 0x08 "id-otherNames"
- 0x05 "xmppAddr" OID_XMPP_ADDR
- 0x0A "id-aca"
- 0x01 "authenticationInfo" OID_AUTHENTICATION_INFO
- 0x02 "accessIdentity" OID_ACCESS_IDENTITY
- 0x03 "chargingIdentity" OID_CHARGING_IDENTITY
- 0x04 "group" OID_GROUP
- 0x30 "id-ad"
- 0x01 "ocsp" OID_OCSP
- 0x01 "basic" OID_BASIC
- 0x02 "nonce" OID_NONCE
- 0x03 "crl" OID_CRL
- 0x04 "response" OID_RESPONSE
- 0x05 "noCheck" OID_NO_CHECK
- 0x06 "archiveCutoff" OID_ARCHIVE_CUTOFF
- 0x07 "serviceLocator" OID_SERVICE_LOCATOR
- 0x0E "oiw"
- 0x03 "secsig"
- 0x02 "algorithms"
- 0x07 "des-cbc" OID_DES_CBC
- 0x1A "sha-1" OID_SHA1
- 0x1D "sha-1WithRSASignature" OID_SHA1_WITH_RSA_OIW
- 0x24 "TeleTrusT"
- 0x03 "algorithm"
- 0x03 "signatureAlgorithm"
- 0x01 "rsaSignature"
- 0x02 "rsaSigWithripemd160"
- 0x03 "rsaSigWithripemd128"
- 0x04 "rsaSigWithripemd256"
-0x60 ""
- 0x86 ""
- 0x48 ""
- 0x01 "organization"
- 0x65 "gov"
- 0x03 "csor"
- 0x04 "nistalgorithm"
- 0x02 "hashalgs"
- 0x01 "id-SHA-256" OID_SHA256
- 0x02 "id-SHA-384" OID_SHA384
- 0x03 "id-SHA-512" OID_SHA512
- 0x86 ""
- 0xf8 ""
- 0x42 "netscape"
- 0x01 ""
- 0x01 "nsCertType"
- 0x03 "nsRevocationUrl" OID_NS_REVOCATION_URL
- 0x04 "nsCaRevocationUrl" OID_NS_CA_REVOCATION_URL
- 0x08 "nsCaPolicyUrl" OID_NS_CA_POLICY_URL
- 0x0d "nsComment" OID_NS_COMMENT
- 0x03 "directory"
- 0x01 ""
- 0x03 "employeeNumber"
- 0x04 "policy"
- 0x01 "nsSGC"
- 0x45 "verisign"
- 0x01 "pki"
- 0x09 "attributes"
- 0x02 "messageType" OID_PKI_MESSAGE_TYPE
- 0x03 "pkiStatus" OID_PKI_STATUS
- 0x04 "failInfo" OID_PKI_FAIL_INFO
- 0x05 "senderNonce" OID_PKI_SENDER_NONCE
- 0x06 "recipientNonce" OID_PKI_RECIPIENT_NONCE
- 0x07 "transID" OID_PKI_TRANS_ID
- 0x08 "extensionReq"
diff --git a/src/pluto/pkcs1.c b/src/pluto/pkcs1.c
index ade5fdd94..74515ad89 100644
--- a/src/pluto/pkcs1.c
+++ b/src/pluto/pkcs1.c
@@ -27,7 +27,7 @@
#include "defs.h"
#include "mp_defs.h"
#include "asn1.h"
-#include "oid.h"
+#include <asn1/oid.h>
#include "log.h"
#include "pkcs1.h"
#include "md2.h"
diff --git a/src/pluto/pkcs7.c b/src/pluto/pkcs7.c
index 3068c0c94..e36f07379 100644
--- a/src/pluto/pkcs7.c
+++ b/src/pluto/pkcs7.c
@@ -25,7 +25,7 @@
#include "constants.h"
#include "defs.h"
#include "asn1.h"
-#include "oid.h"
+#include <asn1/oid.h>
#include "log.h"
#include "x509.h"
#include "certs.h"
diff --git a/src/pluto/x509.c b/src/pluto/x509.c
index 2521244f7..9ed708ace 100644
--- a/src/pluto/x509.c
+++ b/src/pluto/x509.c
@@ -34,7 +34,7 @@
#include "log.h"
#include "id.h"
#include "asn1.h"
-#include "oid.h"
+#include <asn1/oid.h>
#include "pkcs1.h"
#include "x509.h"
#include "crl.h"
diff --git a/src/scepclient/Makefile.am b/src/scepclient/Makefile.am
index a4de3bc58..be2280511 100644
--- a/src/scepclient/Makefile.am
+++ b/src/scepclient/Makefile.am
@@ -1,17 +1,26 @@
ipsec_PROGRAMS = scepclient
scepclient_SOURCES = rsakey.c rsakey.h pkcs10.c pkcs10.h scep.c scep.h scepclient.c
+PLUTODIR=$(top_srcdir)/src/pluto
+OPENACDIR=$(top_srcdir)/src/openac
+WHACKDIR=$(top_srcdir)/src/whack
+LIBFREESWANDIR=$(top_srcdir)/src/libfreeswan
+LIBSTRONGSWANDIR=$(top_srcdir)/src/libstrongswan
+LIBCRYPTODIR=$(top_srcdir)/src/libcrypto
+
INCLUDES = \
--I$(top_srcdir)/src/libfreeswan \
--I$(top_srcdir)/src/pluto \
--I$(top_srcdir)/src/whack \
--I$(top_srcdir)/src/libcrypto
+-I$(LIBFREESWANDIR) \
+-I$(LIBSTRONGSWANDIR) \
+-I$(PLUTODIR) \
+-I$(LIBCRYPTODIR) \
+-I$(WHACKDIR)
AM_CFLAGS = -DDEBUG -DNO_PLUTO -DIPSEC_CONFDIR=\"${confdir}\"
+
scepclient_LDADD = asn1.o ca.o crl.o certs.o constants.o defs.o fetch.o id.o \
keys.o lex.o md2.o md5.o mp_defs.o ocsp.o oid.o pem.o pgp.o \
pkcs1.o pkcs7.o rnd.o sha1.o smartcard.o x509.o loglite.o \
- $(top_srcdir)/src/libfreeswan/libfreeswan.a $(top_srcdir)/src/libcrypto/libcrypto.a \
+ $(LIBFREESWANDIR)/libfreeswan.a $(LIBCRYPTODIR)/libcrypto.a \
-lgmp
# This compile option activates dynamic URL fetching using libcurl
@@ -26,10 +35,6 @@ endif
dist_man_MANS = scepclient.8
-PLUTODIR=$(top_srcdir)/src/pluto
-OPENACDIR=$(top_srcdir)/src/openac
-
-
loglite.o: $(OPENACDIR)/loglite.c $(PLUTODIR)/log.h
$(COMPILE) $(INCLUDES) -c -o $@ $<
@@ -75,8 +80,8 @@ md5.o : $(PLUTODIR)/md5.c $(PLUTODIR)/md5.h
ocsp.o : $(PLUTODIR)/ocsp.c $(PLUTODIR)/ocsp.h
$(COMPILE) $(INCLUDES) -c -o $@ $<
-oid.o : $(PLUTODIR)/oid.c $(PLUTODIR)/oid.h
- $(COMPILE) $(INCLUDES) -c -o $@ $<
+oid.o : $(LIBSTRONGSWANDIR)/asn1/oid.c $(LIBSTRONGSWANDIR)/asn1/oid.h
+ $(COMPILE) -c -o $@ $<
pem.o : $(PLUTODIR)/pem.c $(PLUTODIR)/pem.h
$(COMPILE) $(INCLUDES) -c -o $@ $<
diff --git a/src/scepclient/pkcs10.c b/src/scepclient/pkcs10.c
index de3f06e18..86267f508 100644
--- a/src/scepclient/pkcs10.c
+++ b/src/scepclient/pkcs10.c
@@ -26,10 +26,10 @@
#include <arpa/inet.h>
#include <freeswan.h>
+#include <asn1/oid.h>
#include "../pluto/constants.h"
#include "../pluto/defs.h"
-#include "../pluto/oid.h"
#include "../pluto/asn1.h"
#include "../pluto/pkcs1.h"
#include "../pluto/log.h"
diff --git a/src/scepclient/scep.c b/src/scepclient/scep.c
index 577191787..9e05561ed 100644
--- a/src/scepclient/scep.c
+++ b/src/scepclient/scep.c
@@ -24,6 +24,7 @@
#include <stdlib.h>
#include <freeswan.h>
+#include <asn1/oid.h>
#ifdef LIBCURL
#include <curl/curl.h>
@@ -32,7 +33,6 @@
#include "../pluto/constants.h"
#include "../pluto/defs.h"
#include "../pluto/rnd.h"
-#include "../pluto/oid.h"
#include "../pluto/asn1.h"
#include "../pluto/pkcs1.h"
#include "../pluto/fetch.h"
diff --git a/src/scepclient/scepclient.c b/src/scepclient/scepclient.c
index bde460844..f4afe0b8f 100644
--- a/src/scepclient/scepclient.c
+++ b/src/scepclient/scepclient.c
@@ -35,11 +35,11 @@
#include <gmp.h>
#include <freeswan.h>
+#include <asn1/oid.h>
#include "../pluto/constants.h"
#include "../pluto/defs.h"
#include "../pluto/log.h"
-#include "../pluto/oid.h"
#include "../pluto/asn1.h"
#include "../pluto/pkcs1.h"
#include "../pluto/pkcs7.h"
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-28 18:18:14 +0000