From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AH8x2265xkdaTIYTkf3fP+cF8NmSvCIYFDBvrtzc2vKxaffEWputXfCuIIG87ghn8uCxAOa5r2m0 ARC-Seal: i=1; a=rsa-sha256; t=1518709421; cv=none; d=google.com; s=arc-20160816; b=J3EMglu+qXGqnyz71cWej6rPnUnYJA8IqRqsCiwZKxaTOWnzrl6E5Q8DNzFH9TZnQs ZV7X6ksVmaKr76z/pPJ2LhmBS3HygjmRVpvz0MPJrcLALdP2cjFttkl+XFad8/nbXN2v BWYchzZ1D9yCuDZB0xOI3HcegqGoJvj7sbUaRdlwF58OPpyUxCuhA9XTWDbgHZCPlAy8 YP1F0FZL4cuCh73oLwZJ0F0TXbkma3Yq6CvkvZkDcykPi0pZLQrtC3xDjU2hrRvsSy16 /a/CWfXWw1zM/R7lyz71tsGN674vH8K11jRAaWoPMwzNi6/f9Anc6JMk5wUuOWpzB5LZ 6mTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=uXaMLA78NWfQ8O06CjC7laR3F+R0aKI6TSgsYpD2G74=; b=Bc8bdjHDynh5RAMhp9xw925eiX5I48eU7oCmRHGrgSKT11yiPPpAANNNCkEPw3yqi4 mSW3KRxG+Jg7izkZtr4U++WVwoVrq9l30Aaaa1O6uMwWtf17I7ZgSwcKJ+pAOb7YHJz/ JJ4VZX0vzQm4fbzQOkfL8MJ11BM5lfYuRQspZzsp5Hj8BnKLbgatlLZFsmyu5dkeiqdo PWSdj+8WIIHT45w6WAN5vUotm9jIVedR9vzzBe8Ui+k3KcKIX6GiRYCLSo8jOoJBr5m8 0fWtYVWTltjJXMrl3sADK+Gso7JLJZ2QLDuhCEp4X4HiYn+NGcqtWrJcd2Rw8VMguKr3 Zdqw== ARC-Authentication-Results: i=1; mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.71.90 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org Authentication-Results: mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.71.90 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Eric Biggers , Herbert Xu Subject: [PATCH 4.15 111/202] crypto: poly1305 - remove ->setkey() method Date: Thu, 15 Feb 2018 16:16:51 +0100 Message-Id: <20180215151719.048865454@linuxfoundation.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180215151712.768794354@linuxfoundation.org> References: <20180215151712.768794354@linuxfoundation.org> User-Agent: quilt/0.65 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-LABELS: =?utf-8?b?IlxcU2VudCI=?= X-GMAIL-THRID: =?utf-8?q?1592480998733653142?= X-GMAIL-MSGID: =?utf-8?q?1592482250492447747?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Eric Biggers commit a16e772e664b9a261424107784804cffc8894977 upstream. Since Poly1305 requires a nonce per invocation, the Linux kernel implementations of Poly1305 don't use the crypto API's keying mechanism and instead expect the key and nonce as the first 32 bytes of the data. But ->setkey() is still defined as a stub returning an error code. This prevents Poly1305 from being used through AF_ALG and will also break it completely once we start enforcing that all crypto API users (not just AF_ALG) call ->setkey() if present. Fix it by removing crypto_poly1305_setkey(), leaving ->setkey as NULL. Signed-off-by: Eric Biggers Signed-off-by: Herbert Xu Signed-off-by: Greg Kroah-Hartman --- arch/x86/crypto/poly1305_glue.c | 1 - crypto/poly1305_generic.c | 17 +++++------------ include/crypto/poly1305.h | 2 -- 3 files changed, 5 insertions(+), 15 deletions(-) --- a/arch/x86/crypto/poly1305_glue.c +++ b/arch/x86/crypto/poly1305_glue.c @@ -164,7 +164,6 @@ static struct shash_alg alg = { .init = poly1305_simd_init, .update = poly1305_simd_update, .final = crypto_poly1305_final, - .setkey = crypto_poly1305_setkey, .descsize = sizeof(struct poly1305_simd_desc_ctx), .base = { .cra_name = "poly1305", --- a/crypto/poly1305_generic.c +++ b/crypto/poly1305_generic.c @@ -47,17 +47,6 @@ int crypto_poly1305_init(struct shash_de } EXPORT_SYMBOL_GPL(crypto_poly1305_init); -int crypto_poly1305_setkey(struct crypto_shash *tfm, - const u8 *key, unsigned int keylen) -{ - /* Poly1305 requires a unique key for each tag, which implies that - * we can't set it on the tfm that gets accessed by multiple users - * simultaneously. Instead we expect the key as the first 32 bytes in - * the update() call. */ - return -ENOTSUPP; -} -EXPORT_SYMBOL_GPL(crypto_poly1305_setkey); - static void poly1305_setrkey(struct poly1305_desc_ctx *dctx, const u8 *key) { /* r &= 0xffffffc0ffffffc0ffffffc0fffffff */ @@ -76,6 +65,11 @@ static void poly1305_setskey(struct poly dctx->s[3] = get_unaligned_le32(key + 12); } +/* + * Poly1305 requires a unique key for each tag, which implies that we can't set + * it on the tfm that gets accessed by multiple users simultaneously. Instead we + * expect the key as the first 32 bytes in the update() call. + */ unsigned int crypto_poly1305_setdesckey(struct poly1305_desc_ctx *dctx, const u8 *src, unsigned int srclen) { @@ -281,7 +275,6 @@ static struct shash_alg poly1305_alg = { .init = crypto_poly1305_init, .update = crypto_poly1305_update, .final = crypto_poly1305_final, - .setkey = crypto_poly1305_setkey, .descsize = sizeof(struct poly1305_desc_ctx), .base = { .cra_name = "poly1305", --- a/include/crypto/poly1305.h +++ b/include/crypto/poly1305.h @@ -31,8 +31,6 @@ struct poly1305_desc_ctx { }; int crypto_poly1305_init(struct shash_desc *desc); -int crypto_poly1305_setkey(struct crypto_shash *tfm, - const u8 *key, unsigned int keylen); unsigned int crypto_poly1305_setdesckey(struct poly1305_desc_ctx *dctx, const u8 *src, unsigned int srclen); int crypto_poly1305_update(struct shash_desc *desc,