From 454069e0946c7414d673407cc071b2503da9ce3f Mon Sep 17 00:00:00 2001 From: Jose Luis Duran Date: Sat, 9 Dec 2023 18:42:27 +0000 Subject: [PATCH 1/3] ipsec: strongSwan is not exclusive to Linux kernels The project is now called "the strongSwan project" rather than "Linux strongSwan" to better reflect this. --- src/charon/charon.c | 2 +- src/ipsec/_ipsec.8.in | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/charon/charon.c b/src/charon/charon.c index cd480b525..bc4bed9c4 100644 --- a/src/charon/charon.c +++ b/src/charon/charon.c @@ -376,7 +376,7 @@ int main(int argc, char *argv[]) status = 0; goto deinit; case 'v': - printf("Linux strongSwan %s\n", VERSION); + printf("strongSwan %s\n", VERSION); status = 0; goto deinit; case 'l': diff --git a/src/ipsec/_ipsec.8.in b/src/ipsec/_ipsec.8.in index de00d3075..78067b748 100644 --- a/src/ipsec/_ipsec.8.in +++ b/src/ipsec/_ipsec.8.in @@ -277,15 +277,15 @@ command. .TP .B "\-\-version" returns the version in the form of -.B Linux strongSwan U/K -if strongSwan uses the native NETKEY IPsec stack of the Linux kernel it is +.B strongSwan U/K +if strongSwan uses the native NETKEY IPsec stack of the kernel it is running on. . .TP .B "\-\-versioncode" returns the version number in the form of -.B U/K -if strongSwan uses the native NETKEY IPsec stack of the Linux kernel it is +.B U/K +if strongSwan uses the native NETKEY IPsec stack of the kernel it is running on. . .TP From 7550463d51756fd5a3c3a480f5f2776ceb98d589 Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Thu, 14 Dec 2023 11:23:22 +0100 Subject: [PATCH 2/3] Replace some other mentions of "Linux strongSwan" --- src/libcharon/plugins/vici/perl/Vici-Session/README.pod | 4 ++-- src/libstrongswan/utils/identification.h | 2 +- src/starter/ipsec.conf | 2 +- .../tests/sql/rw-cert/hosts/dave/etc/ipsec.d/data.sql.in | 8 ++++---- .../sql/rw-eap-aka-rsa/hosts/moon/etc/ipsec.d/data.sql.in | 8 ++++---- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/libcharon/plugins/vici/perl/Vici-Session/README.pod b/src/libcharon/plugins/vici/perl/Vici-Session/README.pod index f08697e14..b4f571d75 100644 --- a/src/libcharon/plugins/vici/perl/Vici-Session/README.pod +++ b/src/libcharon/plugins/vici/perl/Vici-Session/README.pod @@ -426,13 +426,13 @@ lists currently loaded certificates by streaming list-cert events. This call includes all certificates known by the daemon, not only those loaded over VICI. - my %vars = ( subject => 'C=CH, O=Linux strongSwan, CN=moon.strongswan.org' ); + my %vars = ( subject => 'C=CH, O=strongSwan Project, CN=moon.strongswan.org' ); my $certs = $session->list_certs(Vici::Message->new(\%vars)); =cut print "----- list-certs -----\n"; -%vars = ( subject => 'C=CH, O=Linux strongSwan, CN=moon.strongswan.org' ); +%vars = ( subject => 'C=CH, O=strongSwan Project, CN=moon.strongswan.org' ); my $certs = $session->list_certs(Vici::Message->new(\%vars)); foreach my $cert (@$certs) { diff --git a/src/libstrongswan/utils/identification.h b/src/libstrongswan/utils/identification.h index a85b7c538..83f256017 100644 --- a/src/libstrongswan/utils/identification.h +++ b/src/libstrongswan/utils/identification.h @@ -298,7 +298,7 @@ struct identification_t { * - ID_IPV6_ADDR: 2001:0db8:85a3:08d3:1319:8a2e:0370:7345 * - ID_FQDN: www.strongswan.org (optionally with a prepended @) * - ID_RFC822_ADDR: alice@wonderland.org - * - ID_DER_ASN1_DN: C=CH, O=Linux strongSwan, CN=bob + * - ID_DER_ASN1_DN: C=CH, O=strongSwan Project, CN=bob * * In favor of pluto, domainnames are prepended with an @, since * pluto resolves domainnames without an @ to IPv4 addresses. Since diff --git a/src/starter/ipsec.conf b/src/starter/ipsec.conf index a33d68c0a..40f1a2314 100644 --- a/src/starter/ipsec.conf +++ b/src/starter/ipsec.conf @@ -24,5 +24,5 @@ config setup # leftcert=myCert.pem # right=192.168.0.2 # rightsubnet=10.2.0.0/16 -# rightid="C=CH, O=Linux strongSwan CN=peer name" +# rightid="C=CH, O=strongSwan Project CN=peer name" # auto=start diff --git a/testing/tests/sql/rw-cert/hosts/dave/etc/ipsec.d/data.sql.in b/testing/tests/sql/rw-cert/hosts/dave/etc/ipsec.d/data.sql.in index b4845ce9c..f1941f0eb 100644 --- a/testing/tests/sql/rw-cert/hosts/dave/etc/ipsec.d/data.sql.in +++ b/testing/tests/sql/rw-cert/hosts/dave/etc/ipsec.d/data.sql.in @@ -26,7 +26,7 @@ INSERT INTO identities ( INSERT INTO identities ( type, data -) VALUES ( /* subjkey of 'C=CH, O=Linux strongSwan, CN=dave@strongswan.org' */ +) VALUES ( /* subjkey of 'C=CH, O=strongSwan Project, CN=dave@strongswan.org' */ 11, X'DAVE_SPK_HEX' ); @@ -40,13 +40,13 @@ INSERT INTO identities ( INSERT INTO certificates ( type, keytype, data -) VALUES ( /* C=CH, O=Linux strongSwan, CN=strongSwan Root CA */ +) VALUES ( /* C=CH, O=strongSwan Project, CN=strongSwan Root CA */ 1, 1, X'CA_CERT_HEX' ); INSERT INTO certificates ( type, keytype, data -) VALUES ( /* C=CH, O=Linux strongSwan, CN=dave@strongswan.org */ +) VALUES ( /* C=CH, O=strongSwan Project, CN=dave@strongswan.org */ 1, 1, X'DAVE_CERT_HEX' ); @@ -84,7 +84,7 @@ INSERT INTO certificate_identity ( INSERT INTO private_keys ( type, data -) VALUES ( /* key of 'C=CH, O=Linux strongSwan, CN=dave@strongswan.org' */ +) VALUES ( /* key of 'C=CH, O=strongSwan Project, CN=dave@strongswan.org' */ 1, X'DAVE_KEY_HEX' ); diff --git a/testing/tests/sql/rw-eap-aka-rsa/hosts/moon/etc/ipsec.d/data.sql.in b/testing/tests/sql/rw-eap-aka-rsa/hosts/moon/etc/ipsec.d/data.sql.in index c19e8d5c5..b91360706 100644 --- a/testing/tests/sql/rw-eap-aka-rsa/hosts/moon/etc/ipsec.d/data.sql.in +++ b/testing/tests/sql/rw-eap-aka-rsa/hosts/moon/etc/ipsec.d/data.sql.in @@ -26,7 +26,7 @@ INSERT INTO identities ( INSERT INTO identities ( type, data -) VALUES ( /* subjkey of 'C=CH, O=Linux strongSwan, CN=moon.strongswan.org' */ +) VALUES ( /* subjkey of 'C=CH, O=strongSwan Project, CN=moon.strongswan.org' */ 11, X'MOON_SPK_HEX' ); @@ -46,13 +46,13 @@ INSERT INTO identities ( INSERT INTO certificates ( type, keytype, data -) VALUES ( /* C=CH, O=Linux strongSwan, CN=strongSwan Root CA */ +) VALUES ( /* C=CH, O=strongSwan Project, CN=strongSwan Root CA */ 1, 1, X'CA_CERT_HEX' ); INSERT INTO certificates ( type, keytype, data -) VALUES ( /* C=CH, O=Linux strongSwan, CN=moon.strongswan.org */ +) VALUES ( /* C=CH, O=strongSwan Project, CN=moon.strongswan.org */ 1, 1, X'MOON_CERT_HEX' ); @@ -90,7 +90,7 @@ INSERT INTO certificate_identity ( INSERT INTO private_keys ( type, data -) VALUES ( /* key of 'C=CH, O=Linux strongSwan, CN=moon.strongswan.org' */ +) VALUES ( /* key of 'C=CH, O=strongSwan Project, CN=moon.strongswan.org' */ 1, X'MOON_KEY_HEX' ); From fff2996a22bc355e4c5dea71cf90f662d11549bf Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Thu, 14 Dec 2023 11:27:25 +0100 Subject: [PATCH 3/3] ipsec: Remove mention of NETKEY stack --- src/ipsec/_ipsec.8.in | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/ipsec/_ipsec.8.in b/src/ipsec/_ipsec.8.in index 78067b748..b80479972 100644 --- a/src/ipsec/_ipsec.8.in +++ b/src/ipsec/_ipsec.8.in @@ -277,16 +277,12 @@ command. .TP .B "\-\-version" returns the version in the form of -.B strongSwan U/K -if strongSwan uses the native NETKEY IPsec stack of the kernel it is -running on. +.BR "strongSwan U/K" . . .TP .B "\-\-versioncode" returns the version number in the form of -.B U/K -if strongSwan uses the native NETKEY IPsec stack of the kernel it is -running on. +.BR "U/K" . . .TP .B "\-\-copyright"