nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-10-03 13:30:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #161897 from risicle/ris-wolfssl-CVE-2022-25638-CVE-2022-25640-r21.11

Browse Source
This commit is contained in:
Martin Weinelt
2022-03-05 20:17:38 +01:00
committed by GitHub
parent aa16d40b19 acf18a10e8
commit b29586bb1c
2 changed files with 88 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
pkgs/development/libraries/wolfssl/5.0.0-CVE-2022-25638.patch Normal file
View File

@@ -0,0 +1,82 @@
Based on upstream https://github.com/wolfSSL/wolfssl/commit/f6d79ff598f5a007f2455d1c3f9e22c9e0875b5c.patch
with sections handling falcon signatures removed (because they weren't added
until 5.1.0)
diff --git a/src/tls13.c b/src/tls13.c
index e36dcd56b..e4e345f6c 100644
--- a/src/tls13.c
+++ b/src/tls13.c
@@ -6432,6 +6432,8 @@ static int DoTls13CertificateVerify(WOLFSSL* ssl, byte* input,
case TLS_ASYNC_BUILD:
{
+ int validSigAlgo;
+
/* Signature algorithm. */
if ((args->idx - args->begin) + ENUM_LEN + ENUM_LEN > totalSz) {
ERROR_OUT(BUFFER_ERROR, exit_dcv);
@@ -6456,41 +6458,44 @@ static int DoTls13CertificateVerify(WOLFSSL* ssl, byte* input,
}
/* Check for public key of required type. */
+ /* Assume invalid unless signature algo matches the key provided */
+ validSigAlgo = 0;
#ifdef HAVE_ED25519
- if (args->sigAlgo == ed25519_sa_algo &&
- !ssl->peerEd25519KeyPresent) {
- WOLFSSL_MSG("Peer sent ED25519 sig but not ED25519 cert");
- ret = SIG_VERIFY_E;
- goto exit_dcv;
+ if (args->sigAlgo == ed25519_sa_algo) {
+ WOLFSSL_MSG("Peer sent ED25519 sig");
+ validSigAlgo = (ssl->peerEd25519Key != NULL) &&
+ ssl->peerEd25519KeyPresent;
}
#endif
#ifdef HAVE_ED448
- if (args->sigAlgo == ed448_sa_algo && !ssl->peerEd448KeyPresent) {
- WOLFSSL_MSG("Peer sent ED448 sig but not ED448 cert");
- ret = SIG_VERIFY_E;
- goto exit_dcv;
+ if (args->sigAlgo == ed448_sa_algo) {
+ WOLFSSL_MSG("Peer sent ED448 sig");
+ validSigAlgo = (ssl->peerEd448Key != NULL) &&
+ ssl->peerEd448KeyPresent;
}
#endif
#ifdef HAVE_ECC
- if (args->sigAlgo == ecc_dsa_sa_algo &&
- !ssl->peerEccDsaKeyPresent) {
- WOLFSSL_MSG("Peer sent ECC sig but not ECC cert");
- ret = SIG_VERIFY_E;
- goto exit_dcv;
+ if (args->sigAlgo == ecc_dsa_sa_algo) {
+ WOLFSSL_MSG("Peer sent ECC sig");
+ validSigAlgo = (ssl->peerEccDsaKey != NULL) &&
+ ssl->peerEccDsaKeyPresent;
}
#endif
#ifndef NO_RSA
if (args->sigAlgo == rsa_sa_algo) {
- WOLFSSL_MSG("Peer sent PKCS#1.5 algo but not in certificate");
+ WOLFSSL_MSG("Peer sent PKCS#1.5 algo - not valid TLS 1.3");
ERROR_OUT(INVALID_PARAMETER, exit_dcv);
}
- if (args->sigAlgo == rsa_pss_sa_algo &&
- (ssl->peerRsaKey == NULL || !ssl->peerRsaKeyPresent)) {
- WOLFSSL_MSG("Peer sent RSA sig but not RSA cert");
- ret = SIG_VERIFY_E;
- goto exit_dcv;
+ if (args->sigAlgo == rsa_pss_sa_algo) {
+ WOLFSSL_MSG("Peer sent RSA sig");
+ validSigAlgo = (ssl->peerRsaKey != NULL) &&
+ ssl->peerRsaKeyPresent;
}
#endif
+ if (!validSigAlgo) {
+ WOLFSSL_MSG("Sig algo doesn't correspond to certficate");
+ ERROR_OUT(SIG_VERIFY_E, exit_dcv);
+ }
sig->buffer = (byte*)XMALLOC(args->sz, ssl->heap,
DYNAMIC_TYPE_SIGNATURE);

6
pkgs/development/libraries/wolfssl/default.nix
View File

@@ -22,6 +22,12 @@ stdenv.mkDerivation rec {
url = "https://github.com/wolfSSL/wolfssl/commit/73b4cc9476f6355a91138f545f3fd007ce058255.patch";
sha256 = "0r3z6ybmx3ylnw9zdva3gq4jy691r471qvhy6dvdgmdksh2kx63v";
})
./5.0.0-CVE-2022-25638.patch
(fetchpatch {
name = "CVE-2022-25640.patch";
url = "https://github.com/wolfSSL/wolfssl/commit/67b2a1be4027bc1d09baff6e93562c61a44998ab.patch";
sha256 = "1bcc6kfpn8wh7hbdb80yr16ik2mh0zg11cbzbi41z2rp4kc6d1ni";
})
];
# Almost same as Debian but for now using --enable-all --enable-reproducible-build instead of --enable-distro to ensure options.h gets installed