18483 Commits

Author SHA1 Message Date
Tobias Brunner
3eca38cc79 unit-tests: Add tests for CHILD_SA rekeying with multiple key exchanges 2022-10-04 09:49:03 +02:00
Tobias Brunner
7ca2ddd0c4 unit-tests: Add tests for CHILD_SA creation with multiple key exchanges 2022-10-04 09:49:03 +02:00
Tobias Brunner
bc4e7c90d6 unit-tests: Tests for additional key exchanges 2022-10-04 09:49:03 +02:00
Tobias Brunner
f8d856b851 unit-tests: Support multiple proposals in exchange tests 2022-10-04 09:49:03 +02:00
Andreas Steffen
63a01f6190 vici: Increase maximum proposal length 2022-10-04 09:49:03 +02:00
Andreas Steffen
5bed7b1868 vici: List additional key exchanges
Co-authored-by: Tobias Brunner <tobias@strongswan.org>
2022-10-04 09:49:03 +02:00
Tobias Brunner
2f63a36ade proposal: Add prefix for additional key exchanges when logging proposals 2022-10-04 09:49:03 +02:00
Tobias Brunner
49fd5f136e key-exchange: Add dynamic parser for additional key exchange methods 2022-10-04 09:49:03 +02:00
Tobias Brunner
4832be01ae child-rekey: Support CHILD_SA rekeying with multiple key exchanges 2022-10-04 09:49:03 +02:00
Tobias Brunner
32e08ddb17 unit-tests: Fix CHILD_SA rekey tests after INVALID_KE_PAYLOAD handling changes
The responder doesn't create a CHILD_SA and allocate an SPI anymore
when responding with an INVALID_KE_PAYLOAD notify.
2022-10-04 09:49:03 +02:00
Tobias Brunner
abce9feb6a child-create: Add support for multiple key exchanges
It also changes that payloads are built before installing the CHILD_SA on
the responder, that is, the KE payload is generated before keys are derived,
so that key_exchange_t::get_public_key() is called before get_shared_secret(),
or it's internal equivalent, which could be relevant for KE implementations
that want to ensure that the key can't be used again after the key
derivation.
2022-10-04 09:49:03 +02:00
Tobias Brunner
d3da7b1fdd ike-rekey: Support IKE_SA rekeying with multiple key exchanges 2022-10-04 09:49:02 +02:00
Tobias Brunner
d68cd46478 ike-init: Add support for multiple key exchanges
Initially, this is handled with a key derivation for each
IKE_INTERMEDIATE exchange.  When rekeying the keys are derived only when
all IKE_FOLLOWUP_KE exchanges are done.
2022-10-04 09:49:02 +02:00
Tobias Brunner
930d82783d bus: Support multiple key exchanges in ike/child_keys() events 2022-10-04 09:49:02 +02:00
Tobias Brunner
3bbc2d6aca keymat_v2: Support key derivation with multiple key exchanges 2022-10-04 09:49:02 +02:00
Tobias Brunner
20e6dc0665 key-exchange: Add helper to concatenate shared secrets of several key exchanges 2022-10-04 09:49:02 +02:00
Tobias Brunner
e9771db66f keymat_v2: Proper cleanup if derive_ike_keys() is called multiple times 2022-10-04 09:49:02 +02:00
Tobias Brunner
cf0a861678 ike-auth: Calculate and collect IntAuth for IKE_INTERMEDIATE exchanges
The message ID of the first IKE_AUTH exchange is a safe-guard against
potential truncation attacks if IKE_INTERMEDIATE exchanges are not used
for multiple key exchanges but some other future use where the number of
exchanges might not depend on the selected proposal.
2022-10-04 09:49:02 +02:00
Tobias Brunner
cd3d8d2040 pubkey-authenticator: Handle IntAuth data 2022-10-04 09:49:02 +02:00
Tobias Brunner
17773226ce psk-authenticator: Handle IntAuth data 2022-10-04 09:49:02 +02:00
Tobias Brunner
b2aa035fc6 eap-authenticator: Handle IntAuth data 2022-10-04 09:49:02 +02:00
Tobias Brunner
8a7910522c keymat_v2: Include optional IntAuth in signed octets 2022-10-04 09:49:02 +02:00
Tobias Brunner
69d5c3fade authenticator: Add optional method to set IntAuth data 2022-10-04 09:49:02 +02:00
Tobias Brunner
d9f3527519 message: Store original encrypted payload when generating fragments
If we don't do this, get_plain() will fail after generating the message
fragmented.
2022-10-04 09:49:02 +02:00
Tobias Brunner
d290c54362 message: Add method to generate data to authenticate IKE_INTERMEDIATE exchanges 2022-10-04 09:49:02 +02:00
Tobias Brunner
c1fa35422e generator: Make pointer to length field optional
Only useful if we generate an IKE header.
2022-10-04 09:49:02 +02:00
Tobias Brunner
f95819e87d keymat_v2: Add method to calculate IntAuth for IKE_INTERMEDIATE exchanges 2022-10-04 09:49:02 +02:00
Tobias Brunner
f5226e531c message: Add rules for IKE_FOLLOWUP_KE exchanges 2022-10-04 09:49:02 +02:00
Tobias Brunner
333fbe447b wip: ike-header: Add IKE_FOLLOWUP_KE exchange type 2022-10-04 09:49:02 +02:00
Tobias Brunner
f4b9f0af9f wip: notify-payload: Add notify types for multiple key exchanges 2022-10-04 09:49:02 +02:00
Tobias Brunner
af5a06a279 ikev2: Reject IKE_INTERMEDIATE requests after IKE_AUTH
We currently only support these exchanges for additional key exchanges,
so once we have the final keys derived and the ike-init task is removed,
we don't expect any more of them.
2022-10-04 09:49:02 +02:00
Tobias Brunner
4810ecc926 message: Add rules for IKE_INTERMEDIATE exchanges 2022-10-03 17:37:43 +02:00
Tobias Brunner
db5aad74c3 ike-header: Add IKE_INTERMEDIATE exchange type 2022-10-03 17:37:43 +02:00
Tobias Brunner
a1803e58f4 notify-payload: Add notify type for IKE_INTERMEDIATE exchange 2022-10-03 17:37:43 +02:00
Tobias Brunner
daf9b9faa0 proposal-substructure: Encode additional key exchange methods 2022-10-03 17:37:43 +02:00
Tobias Brunner
17584a1ae0 proposal: Make all key exchange transforms optional in ESP/AH proposals 2022-10-03 17:37:43 +02:00
Tobias Brunner
a467b786e6 proposal: Skip all KE transforms if PROPOSAL_SKIP_KE given 2022-10-03 17:37:43 +02:00
Tobias Brunner
f7579edb2c transform: Add helper to check if transform type negotiates key exchange 2022-10-03 17:37:43 +02:00
Tobias Brunner
c59cafead2 transform: Add additional key exchange transform types 2022-10-03 17:37:43 +02:00
Andreas Steffen
e09bc70d12 Version bump to 5.9.8 5.9.8 2022-10-03 16:16:53 +02:00
Tobias Brunner
b2488db2ce NEWS: Add info about CVE-2022-40617 2022-10-03 10:48:46 +02:00
Tobias Brunner
1f870ae189 cert-validator: Use a separate method for online revocation checking
This avoids having to repeat offline checks after basic trust chain
validation.
2022-10-03 10:48:46 +02:00
Tobias Brunner
1968615590 revocation: Enforce a (configurable) timeout when fetching OCSP/CRL
Malicious servers could otherwise block the fetching thread indefinitely
after the initial TCP handshake (which has a default timeout of 10s
in the curl and winhttp plugins, the soup plugin actually has a default
overall timeout of 10s).
2022-10-03 10:48:46 +02:00
Tobias Brunner
b1e926148a credential-manager: Do online revocation checks only after basic trust chain validation
This avoids querying URLs of potentially untrusted certificates, e.g. if
an attacker sends a specially crafted end-entity and intermediate CA
certificate with a CDP that points to a server that completes the
TCP handshake but then does not send any further data, which will block
the fetcher thread (depending on the plugin) for as long as the default
timeout for TCP.  Doing that multiple times will block all worker threads,
leading to a DoS attack.

The logging during the certificate verification obviously changes.  The
following example shows the output of `pki --verify` for the current
strongswan.org certificate:

new:

  using certificate "CN=www.strongswan.org"
  using trusted intermediate ca certificate "C=US, O=Let's Encrypt, CN=R3"
  using trusted ca certificate "C=US, O=Internet Security Research Group, CN=ISRG Root X1"
  reached self-signed root ca with a path length of 1
checking certificate status of "CN=www.strongswan.org"
  requesting ocsp status from 'http://r3.o.lencr.org' ...
  ocsp response correctly signed by "C=US, O=Let's Encrypt, CN=R3"
  ocsp response is valid: until Jul 27 12:59:58 2022
certificate status is good
checking certificate status of "C=US, O=Let's Encrypt, CN=R3"
ocsp response verification failed, no signer certificate 'C=US, O=Let's Encrypt, CN=R3' found
  fetching crl from 'http://x1.c.lencr.org/' ...
  using trusted certificate "C=US, O=Internet Security Research Group, CN=ISRG Root X1"
  crl correctly signed by "C=US, O=Internet Security Research Group, CN=ISRG Root X1"
  crl is valid: until Apr 18 01:59:59 2023
certificate status is good
certificate trusted, lifetimes valid, certificate not revoked

old:

  using certificate "CN=www.strongswan.org"
  using trusted intermediate ca certificate "C=US, O=Let's Encrypt, CN=R3"
checking certificate status of "CN=www.strongswan.org"
  requesting ocsp status from 'http://r3.o.lencr.org' ...
  ocsp response correctly signed by "C=US, O=Let's Encrypt, CN=R3"
  ocsp response is valid: until Jul 27 12:59:58 2022
certificate status is good
  using trusted ca certificate "C=US, O=Internet Security Research Group, CN=ISRG Root X1"
checking certificate status of "C=US, O=Let's Encrypt, CN=R3"
ocsp response verification failed, no signer certificate 'C=US, O=Let's Encrypt, CN=R3' found
  fetching crl from 'http://x1.c.lencr.org/' ...
  using trusted certificate "C=US, O=Internet Security Research Group, CN=ISRG Root X1"
  crl correctly signed by "C=US, O=Internet Security Research Group, CN=ISRG Root X1"
  crl is valid: until Apr 18 01:59:59 2023
certificate status is good
  reached self-signed root ca with a path length of 1
certificate trusted, lifetimes valid, certificate not revoked

Note that this also fixes an issue with the previous dual-use of the
`trusted` flag.  It not only indicated whether the chain is trusted but
also whether the current issuer is the root anchor (the corresponding
flag in the `cert_validator_t` interface is called `anchor`).  This was
a problem when building multi-level trust chains for pre-trusted
end-entity certificates (i.e. where `trusted` is TRUE from the start).
This caused the main loop to get aborted after the first intermediate CA
certificate and the mentioned `anchor` flag wasn't correct in any calls
to `cert_validator_t` implementations.

Fixes: CVE-2022-40617
2022-10-03 10:48:46 +02:00
Andreas Steffen
6bf60221f5 pkcs7: Support rsa-pss signatures 2022-10-03 09:52:07 +02:00
Tobias Brunner
e0fd191f31 object: Make INIT() a compound statement
This forces the use of a semicolon after INIT() and makes existing ones,
which was the case for basically all instances, necessary so e.g.
sonarcloud won't complain about an empty statement after every one of
them.

By evaluating to the allocated object, it would theoretically also allow
constructs like this:

  struct_t *this;

  return INIT(this,
  	.a = x,
  	.b = y,
  );

or this:

  array_insert(a, ARRAY_TAIL, INIT(this,
    .a = x,
    .b = y,
  ));
2022-09-29 11:36:00 +02:00
Tobias Brunner
3da4ac8ef6 pki: Remove superfluous ; when initializing EST client 2022-09-29 11:34:50 +02:00
Tobias Brunner
ce82edfbe2 NEWS: Add news for 5.9.8
Also fixed the RFC number for EST.
2022-09-29 09:44:32 +02:00
Tobias Brunner
895597817a github: Prefer third-party crypto lib's implementations over ours
If e.g. the hmac plugin is loaded before the third-party crypto lib
plugin, we might not use the latter's HMAC implementation in some
cases (e.g. in the libtls tests).
2022-09-28 17:17:56 +02:00
Tobias Brunner
b05a8927d9 lgtm: Don't build with ASan and extra warnings 2022-09-28 15:37:27 +02:00