Date: Sun, 22 Sep 2013 16:34:15 GMT From: def@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r257614 - in soc2013/def/crashdump-head: sbin/dumpkey sbin/savecore sys/sys Message-ID: <201309221634.r8MGYFnU021092@socsvn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: def Date: Sun Sep 22 16:34:15 2013 New Revision: 257614 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=257614 Log: Use XTS-AES-256 (see IEEE Std 1619-2007). Modified: soc2013/def/crashdump-head/sbin/dumpkey/dumpkey.c soc2013/def/crashdump-head/sbin/savecore/decryptfile.c soc2013/def/crashdump-head/sys/sys/kerneldump.h Modified: soc2013/def/crashdump-head/sbin/dumpkey/dumpkey.c ============================================================================== --- soc2013/def/crashdump-head/sbin/dumpkey/dumpkey.c Sun Sep 22 15:51:23 2013 (r257613) +++ soc2013/def/crashdump-head/sbin/dumpkey/dumpkey.c Sun Sep 22 16:34:15 2013 (r257614) @@ -91,10 +91,10 @@ bzero(tweak_ctx, sizeof(struct xts_ctx)); hkdf_expand(&ctx, masterkey, key, 1, kerneldump_magic, sizeof(kerneldump_magic)); - xts_alg_aes.pa_keysetup(data_ctx, key, KERNELDUMP_KEY_SIZE << 3); + xts_alg_aes.pa_keysetup(data_ctx, key, KERNELDUMP_KEY_SIZE << 2); hkdf_expand(&ctx, masterkey, key, 2, kerneldump_magic, sizeof(kerneldump_magic)); - xts_alg_aes.pa_keysetup(tweak_ctx, key, KERNELDUMP_KEY_SIZE << 3); + xts_alg_aes.pa_keysetup(tweak_ctx, key, KERNELDUMP_KEY_SIZE << 2); bzero(&ctx, sizeof(struct xts_ctx)); bzero(key, KERNELDUMP_KEY_SIZE); Modified: soc2013/def/crashdump-head/sbin/savecore/decryptfile.c ============================================================================== --- soc2013/def/crashdump-head/sbin/savecore/decryptfile.c Sun Sep 22 15:51:23 2013 (r257613) +++ soc2013/def/crashdump-head/sbin/savecore/decryptfile.c Sun Sep 22 16:34:15 2013 (r257614) @@ -157,10 +157,10 @@ decrypt_key_for(fd, private_key_file); hkdf_expand(&ctx, fd->key, key, 1, kerneldump_magic, sizeof(kerneldump_magic)); - xts_alg_aes.pa_keysetup(&fd->data_ctx, key, KERNELDUMP_KEY_SIZE << 3); + xts_alg_aes.pa_keysetup(&fd->data_ctx, key, KERNELDUMP_KEY_SIZE << 2); hkdf_expand(&ctx, fd->key, key, 2, kerneldump_magic, sizeof(kerneldump_magic)); - xts_alg_aes.pa_keysetup(&fd->tweak_ctx, key, KERNELDUMP_KEY_SIZE << 3); + xts_alg_aes.pa_keysetup(&fd->tweak_ctx, key, KERNELDUMP_KEY_SIZE << 2); bzero(&ctx, sizeof(ctx)); bzero(key, KERNELDUMP_KEY_SIZE); Modified: soc2013/def/crashdump-head/sys/sys/kerneldump.h ============================================================================== --- soc2013/def/crashdump-head/sys/sys/kerneldump.h Sun Sep 22 15:51:23 2013 (r257613) +++ soc2013/def/crashdump-head/sys/sys/kerneldump.h Sun Sep 22 16:34:15 2013 (r257614) @@ -76,7 +76,7 @@ #define KERNELDUMP_POWERPC_VERSION 1 #define KERNELDUMP_SPARC64_VERSION 1 #define KERNELDUMP_TEXT_VERSION 1 -#define KERNELDUMP_KEY_SIZE 32 +#define KERNELDUMP_KEY_SIZE 64 #define KERNELDUMP_ENCRYPTED_KEY_SIZE 256 #define KERNELDUMP_TWEAK_SIZE 8 uint64_t dumplength; /* excl headers */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309221634.r8MGYFnU021092>