Tobias Brunner [Mon, 23 Aug 2021 09:30:15 +0000 (11:30 +0200)]
tpm_extendpcr: Support platforms not having syslog()
Tobias Brunner [Mon, 23 Aug 2021 08:44:41 +0000 (10:44 +0200)]
tpm_extendpcr: Build does not depend on tpm plugin but libtpmtss
The utility basically requires a TSS, the tpm plugin is not used at all.
Andreas Steffen [Sun, 22 Aug 2021 08:55:37 +0000 (10:55 +0200)]
Version bump to 5.9.4dr1
Tobias Brunner [Fri, 20 Aug 2021 14:34:48 +0000 (16:34 +0200)]
libtpmtss: Initialize library from all users
Previously, only the tpm plugin initialized the library, so in order
to use a TPM 2.0 (a required TCTI library is loaded via init), it was
necessary to load it even if none of its actual features were used.
Tobias Brunner [Fri, 20 Aug 2021 08:45:44 +0000 (10:45 +0200)]
configure: Enforce tss-tss2 if tpm plugin is enabled
The plugin is useless without a TSS 2.0 and this is currently the only one.
Tobias Brunner [Mon, 16 Aug 2021 08:50:01 +0000 (10:50 +0200)]
openssl: Use a longer key to test/initialize HMAC instances
OpenSSL enforces a minimum of 14 bytes (112 bits) on the key size when
used in FIPS-mode (as required by SP 800-131A). So by using an empty
string, instantiation always failed. 32 bytes (256 bits) should be safe
for now.
Closes strongswan/strongswan#557
Tobias Brunner [Tue, 17 Aug 2021 17:20:45 +0000 (19:20 +0200)]
testing: Fix build of tkm and tkm-rpc
Tobias Brunner [Mon, 16 Aug 2021 09:24:14 +0000 (11:24 +0200)]
github: Use latest version of SonarScanner
Tobias Brunner [Wed, 11 Aug 2021 13:35:52 +0000 (15:35 +0200)]
kernel-netlink: Initialize ifreq structs when detecting offload capability
Noel Kuntze [Fri, 23 Jul 2021 21:29:23 +0000 (23:29 +0200)]
gitignore: Add nbproject/
As used by the NetBeans IDE.
Closes strongswan/strongswan#505.
Tobias Brunner [Wed, 14 Jul 2021 08:27:11 +0000 (10:27 +0200)]
Ignore android-* tags when using `git describe`
Tobias Brunner [Wed, 14 Jul 2021 08:01:45 +0000 (10:01 +0200)]
Merge branch 'android-updates'
Adds a button to install user certificates and updates the target SDK
version for Android 11 (and the related deprecation fixes), which will
be mandatory later this year.
The release also includes an older commit that changed how DNS servers
are applied to TUN devices (
cd10ae2ff050 ("android: Explicitly apply DNS
servers to the TUN device")).
Also added are metadata for F-Droid.
Tobias Brunner [Tue, 13 Jul 2021 13:32:05 +0000 (15:32 +0200)]
android: New release after adding button to install PKCS#12 and SDK update
It also includes an unreleased change that affects when/how DNS servers
are applied to the TUN device.
Tobias Brunner [Tue, 13 Jul 2021 13:05:29 +0000 (15:05 +0200)]
android: Request QUERY_ALL_PACKAGES permission
This is required when targeting Android 11 (API 30) in order to see all
packages, which we use to allow selecting apps ex-/included from VPN
profiles and for the EAP-TNC use case.
Tobias Brunner [Mon, 7 Jun 2021 13:12:19 +0000 (15:12 +0200)]
android: Add Triple-T metadata for F-Droid
We currently don't use Triple-T but the metadata is also parsed by F-Droid
to provide information for included apps.
Tobias Brunner [Mon, 12 Jul 2021 16:58:58 +0000 (18:58 +0200)]
android: Add a button to install user certificates
Newer Android versions don't provide this option anymore on the
selection dialog.
Tobias Brunner [Tue, 13 Jul 2021 13:11:07 +0000 (15:11 +0200)]
android: Replace deprecated Switch with SwitchCompat
Tobias Brunner [Mon, 12 Jul 2021 15:58:16 +0000 (17:58 +0200)]
android: Replace deprecated AsyncTask instances
As suggested by the Android docs, we use a global thread pool and handler
to avoid recreating them repeatedly. Four threads should be more than
enough as we only use this to load CA certificates when the app starts
initially and to load user certs when editing a profile.
Tobias Brunner [Mon, 12 Jul 2021 15:17:00 +0000 (17:17 +0200)]
android: Migrate from deprecated ViewPager to ViewPager2 for CA cert lists
Tobias Brunner [Mon, 12 Jul 2021 13:53:42 +0000 (15:53 +0200)]
android: Replace deprecated FileObserver() constructor with newer SDKs
Tobias Brunner [Mon, 12 Jul 2021 13:38:22 +0000 (15:38 +0200)]
android: Replace usage of deprecated Handler() constructor
Tobias Brunner [Fri, 9 Jul 2021 16:23:05 +0000 (18:23 +0200)]
android: Replace deprecated onActivityCreated() with onViewCreated()
Tobias Brunner [Fri, 9 Jul 2021 16:18:13 +0000 (18:18 +0200)]
android: Replace deprecated startActivityForResult/onActivityResult usage
Tobias Brunner [Mon, 28 Jun 2021 12:26:52 +0000 (14:26 +0200)]
android: Set compile-/targetSdkVersion to 30
This will be mandatory for new apps in August and for existing apps
in November. However, several classes like AsyncTask are now deprecated
so this needs some work to avoid warnings and problems in the future.
Tobias Brunner [Mon, 28 Jun 2021 12:26:24 +0000 (14:26 +0200)]
android: Replace jcenter with mavenCentral repository
Tobias Brunner [Mon, 28 Jun 2021 12:22:07 +0000 (14:22 +0200)]
android: Update dependencies
Tobias Brunner [Mon, 28 Jun 2021 12:21:41 +0000 (14:21 +0200)]
android: Update Gradle plugin
Tobias Brunner [Tue, 13 Jul 2021 08:19:56 +0000 (10:19 +0200)]
Use wolfSSL 4.8.0 for tests
Andreas Steffen [Tue, 6 Jul 2021 12:00:39 +0000 (14:00 +0200)]
Version bump to 5.9.3
Andreas Steffen [Tue, 6 Jul 2021 10:05:09 +0000 (12:05 +0200)]
vici: Suppress trailing nul character
Tobias Brunner [Wed, 30 Jun 2021 13:16:47 +0000 (15:16 +0200)]
testing: Use specific versions of swidGenerator and strongTNC
This way we get updated versions automatically (referencing "master"
required manually deleting the downloaded archives and the unpacked
directories). It also allows switching versions when working in different
branches (note that REV can also be set to a commit ID, e.g. to test
changes before tagging them later and merging the branch).
Tobias Brunner [Fri, 25 Jun 2021 11:51:44 +0000 (13:51 +0200)]
kernel-netlink: Fix theoretical memory leak when parsing routes
This currently can't happen as the kernel always puts RTA_TABLE as first
attribute in RTM_NEWROUTE messages.
Tobias Brunner [Fri, 25 Jun 2021 09:32:29 +0000 (11:32 +0200)]
Fixed some typos, courtesy of codespell
Main change is the conversion from the British cancelling/-ed to the
American canceling/-ed.
Andreas Steffen [Thu, 24 Jun 2021 07:18:54 +0000 (09:18 +0200)]
Version bump to 5.9.3rc1
Tobias Brunner [Tue, 22 Jun 2021 14:49:40 +0000 (16:49 +0200)]
testing: Build wolfSSL from the Git repository
Use the same configure options etc. for both builds (no need for the cert
options as we don't use TLS or X.509 parsing) and switch to a Git commit
that includes the SHA-3 OID fix (it's actually the fix itself).
Andreas Steffen [Tue, 22 Jun 2021 10:32:35 +0000 (12:32 +0200)]
testing: Fixed ikev2/farp scenario
Andreas Steffen [Tue, 22 Jun 2021 08:33:07 +0000 (10:33 +0200)]
Version bump to 5.9.3dr4
Andreas Steffen [Wed, 26 May 2021 07:40:42 +0000 (09:40 +0200)]
testing: Migrate ikev2-stroke-bye scenarios to vici
Andreas Steffen [Fri, 21 May 2021 10:04:43 +0000 (12:04 +0200)]
testing: Fixed pretest script of ikev1/rw-psk-aggressive scenario
Tobias Brunner [Thu, 17 Jun 2021 15:03:39 +0000 (17:03 +0200)]
testing: Migrate ikev2/host2host-transport-nat scenario to vici
This also restores the test as it was before the referenced commit so it
again, as written in the description, demonstrates that venus is unable
to ping sun without IPsec tunnel.
Fixes:
f27fb58ae0ec ("testing: Update description and test evaluation of host2host-transport-nat")
Tobias Brunner [Thu, 10 Jun 2021 14:41:01 +0000 (16:41 +0200)]
testing: Migrate MOBIKE tests to vici
Note that the mobike-nat test has been removed as it basically did the same
as the mobike-virtual-ip-nat test. Instead, the mobike-nat-mapping scenario
is added, which simulates a NAT router restart.
Tobias Brunner [Thu, 10 Jun 2021 14:39:18 +0000 (16:39 +0200)]
ike-mobike: Force MOBIKE update after NAT mappings changed
The addresses observed by the client behind the NAT are exactly the same if
the NAT router gets restarted.
Fixes:
2b255f01afbc ("ike-mobike: Use ike_sa_t::update_hosts() to trigger events")
Tobias Brunner [Thu, 10 Jun 2021 14:38:23 +0000 (16:38 +0200)]
ike-sa: Log IKE endpoint changes
Tobias Brunner [Fri, 18 Jun 2021 13:31:06 +0000 (15:31 +0200)]
ha: Register the correct IKE_SA with the manager after a rekeying
Fixes:
20dfbcad0875 ("ha: Register new IKE_SAs before calling inherit_post()")
Closes strongswan/strongswan#456.
Tobias Brunner [Mon, 21 Jun 2021 07:59:28 +0000 (09:59 +0200)]
Merge branch 'vici-stuck'
Closes strongswan/strongswan#268.
Tobias Brunner [Fri, 7 May 2021 13:32:49 +0000 (15:32 +0200)]
vici: Signal waiting threads when skipping disconnected connections
If two threads are waiting in find_entry() and remove_entry(),
respectively, and the former is woken first, the latter remains stuck
as it won't get signaled.
Tobias Brunner [Fri, 7 May 2021 08:53:57 +0000 (10:53 +0200)]
vici: Signal waiting threads when removing a connection entry
If there are threads waiting in find_entry() and one in remove_entry()
and the latter is woken first by a thread calling put_entry(), the
former threads would remain stuck as they get never signaled.
Tobias Brunner [Thu, 10 Jun 2021 09:34:37 +0000 (11:34 +0200)]
kernel-netlink: Don't wait for VIPs to disappear during de-initialization
This can happen if an IKE_SA is terminated forcefully shortly before
terminating the daemon. The thread that handles the terminate command
will call checkin_and_destroy(), which unregisters the IKE_SA from the
manager before destroying it. The main thread that calls flush() on the
IKE_SA manager won't wait for this SA (its entry is already gone), so
the processor and in turn the watcher job/thread might get canceled
before the first thread started deleting the VIP. It would then wait
indefinitely for a signal that can never be sent.
There is still a small chance the thread hangs in wait() if the state check
happens right before the watcher is canceled and it wasn't yet able to
deliver the event from the kernel, we counter that by rechecking the state
after a while.
Tobias Brunner [Fri, 18 Jun 2021 08:31:31 +0000 (10:31 +0200)]
NEWS: Add news for 5.9.3
Adrian-Ken Rueegsegger [Wed, 16 Jun 2021 16:27:23 +0000 (18:27 +0200)]
testing: Update Anet to version 0.4.2
Stefan Berghofer [Wed, 4 Mar 2020 16:58:21 +0000 (17:58 +0100)]
charon-tkm: Remove useless checks when deriving IKE keys
Stefan Berghofer [Tue, 23 Jul 2019 10:42:26 +0000 (12:42 +0200)]
charon-tkm: Delegate encryption/decryption of IKE traffic to TKM
Co-authored-by: Tobias Brunner <tobias@strongswan.org>
Tobias Brunner [Thu, 20 May 2021 14:52:49 +0000 (16:52 +0200)]
pkcs11: Change how unavailable attributes like CKA_TRUSTED are handled
If a PKCS#11 library/token doesn't provide one or more attributes via
C_GetAttributeValue(), we get back CKR_ATTRIBUTE_TYPE_INVALID (similar
for protected attributes where CKR_ATTRIBUTE_SENSITIVE is returned).
This is not an error as the spec demands that all attributes have been
processed with the unavailable attributes having set their length
field to CK_UNAVAILABLE_INFORMATION.
We use this to handle the CKA_TRUSTED attribute, which some tokens
apparently don't support. We previously used a version check to remove
the attribute from the call but even the latest spec doesn't make the
attribute mandatory (it's just in a list of "common" attributes for
CKO_CERTIFICATE objects, without a default value), so there are current
tokens that don't support it and prevent us from enumerating certificates.
Tobias Brunner [Tue, 8 Jun 2021 13:33:36 +0000 (15:33 +0200)]
receiver: Avoid division by 0 after system start if CLOCK_MONOTONIC is used
Depending on how CLOCK_MONOTONIC is implemented, time_monotonic() might
return 0 within 1 second after the system is started. If that's the
case, we just default to 0 for now to avoid a crash (doesn't "hide" the
system time, but it's only the uptime anyway in this case).
Closes strongswan/strongswan#435.
Tobias Brunner [Wed, 9 Jun 2021 14:36:57 +0000 (16:36 +0200)]
charon-nm: Simplify certificate enumeration and allow IDs other than DNs
This allows using SANs as identity instead of having to use the subject DN.
References strongswan/strongswan#437.
Tobias Brunner [Fri, 28 May 2021 07:14:59 +0000 (09:14 +0200)]
dhcp: Move log messages for received packets
This way they are logged in the context of the corresponding IKE_SA.
Closes strongswan/strongswan#417.
Thomas Egerer [Tue, 1 Jun 2021 12:36:21 +0000 (14:36 +0200)]
bus: Extend and reorder arguments of ike_derived_keys() hook
This now includes all key material derived for IKE_SAs in the order
defined in the RFC:
{SK_d | SK_ai | SK_ar | SK_ei | SK_er | SK_pi | SK_pr}
= prf+ (SKEYSEED, Ni | Nr | SPIi | SPIr)
Signed-off-by: Thomas Egerer <thomas.egerer@secunet.com>
Andreas Steffen [Fri, 4 Jun 2021 07:28:12 +0000 (09:28 +0200)]
Version bump to 5.9.3dr3
Tobias Brunner [Fri, 4 Jun 2021 07:12:33 +0000 (09:12 +0200)]
ikev1: Fix flags so NAT Vendor IDs are sent again
Fixes:
6c49ddfbca72 ("ike: Add additional Vendor IDs for third-party implementations")
Andreas Steffen [Thu, 3 Jun 2021 10:27:16 +0000 (12:27 +0200)]
testing: Added openssl-ikev2/net2net-sha3-rsa-cert scenario
Andreas Steffen [Thu, 3 Jun 2021 10:24:19 +0000 (12:24 +0200)]
openssl: Support SHA-3 based RSA_EMSA_PKCS1 signatures
Andreas Steffen [Thu, 3 Jun 2021 08:22:59 +0000 (10:22 +0200)]
testing: Test wolfssl plugin
Andreas Steffen [Tue, 1 Jun 2021 18:13:20 +0000 (20:13 +0200)]
wolfssl: Full support of SHA3 signatures
Andreas Steffen [Sun, 30 May 2021 04:32:50 +0000 (06:32 +0200)]
credential_factory: Store name of plugin registering a builder
Andreas Steffen [Sun, 30 May 2021 10:39:59 +0000 (12:39 +0200)]
wolfssl: Set RSA key type
Marius Tomaschewski [Thu, 22 Apr 2021 10:47:18 +0000 (12:47 +0200)]
ccm: Destroy IV generator on crypter creation failure
Closes strongswan/strongswan#343.
Tobias Brunner [Fri, 7 May 2021 14:17:54 +0000 (16:17 +0200)]
dhcp: Log MAC address when sending DISCOVER message
Closes strongswan/strongswan#239.
Noel Kuntze [Mon, 10 May 2021 11:03:36 +0000 (13:03 +0200)]
ike: Add additional Vendor IDs for third-party implementations
For some that are followed by unknown data (e.g. detailed version
information) we only do a prefix match.
Co-authored-by: Tobias Brunner <tobias@strongswan.org>
Closes strongswan/strongswan#393.
Andreas Steffen [Fri, 21 May 2021 08:00:41 +0000 (10:00 +0200)]
Version bump to 5.9.3dr2
Andreas Steffen [Sun, 4 Apr 2021 08:45:46 +0000 (10:45 +0200)]
testing: Reorganizing IKEv1 and IKEv2 examples
For documentation purposes the new folders ikev1-algs, ikev2-algs,
ikev1-multi-ca and ikev2-multi-ca have been created. Most of the
test cases have now been converted to the vici interface. The
remaining legacy stroke scenarios yet to be converted have been put
into the ikev2-stroke-bye folder.
For documentation purposes some legacy stroke scenarios will be kept
in the ikev1-stroke, ikev2-stroke and ipv6-stroke folders.
Tobias Brunner [Tue, 11 May 2021 12:27:08 +0000 (14:27 +0200)]
notify-payload: Update reference for notify types for PPKs
draft-ietf-ipsecme-qr-ikev2 was released as RFC 8784 in June of 2020.
Tobias Brunner [Mon, 10 May 2021 12:55:45 +0000 (14:55 +0200)]
Don't report current text in parser error messages
The values of `yytext` and `yyleng` might not be properly defined when
the error function is called (in particular if the lexer reached EOF).
While this might just cause non-printable characters in the output, it
could actually lead to a crash depending on where `yytext` points.
Closes strongswan/strongswan#346.
Noel Kuntze [Thu, 22 Apr 2021 14:33:34 +0000 (16:33 +0200)]
testing: Replace kvm with qemu-system-x86_64
It might not exist on all platforms and according to the man page:
The kvm wrapper script is used to provide compatibility with old
qemu-kvm package which has been merged into qemu as of version 1.3.
The script executes
qemu-system-x86_64 -enable-kvm
passing all other command-line arguments to the qemu binary.
Closes strongswan/strongswan#385.
Tobias Brunner [Tue, 4 May 2021 13:40:45 +0000 (15:40 +0200)]
testing: Use host-passthrough CPU mode for all KVM guests
This should give us the best performance and feature set on modern
hardware (in particular when compared to code2duo, which e.g. does not allow
nested virtualization).
Closes strongswan/strongswan#340.
Tobias Brunner [Fri, 7 May 2021 12:48:17 +0000 (14:48 +0200)]
Use Botan 2.18.0 for tests
Adrian-Ken Rueegsegger [Wed, 14 Apr 2021 13:34:29 +0000 (15:34 +0200)]
openssl: Consider authorityKeyIdentifier in issued_by()
Prior to verifying the cryptographic signature, check if the
authorityKeyIdentifier matches the key ID of the issuing certificate if
it is available.
Adrian-Ken Rueegsegger [Wed, 14 Apr 2021 13:20:27 +0000 (15:20 +0200)]
x509: Consider authorityKeyIdentifier in issued_by()
Prior to verifying the cryptographic signature, check if the
authorityKeyIdentifier matches the key ID of the issuing certificate if
it is available.
Adrian-Ken Rueegsegger [Wed, 14 Apr 2021 11:45:30 +0000 (13:45 +0200)]
openssl: Bring CRL issued_by() in line with x509 plugin
Adrian-Ken Rueegsegger [Tue, 9 Mar 2021 17:07:34 +0000 (18:07 +0100)]
ike: Set DCSP on keepalive packets
Tobias Brunner [Tue, 4 May 2021 16:19:57 +0000 (18:19 +0200)]
openssl: Add support for AES in CCM mode
While CCM is available in earlier versions, we only use it with
OpenSSL 1.1.0 and newer because the generic control variables are not
available before and we default to GCM for them.
Closes strongswan/strongswan#353.
Noel Kuntze [Thu, 22 Apr 2021 12:28:34 +0000 (14:28 +0200)]
testing: Make sure $SHAREDDIR exists before mounting it
Closes strongswan/strongswan#344.
Tobias Brunner [Wed, 5 May 2021 16:46:49 +0000 (18:46 +0200)]
github: Fix python build and checks on older Ubuntu releases
On 18.04, setuptools was apparently pulled in by python-pip but is not
by python3-pip and on Ubuntu 16.04 there is an issue with tox when
installed via pip3 (syntax error in one of the dependencies) and with
pip that dependency is not even available.
Tobias Brunner [Thu, 6 May 2021 09:03:19 +0000 (11:03 +0200)]
wolfssl: Properly handle failure to initialize SHAKE_256
Tobias Brunner [Wed, 5 May 2021 16:56:58 +0000 (18:56 +0200)]
github: Don't fail LGTM test with an error if variables are missing
That's because forks are currently not allowed to be analyzed by LGTM (unlike
with SonarCloud) so this check can't actually be successful for forks even if
variables are defined.
References strongswan/strongswan#328.
Noel Kuntze [Thu, 15 Apr 2021 12:49:19 +0000 (14:49 +0200)]
github: Fail LGTM test if required environment variables aren't set
Closes strongswan/strongswan#328.
Tobias Brunner [Wed, 5 May 2021 14:39:26 +0000 (16:39 +0200)]
github: Make LGTM project ID configurable via environment variable
Noel Kuntze [Sat, 17 Apr 2021 05:22:39 +0000 (07:22 +0200)]
github: Fail sonarcloud test if required environment variables aren't set
Closes strongswan/strongswan#330.
Tobias Brunner [Wed, 5 May 2021 12:30:36 +0000 (14:30 +0200)]
github: Always upload lint results from Android build
Tobias Brunner [Wed, 5 May 2021 08:25:05 +0000 (10:25 +0200)]
github: Fix build on Ubuntu 20.04 and add a job for 18.04
The nm test can only be done on Ubuntu 18.04 as the required libraries
are not available on newer systems.
Switch to pip3 to install tox (the only Python dependency we use).
Closes strongswan/strongswan#327.
Tobias Brunner [Wed, 5 May 2021 16:07:47 +0000 (18:07 +0200)]
github: Fix installation of Python dependencies
Tobias Brunner [Wed, 5 May 2021 14:09:37 +0000 (16:09 +0200)]
android: Avoid lint errors when determining column indices
The lint version used on our GitHub build hosts reported these errors:
Error: Value must be ≥ 0 [Range]
db.update(TABLE_VPNPROFILE, values, KEY_ID + " = " + cursor.getLong(cursor.getColumnIndex(KEY_ID)), null);
That's because get*() expect a valid index >= 0 but getColumnIndex()
can return -1 if the column name doesn't exist.
Tobias Brunner [Wed, 5 May 2021 09:37:21 +0000 (11:37 +0200)]
backtrace: The BFD API changed in newer versions
Noel Kuntze [Thu, 15 Apr 2021 14:23:18 +0000 (16:23 +0200)]
openssl: Fix OpenSSL version check for EC_POINT_set_affine_coordinates
Fixes:
bd323ae6c832 ("openssl: Migrate from deprecated EC_POINT_[set|get]_affine_coordinates_GFp() functions")
Closes strongswan/strongswan#332
Noel Kuntze [Sat, 17 Apr 2021 03:02:01 +0000 (05:02 +0200)]
forecast: Restrict strncpy() call
Closes strongswan/strongswan#331.
Tobias Brunner [Tue, 4 May 2021 12:39:56 +0000 (14:39 +0200)]
Merge branch 'doxygen-fixes'
Closes strongswan/strongswan#326.
Noel Kuntze [Wed, 14 Apr 2021 22:33:23 +0000 (00:33 +0200)]
Doxyfile.in: Remove deprecated variables
Noel Kuntze [Wed, 14 Apr 2021 22:17:59 +0000 (00:17 +0200)]
doxygen: Fix documentation problems
Andreas Steffen [Wed, 31 Mar 2021 07:59:55 +0000 (09:59 +0200)]
Version bump to 5.9.3dr1
Andreas Steffen [Tue, 30 Mar 2021 20:05:49 +0000 (22:05 +0200)]
testing: Migrated p2pnat/medsrv-psk scenario to vici
Andreas Steffen [Tue, 30 Mar 2021 16:54:47 +0000 (18:54 +0200)]
testing: Migrated p2pnat/behind-same-nat scenario to vici