From owner-svn-soc-all@FreeBSD.ORG Sun Jul 28 18:06:27 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 975D8F59 for ; Sun, 28 Jul 2013 18:06:27 +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 6B170241F for ; Sun, 28 Jul 2013 18:06:27 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6SI6RHU086900 for ; Sun, 28 Jul 2013 18:06:27 GMT (envelope-from def@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r6SI6RmU086880 for svn-soc-all@FreeBSD.org; Sun, 28 Jul 2013 18:06:27 GMT (envelope-from def@FreeBSD.org) Date: Sun, 28 Jul 2013 18:06:27 GMT Message-Id: <201307281806.r6SI6RmU086880@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: r255276 - 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: Sun, 28 Jul 2013 18:06:27 -0000 Author: def Date: Sun Jul 28 18:06:27 2013 New Revision: 255276 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=255276 Log: Remove xts_smallblock because it's not a part of the standard and crash dumps are larger than 16B. Modified: soc2013/def/crashdump-head/sys/crypto/xts.c Modified: soc2013/def/crashdump-head/sys/crypto/xts.c ============================================================================== --- soc2013/def/crashdump-head/sys/crypto/xts.c Sun Jul 28 17:54:42 2013 (r255275) +++ soc2013/def/crashdump-head/sys/crypto/xts.c Sun Jul 28 18:06:27 2013 (r255276) @@ -125,26 +125,6 @@ } static __inline void -xts_smallblock(const struct xts_alg *alg, const struct xts_ctx *data_ctx, - uint64_t *tweak, const uint8_t *src, uint8_t *dst, int len) -{ - uint8_t buf[XTS_BLK_BYTES], *p; - - /* - * Encryption/decryption of sectors smaller then 128 bits is not defined - * by IEEE P1619 standard. - * To work around it encrypt such sector in CTR mode. - * CTR tweak (counter) value is XTS-tweak xor'ed with block length, i.e. - * entire small block has to be reencrypted after length change. - */ - memset(buf, len, XTS_BLK_BYTES); - xor128(buf, buf, tweak); - alg->pa_encrypt(data_ctx, buf, buf); - for (p = buf; len > 0; len--) - *(dst++) = *(src++) ^ *(p++); -} - -static __inline void xts_start(const struct xts_alg *alg, const struct xts_ctx *tweak_ctx, uint64_t *tweak, uint64_t sector, const uint8_t *xtweak) { @@ -165,11 +145,6 @@ xts_start(alg, tweak_ctx, tweak, sector, xtweak); - if (len < XTS_BLK_BYTES) { - xts_smallblock(alg, data_ctx, tweak, src, dst, len); - return; - } - while (len >= XTS_BLK_BYTES) { xts_fullblock(alg->pa_encrypt, data_ctx, tweak, src, dst); dst += XTS_BLK_BYTES; @@ -192,11 +167,6 @@ xts_start(alg, tweak_ctx, tweak, sector, xtweak); - if (len < XTS_BLK_BYTES) { - xts_smallblock(alg, data_ctx, tweak, src, dst, len); - return; - } - if ((len & XTS_BLK_MASK) != 0) len -= XTS_BLK_BYTES;