From owner-svn-soc-all@FreeBSD.ORG Fri Aug 2 00:49:48 2013 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id ADC4BA35 for ; Fri, 2 Aug 2013 00:49:48 +0000 (UTC) (envelope-from def@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 98C082324 for ; Fri, 2 Aug 2013 00:49:48 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r720nmDK045254 for ; Fri, 2 Aug 2013 00:49:48 GMT (envelope-from def@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r720nmp9045246 for svn-soc-all@FreeBSD.org; Fri, 2 Aug 2013 00:49:48 GMT (envelope-from def@FreeBSD.org) Date: Fri, 2 Aug 2013 00:49:48 GMT Message-Id: <201308020049.r720nmp9045246@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to def@FreeBSD.org using -f From: def@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r255438 - soc2013/def/crashdump-head/sys/crypto MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Aug 2013 00:49:48 -0000 Author: def Date: Fri Aug 2 00:49:48 2013 New Revision: 255438 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=255438 Log: Add a power of tweak (alpha^j) as a parameter in xts_block_encrypt and xts_block_decrypt. Modified: soc2013/def/crashdump-head/sys/crypto/xts.c soc2013/def/crashdump-head/sys/crypto/xts.h Modified: soc2013/def/crashdump-head/sys/crypto/xts.c ============================================================================== --- soc2013/def/crashdump-head/sys/crypto/xts.c Fri Aug 2 00:31:24 2013 (r255437) +++ soc2013/def/crashdump-head/sys/crypto/xts.c Fri Aug 2 00:49:48 2013 (r255438) @@ -97,40 +97,46 @@ void xts_block_encrypt(const struct xts_alg *alg, const struct xts_ctx *tweak_ctx, const struct xts_ctx *data_ctx, - uint64_t sector, const uint8_t *xtweak, int len, - const uint8_t *src, uint8_t *dst) + uint64_t sector, const uint8_t *xtweak, uint64_t *alpha_j, + int len, const uint8_t *src, uint8_t *dst) { uint64_t tweak[XTS_BLK_BYTES / 8]; - xts_start(alg, tweak_ctx, tweak, sector, xtweak); + if (alpha_j == NULL) { + xts_start(alg, tweak_ctx, tweak, sector, xtweak); + alpha_j = tweak; + } while (len >= XTS_BLK_BYTES) { - xts_fullblock(alg->pa_encrypt, data_ctx, tweak, src, dst); + xts_fullblock(alg->pa_encrypt, data_ctx, alpha_j, src, dst); dst += XTS_BLK_BYTES; src += XTS_BLK_BYTES; len -= XTS_BLK_BYTES; } if (len != 0) - xts_lastblock(alg->pa_encrypt, data_ctx, tweak, src, dst, len); + xts_lastblock(alg->pa_encrypt, data_ctx, alpha_j, src, dst, len); } void xts_block_decrypt(const struct xts_alg *alg, const struct xts_ctx *tweak_ctx, const struct xts_ctx *data_ctx, - uint64_t sector, const uint8_t *xtweak, int len, - const uint8_t *src, uint8_t *dst) + uint64_t sector, const uint8_t *xtweak, uint64_t *alpha_j, + int len, const uint8_t *src, uint8_t *dst) { uint64_t tweak[XTS_BLK_BYTES / 8]; uint64_t prevtweak[XTS_BLK_BYTES / 8]; - xts_start(alg, tweak_ctx, tweak, sector, xtweak); + if (alpha_j == NULL) { + xts_start(alg, tweak_ctx, tweak, sector, xtweak); + alpha_j = tweak; + } if ((len & XTS_BLK_MASK) != 0) len -= XTS_BLK_BYTES; while (len >= XTS_BLK_BYTES) { - xts_fullblock(alg->pa_decrypt, data_ctx, tweak, src, dst); + xts_fullblock(alg->pa_decrypt, data_ctx, alpha_j, src, dst); dst += XTS_BLK_BYTES; src += XTS_BLK_BYTES; len -= XTS_BLK_BYTES; @@ -138,10 +144,10 @@ if (len != 0) { len += XTS_BLK_BYTES; - prevtweak[0] = tweak[0]; - prevtweak[1] = tweak[1]; - gf_mul128(tweak, tweak); - xts_fullblock(alg->pa_decrypt, data_ctx, tweak, src, dst); + prevtweak[0] = alpha_j[0]; + prevtweak[1] = alpha_j[1]; + gf_mul128(alpha_j, alpha_j); + xts_fullblock(alg->pa_decrypt, data_ctx, alpha_j, src, dst); dst += XTS_BLK_BYTES; src += XTS_BLK_BYTES; len -= XTS_BLK_BYTES; Modified: soc2013/def/crashdump-head/sys/crypto/xts.h ============================================================================== --- soc2013/def/crashdump-head/sys/crypto/xts.h Fri Aug 2 00:31:24 2013 (r255437) +++ soc2013/def/crashdump-head/sys/crypto/xts.h Fri Aug 2 00:49:48 2013 (r255438) @@ -111,13 +111,13 @@ void xts_block_encrypt(const struct xts_alg *alg, const struct xts_ctx *tweak_ctx, const struct xts_ctx *data_ctx, - uint64_t sector, const uint8_t *xtweak, int len, - const uint8_t *src, uint8_t *dst); + uint64_t sector, const uint8_t *xtweak, uint64_t *alpha_j, + int len, const uint8_t *src, uint8_t *dst); void xts_block_decrypt(const struct xts_alg *alg, const struct xts_ctx *tweak_ctx, const struct xts_ctx *data_ctx, - uint64_t sector, const uint8_t *xtweak, int len, - const uint8_t *src, uint8_t *dst); + uint64_t sector, const uint8_t *xtweak, uint64_t *alpha_j, + int len, const uint8_t *src, uint8_t *dst); algop_crypt_t xts_aes_encrypt; algop_crypt_t xts_aes_decrypt;