denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'linux-strongswan'

Browse Source 
Closes strongswan/strongswan#2026
This commit is contained in:
Tobias Brunner
2023-12-14 11:30:08 +01:00
parent c8ef91c786 fff2996a22
commit f3578d3de8
7 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/charon/charon.c
+1 -1
View File
@@ -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':
src/ipsec/_ipsec.8.in
+2 -6
View File
@@ -277,16 +277,12 @@ command.
.TP
.B "\-\-version"
returns the version in the form of
.B Linux strongSwan U<strongSwan userland version>/K<Linux kernel version>
if strongSwan uses the native NETKEY IPsec stack of the Linux kernel it is
running on.
.BR "strongSwan U<strongSwan userland version>/K<kernel version>" .
.
.TP
.B "\-\-versioncode"
returns the version number in the form of
.B U<strongSwan userland version>/K<Linux kernel version>
if strongSwan uses the native NETKEY IPsec stack of the Linux kernel it is
running on.
.BR "U<strongSwan userland version>/K<kernel version>" .
.
.TP
.B "\-\-copyright"
src/libcharon/plugins/vici/perl/Vici-Session/README.pod
+2 -2
View File
@@ -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)
{
src/libstrongswan/utils/identification.h
+1 -1
View File
@@ -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: [email protected]
* - 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
src/starter/ipsec.conf
+1 -1
View File
@@ -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
testing/tests/sql/rw-cert/hosts/dave/etc/ipsec.d/data.sql.in
+4 -4
View File
@@ -26,7 +26,7 @@ INSERT INTO identities (
INSERT INTO identities (
type, data
) VALUES ( /* subjkey of 'C=CH, O=Linux strongSwan, [email protected]' */
) VALUES ( /* subjkey of 'C=CH, O=strongSwan Project, [email protected]' */
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, [email protected] */
) VALUES ( /* C=CH, O=strongSwan Project, [email protected] */
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, [email protected]' */
) VALUES ( /* key of 'C=CH, O=strongSwan Project, [email protected]' */
1, X'DAVE_KEY_HEX'
);
testing/tests/sql/rw-eap-aka-rsa/hosts/moon/etc/ipsec.d/data.sql.in
+4 -4
View File
@@ -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'
);