From: Tobias Brunner <tobias@strongswan.org>
Date: Thu, 14 Dec 2023 10:23:22 +0000 (+0100)
Subject: Replace some other mentions of "Linux strongSwan"
X-Git-Tag: android-2.5.0~24^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7550463d51756fd5a3c3a480f5f2776ceb98d589;p=thirdparty%2Fstrongswan.git

Replace some other mentions of "Linux strongSwan"
---

diff --git a/src/libcharon/plugins/vici/perl/Vici-Session/README.pod b/src/libcharon/plugins/vici/perl/Vici-Session/README.pod
index f08697e14c..b4f571d75c 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 a85b7c5389..83f2560176 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 a33d68c0a3..40f1a23143 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 b4845ce9c7..f1941f0eb5 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 c19e8d5c5c..b913607064 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'
 );