From patchwork Fri Feb 20 16:21:13 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Hicks X-Patchwork-Id: 5856881 X-Patchwork-Delegate: herbert@gondor.apana.org.au Return-Path: X-Original-To: patchwork-linux-crypto@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id A9C32BF440 for ; Fri, 20 Feb 2015 16:21:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id ECF8720437 for ; Fri, 20 Feb 2015 16:21:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 16D7B20414 for ; Fri, 20 Feb 2015 16:21:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754297AbbBTQVv (ORCPT ); Fri, 20 Feb 2015 11:21:51 -0500 Received: from mail-ie0-f181.google.com ([209.85.223.181]:40731 "EHLO mail-ie0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753812AbbBTQVv (ORCPT ); Fri, 20 Feb 2015 11:21:51 -0500 Received: by iebtr6 with SMTP id tr6so8924964ieb.7 for ; Fri, 20 Feb 2015 08:21:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=uP3tXUDiir0Am1JaVUs9jQcCXsEepMi/sd3w1uCygaw=; b=vbdpYbhW4jLcuKq5ibt5mrC5va2ndBBiGzkzrGGJ3UHgYpjTT1gah7d1EjaH9xDawv cpFTak5luWai4Dk4D88AQyJuxlG2JQgaMTndzpHXNDCzKgPhqf+K1ZBgJNWjHKAKh9D6 NOUEBlpJb5UQfPpjPZ8ZLsC7EHC84dXzUFnSF1Q+so+hG2aBOD7YkmdLq66QhdBahH8Q py7E+kCq8ke/ia7leplBvEtSKEsaMSUoasKj0Furg551tAvNlwOasfvow2m8a4o27PLI mPDAIb7iSBrMktEsgZOfemdI3GleAa7I8NAsv5KaKOK9PKsauryxkuq7FJShrhxVnYDU yI6A== X-Received: by 10.107.27.143 with SMTP id b137mr14401366iob.76.1424449310273; Fri, 20 Feb 2015 08:21:50 -0800 (PST) Received: from p1022build.eng-services.ca (cmr-208-97-87-171.cr.net.cable.rogers.com. [208.97.87.171]) by mx.google.com with ESMTPSA id n17sm3025997igi.2.2015.02.20.08.21.47 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 20 Feb 2015 08:21:49 -0800 (PST) From: Martin Hicks To: Kim Phillips , Scott Wood , Kumar Gala Cc: linuxppc-dev@lists.ozlabs.org, linux-crypto@vger.kernel.org, Martin Hicks Subject: [PATCH 2/5] crypto: talitos: Remove MD5_BLOCK_SIZE Date: Fri, 20 Feb 2015 11:21:13 -0500 Message-Id: <1424449276-5288-3-git-send-email-mort@bork.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1424449276-5288-1-git-send-email-mort@bork.org> References: <1424449276-5288-1-git-send-email-mort@bork.org> Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org X-Spam-Status: No, score=-7.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This is properly defined in the md5 header file. --- drivers/crypto/talitos.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/crypto/talitos.c b/drivers/crypto/talitos.c index c49d977..89cf4d5 100644 --- a/drivers/crypto/talitos.c +++ b/drivers/crypto/talitos.c @@ -637,8 +637,6 @@ static void talitos_unregister_rng(struct device *dev) #define TALITOS_MAX_KEY_SIZE 96 #define TALITOS_MAX_IV_LENGTH 16 /* max of AES_BLOCK_SIZE, DES3_EDE_BLOCK_SIZE */ -#define MD5_BLOCK_SIZE 64 - struct talitos_ctx { struct device *dev; int ch; @@ -2195,7 +2193,7 @@ static struct talitos_alg_template driver_algs[] = { .halg.base = { .cra_name = "md5", .cra_driver_name = "md5-talitos", - .cra_blocksize = MD5_BLOCK_SIZE, + .cra_blocksize = MD5_HMAC_BLOCK_SIZE, .cra_flags = CRYPTO_ALG_TYPE_AHASH | CRYPTO_ALG_ASYNC, } @@ -2285,7 +2283,7 @@ static struct talitos_alg_template driver_algs[] = { .halg.base = { .cra_name = "hmac(md5)", .cra_driver_name = "hmac-md5-talitos", - .cra_blocksize = MD5_BLOCK_SIZE, + .cra_blocksize = MD5_HMAC_BLOCK_SIZE, .cra_flags = CRYPTO_ALG_TYPE_AHASH | CRYPTO_ALG_ASYNC, }