Received: by 2002:ab2:6857:0:b0:1ef:ffd0:ce49 with SMTP id l23csp1063437lqp; Fri, 22 Mar 2024 04:45:07 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCXey6BrohG2gfCqP0gD8l5vk7+Xy0mRQ8ePI8j9ttOvaHwiWLvsL/4fpm6v9FXvQEkrVhtJejz2bD0BhaPJlFhGx/JGp9XMFmrrpwIz8w== X-Google-Smtp-Source: AGHT+IElUywnfc0JBrskFUm9InZxZbWRw+9WQhmoUYjTnqVhDMpCGCkalo5jplNd9m07kgvfYtb6 X-Received: by 2002:ac8:59c4:0:b0:431:a95:9634 with SMTP id f4-20020ac859c4000000b004310a959634mr2307064qtf.10.1711107907693; Fri, 22 Mar 2024 04:45:07 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1711107907; cv=pass; d=google.com; s=arc-20160816; b=ZLq2hEEXFWM9veVwNZI0rdCZim4kXj/zCr8h10FnVF4f5nuR3rU5zQzFRsodxMGuq7 RiCOuQvg9v9zvYtvKpHcjf7TeQhCZL1k9ZLhmxybsQxhV4//Gx9+M7ybNeCikmRTTDL7 gXVZDmhk6HJn6X3rPZwq01ajwFjGdeVllLFj8uouOhNGhSKa0PGokjS6IGTEnVI1UtZ6 QWi7LUpFm7RLmJpflEmkzzm8J+4LIR+47z2QzQArUsQE6JPYZpaDyh3Hw/dliFiySqHv 0f8FnhwsXntz93wVUNFaYA4hAEKEfITpu9OtLnxglGuYxjJXQ5lY5ClkUVOU1NFM83Hy COaA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=in-reply-to:content-disposition:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:message-id:subject:cc :to:from:date; bh=ndaqG61MgZ0GyMPaZCBM69k2FFaqCuIv8lFrDRr4yZw=; fh=oMNb+3CuGw04ArJ0f5q910D8Ui6OY9QD/1VW6UwZJU8=; b=NU11nPqqfDppivcug6eXkFkUA5SZ11/Z70YSudI1em+lOa44jyz/OSrx8Ocs2xVy/5 pTiwBi7uncPmuLEZitzGReSlpqBhZwoQf8VxeDIMw32D8KXGYBj/fD4uNCyJ4e98dFvx MZrlgBGPQCHpJxiZQDqagsc95d1/3+uVtf2UDTFLhtCjcS+EUjfoyW2QfPoqot63M3aT M7zcKcHoYLGXDmKqlx/xyV8Yyxvl+pVHzlOjAIe6yOewzWmOkn8cUKfY5quRoTD8IPNE 0LifekAeF5ZLivo79V+9MOEn98JfnzLW1emryrooqT373A8Ut3n46G4Z7y89PYrar8Bn 7acQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1 spf=pass spfdomain=gondor.apana.org.au dmarc=pass fromdomain=gondor.apana.org.au); spf=pass (google.com: domain of linux-wireless+bounces-5150-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-wireless+bounces-5150-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=fail (p=REJECT sp=QUARANTINE dis=QUARANTINE) header.from=apana.org.au Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id c22-20020ac85a96000000b00430c7895b2bsi1765165qtc.235.2024.03.22.04.45.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Mar 2024 04:45:07 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-wireless+bounces-5150-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; arc=pass (i=1 spf=pass spfdomain=gondor.apana.org.au dmarc=pass fromdomain=gondor.apana.org.au); spf=pass (google.com: domain of linux-wireless+bounces-5150-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-wireless+bounces-5150-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=fail (p=REJECT sp=QUARANTINE dis=QUARANTINE) header.from=apana.org.au Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 696261C21FC7 for ; Fri, 22 Mar 2024 11:45:07 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 5FDB13F9CE; Fri, 22 Mar 2024 11:45:02 +0000 (UTC) X-Original-To: linux-wireless@vger.kernel.org Received: from abb.hmeau.com (abb.hmeau.com [144.6.53.87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 279AE3F8F4; Fri, 22 Mar 2024 11:44:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=144.6.53.87 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711107902; cv=none; b=tCC8bFI8XJoR4T6c6K7iaUiVNGBLkTO0I758ikqMt9bvfO1jzex3KA4oYjiAPglMaWbl2QUG0NTyzAGqu2wPP/w0IgKJw6QNM3QMlBqseglq73iVoh8DaRbreygyyYGj042Xgwe4zbSF85nR9WSNIDKOqXkGwEPch/4lu9CDYKo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711107902; c=relaxed/simple; bh=3TzN2Lt6QPOtvQCHtJ7t44fnCg8LERCTZqdH35s6BEY=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=E/3xWJZ636Xmd1z9dFFBrxlD3Y2/vBZbQRBIuemvw7sHrGCb+UrWHyUjW02YRnitxc9VIJvOKFX8Ug/4s5NIxaTS1kJTI64oZPAqTUgRZuBo/DP8AYcCIK3GvvGS2O91zfnFllF+U5w5WQuPmsDyiIYLct6nbs/BBzsGUMdSxOE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=gondor.apana.org.au; spf=pass smtp.mailfrom=gondor.apana.org.au; arc=none smtp.client-ip=144.6.53.87 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=gondor.apana.org.au Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gondor.apana.org.au Received: from loth.rohan.me.apana.org.au ([192.168.167.2]) by formenos.hmeau.com with smtp (Exim 4.94.2 #2 (Debian)) id 1rndKP-009XMk-Km; Fri, 22 Mar 2024 19:44:54 +0800 Received: by loth.rohan.me.apana.org.au (sSMTP sendmail emulation); Fri, 22 Mar 2024 19:45:09 +0800 Date: Fri, 22 Mar 2024 19:45:09 +0800 From: Herbert Xu To: Eric Biggers Cc: linux-crypto@vger.kernel.org, keyrings@vger.kernel.org, linux-wireless@vger.kernel.org, iwd@lists.linux.dev, James Prestwood , Dimitri John Ledkov , Karel Balej Subject: Re: [PATCH] Revert "crypto: pkcs7 - remove sha1 support" Message-ID: References: <20240313233227.56391-1-ebiggers@kernel.org> Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240313233227.56391-1-ebiggers@kernel.org> On Wed, Mar 13, 2024 at 04:32:27PM -0700, Eric Biggers wrote: > From: Eric Biggers > > This reverts commit 16ab7cb5825fc3425c16ad2c6e53d827f382d7c6 because it > broke iwd. iwd uses the KEYCTL_PKEY_* UAPIs via its dependency libell, > and apparently it is relying on SHA-1 signature support. These UAPIs > are fairly obscure, and their documentation does not mention which > algorithms they support. iwd really should be using a properly > supported userspace crypto library instead. Regardless, since something > broke we have to revert the change. > > It may be possible that some parts of this commit can be reinstated > without breaking iwd (e.g. probably the removal of MODULE_SIG_SHA1), but > for now this just does a full revert to get things working again. > > Reported-by: Karel Balej > Closes: https://lore.kernel.org/r/CZSHRUIJ4RKL.34T4EASV5DNJM@matfyz.cz > Cc: Dimitri John Ledkov > Signed-off-by: Eric Biggers > --- > crypto/asymmetric_keys/mscode_parser.c | 3 + > crypto/asymmetric_keys/pkcs7_parser.c | 4 ++ > crypto/asymmetric_keys/public_key.c | 3 +- > crypto/asymmetric_keys/signature.c | 2 +- > crypto/asymmetric_keys/x509_cert_parser.c | 8 +++ > crypto/testmgr.h | 80 +++++++++++++++++++++++ > include/linux/oid_registry.h | 4 ++ > kernel/module/Kconfig | 5 ++ > 8 files changed, 107 insertions(+), 2 deletions(-) Patch applied. Thanks. -- Email: Herbert Xu Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt