From patchwork Tue Mar 3 13:21:34 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Hicks X-Patchwork-Id: 5922511 X-Patchwork-Delegate: herbert@gondor.apana.org.au Return-Path: X-Original-To: patchwork-linux-crypto@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id D5AD09F54F for ; Tue, 3 Mar 2015 13:21:54 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E23082026C for ; Tue, 3 Mar 2015 13:21:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0727D20272 for ; Tue, 3 Mar 2015 13:21:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756417AbbCCNVw (ORCPT ); Tue, 3 Mar 2015 08:21:52 -0500 Received: from mail-ig0-f180.google.com ([209.85.213.180]:40564 "EHLO mail-ig0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756061AbbCCNVv (ORCPT ); Tue, 3 Mar 2015 08:21:51 -0500 Received: by igal13 with SMTP id l13so27201249iga.5 for ; Tue, 03 Mar 2015 05: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=YrX0UX5R+j2D/yA7dsZfas73RyuetwTgqKMC7d87Ogg=; b=i2kvMHYW9JKIr8TS/KwqtTaJw5eiG+sbPdZvI5Fdos9Ol4Cx7QunssPgIfaX0HE1nY pnqm2t5G4odvAErF35y3s6AUPpxDEm4RzihAk7A2lulxlITm0SpS/POFfr/vg/D7X1UF dU2LPuV1Up+cehqSx9tVfvrkevqIFY7OhqJtMq+qHfm9GxtBUgwRRdbPOsn6qbEW/rR7 P2TiyK3y0LGv3B+h3a+AesEvei68MCy3ipeHsAORfxZxkEw1EQl2hp8VTMfYiTkNpXHy XMIkVu4Xz+DdWgDNBvvSz3O1G5c13ucwiPhI679v41VFDnh6p0Cgy40Zp2yLsNqv1cSu x3FA== X-Received: by 10.107.9.26 with SMTP id j26mr1654705ioi.91.1425388910839; Tue, 03 Mar 2015 05: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 mi3sm8782809igb.13.2015.03.03.05.21.49 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 03 Mar 2015 05:21:50 -0800 (PST) From: Martin Hicks To: Kim Phillips , Scott Wood , Kumar Gala Cc: linuxppc-dev@lists.ozlabs.org, linux-crypto@vger.kernel.org, =?UTF-8?q?Horia=20Geant=C4=83?= , Martin Hicks Subject: [PATCH v2 2/5] crypto: talitos: Remove MD5_BLOCK_SIZE Date: Tue, 3 Mar 2015 08:21:34 -0500 Message-Id: <1425388897-5434-3-git-send-email-mort@bork.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1425388897-5434-1-git-send-email-mort@bork.org> References: <1425388897-5434-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=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD,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. Signed-off-by: Martin Hicks Acked-by: Kim Phillips --- 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, }