On Sun, 2014-05-18 at 12:36 -0600, Jake Edge wrote:
> Clean up file names and locations. Get rid of include/ directory and move
> those up to the top-level. Rename files to get rid of upper case. Remove
> skeinBlockNo3F.c as it was unused (temporary file or something?).
[]
> Diff appears to be huge because of the rearranging, not that much to it,
> really ...
Hi Jake.
Please use "git format-patch -M" when renaming files.
This patch becomes simple and much more legible.
---
From: Jake Edge <jake@xxxxxxx>
Date: Sun, 18 May 2014 12:36:10 -0600
Subject: [PATCH] staging/skein: rename files and clean up directory structure
Clean up file names and locations. Get rid of include/ directory and move
those up to the top-level. Rename files to get rid of upper case. Remove
skeinBlockNo3F.c as it was unused (temporary file or something?).
Signed-off-by: Jake Edge <jake@xxxxxxx>
---
drivers/staging/skein/Makefile | 12 +-
drivers/staging/skein/TODO | 1 -
drivers/staging/skein/skein.c | 6 +-
drivers/staging/skein/{include => }/skein.h | 0
drivers/staging/skein/skeinBlockNo3F.c | 175 ---------------------
drivers/staging/skein/{skeinApi.c => skein_api.c} | 2 +-
.../skein/{include/skeinApi.h => skein_api.h} | 2 +-
drivers/staging/skein/skein_block.c | 2 +-
drivers/staging/skein/{include => }/skein_block.h | 2 +-
drivers/staging/skein/{include => }/skein_iv.h | 2 +-
...threefish1024Block.c => threefish_1024_block.c} | 2 +-
.../{threefish256Block.c => threefish_256_block.c} | 2 +-
.../{threefish512Block.c => threefish_512_block.c} | 2 +-
.../skein/{threefishApi.c => threefish_api.c} | 4 +-
.../{include/threefishApi.h => threefish_api.h} | 2 +-
15 files changed, 18 insertions(+), 198 deletions(-)
rename drivers/staging/skein/{include => }/skein.h (100%)
delete mode 100644 drivers/staging/skein/skeinBlockNo3F.c
rename drivers/staging/skein/{skeinApi.c => skein_api.c} (99%)
rename drivers/staging/skein/{include/skeinApi.h => skein_api.h} (99%)
rename drivers/staging/skein/{include => }/skein_block.h (92%)
rename drivers/staging/skein/{include => }/skein_iv.h (98%)
rename drivers/staging/skein/{threefish1024Block.c => threefish_1024_block.c} (99%)
rename drivers/staging/skein/{threefish256Block.c => threefish_256_block.c} (99%)
rename drivers/staging/skein/{threefish512Block.c => threefish_512_block.c} (99%)
rename drivers/staging/skein/{threefishApi.c => threefish_api.c} (98%)
rename drivers/staging/skein/{include/threefishApi.h => threefish_api.h} (99%)
diff --git a/drivers/staging/skein/Makefile b/drivers/staging/skein/Makefile
index 2bb386e..395454c 100644
--- a/drivers/staging/skein/Makefile
+++ b/drivers/staging/skein/Makefile
@@ -1,13 +1,11 @@
#
# Makefile for the skein secure hash algorithm
#
-subdir-ccflags-y := -I$(src)/include/
-
obj-$(CONFIG_CRYPTO_SKEIN) += skein.o \
- skeinApi.o \
+ skein_api.o \
skein_block.o
-obj-$(CONFIG_CRYPTO_THREEFISH) += threefish1024Block.o \
- threefish256Block.o \
- threefish512Block.o \
- threefishApi.o
+obj-$(CONFIG_CRYPTO_THREEFISH) += threefish_1024_block.o \
+ threefish_256_block.o \
+ threefish_512_block.o \
+ threefish_api.o
diff --git a/drivers/staging/skein/TODO b/drivers/staging/skein/TODO
index f5c167a..1a4ce28 100644
--- a/drivers/staging/skein/TODO
+++ b/drivers/staging/skein/TODO
@@ -2,7 +2,6 @@ skein/threefish TODO
- rename camelcase vars
- rename camelcase functions
- - rename files
- move macros into appropriate header files
- add / pass test vectors
- module support
diff --git a/drivers/staging/skein/skein.c b/drivers/staging/skein/skein.c
index 096b86b..77cfedd 100644
--- a/drivers/staging/skein/skein.c
+++ b/drivers/staging/skein/skein.c
@@ -11,9 +11,9 @@
#define SKEIN_PORT_CODE /* instantiate any code in skein_port.h */
#include <linux/string.h> /* get the memcpy/memset functions */
-#include <skein.h> /* get the Skein API definitions */
-#include <skein_iv.h> /* get precomputed IVs */
-#include <skein_block.h>
+#include "skein.h" /* get the Skein API definitions */
+#include "skein_iv.h" /* get precomputed IVs */
+#include "skein_block.h"
/*****************************************************************/
/* 256-bit Skein */
diff --git a/drivers/staging/skein/include/skein.h b/drivers/staging/skein/skein.h
similarity index 100%
rename from drivers/staging/skein/include/skein.h
rename to drivers/staging/skein/skein.h
diff --git a/drivers/staging/skein/skeinBlockNo3F.c b/drivers/staging/skein/skeinBlockNo3F.c
deleted file mode 100644
index 6917638..0000000
--- a/drivers/staging/skein/skeinBlockNo3F.c
+++ /dev/null
@@ -1,175 +0,0 @@
-
-#include <linux/string.h>
-#include <skein.h>
-#include <threefishApi.h>
-
-
-/***************************** Skein_256 ******************************/
-void Skein_256_Process_Block(struct skein_256_ctx *ctx, const u8 *blkPtr,
- size_t blkCnt, size_t byteCntAdd)
-{
- struct threefish_key key;
- u64 tweak[2];
- int i;
- u64 w[SKEIN_256_STATE_WORDS]; /* local copy of input block */
- u64 words[3];
-
- Skein_assert(blkCnt != 0); /* never call with blkCnt == 0! */
- tweak[0] = ctx->h.T[0];
- tweak[1] = ctx->h.T[1];
-
- do {
- u64 carry = byteCntAdd;
-
- words[0] = tweak[0] & 0xffffffffL;
- words[1] = ((tweak[0] >> 32) & 0xffffffffL);
- words[2] = (tweak[1] & 0xffffffffL);
-
- for (i = 0; i < 3; i++) {
- carry += words[i];
- words[i] = carry;
- carry >>= 32;
- }
- tweak[0] = words[0] & 0xffffffffL;
- tweak[0] |= (words[1] & 0xffffffffL) << 32;
- tweak[1] |= words[2] & 0xffffffffL;
-
- threefishSetKey(&key, Threefish256, ctx->X, tweak);
-
- /* get input block in little-endian format */
- Skein_Get64_LSB_First(w, blkPtr, SKEIN_256_STATE_WORDS);
-
- threefishEncryptBlockWords(&key, w, ctx->X);
-
- blkPtr += SKEIN_256_BLOCK_BYTES;
-
- /* do the final "feedforward" xor, update ctx chaining vars */
- ctx->X[0] = ctx->X[0] ^ w[0];
- ctx->X[1] = ctx->X[1] ^ w[1];
- ctx->X[2] = ctx->X[2] ^ w[2];
- ctx->X[3] = ctx->X[3] ^ w[3];
-
- tweak[1] &= ~SKEIN_T1_FLAG_FIRST;
- } while (--blkCnt);
-
- ctx->h.T[0] = tweak[0];
- ctx->h.T[1] = tweak[1];
-}
-
-void Skein_512_Process_Block(struct skein_512_ctx *ctx, const u8 *blkPtr,
- size_t blkCnt, size_t byteCntAdd)
-{
- struct threefish_key key;
- u64 tweak[2];
- int i;
- u64 words[3];
- u64 w[SKEIN_512_STATE_WORDS]; /* local copy of input block */
-
- Skein_assert(blkCnt != 0); /* never call with blkCnt == 0! */
- tweak[0] = ctx->h.T[0];
- tweak[1] = ctx->h.T[1];
-
- do {
- u64 carry = byteCntAdd;
-
- words[0] = tweak[0] & 0xffffffffL;
- words[1] = ((tweak[0] >> 32) & 0xffffffffL);
- words[2] = (tweak[1] & 0xffffffffL);
-
- for (i = 0; i < 3; i++) {
- carry += words[i];
- words[i] = carry;
- carry >>= 32;
- }
- tweak[0] = words[0] & 0xffffffffL;
- tweak[0] |= (words[1] & 0xffffffffL) << 32;
- tweak[1] |= words[2] & 0xffffffffL;
-
- threefishSetKey(&key, Threefish512, ctx->X, tweak);
-
- /* get input block in little-endian format */
- Skein_Get64_LSB_First(w, blkPtr, SKEIN_512_STATE_WORDS);
-
- threefishEncryptBlockWords(&key, w, ctx->X);
-
- blkPtr += SKEIN_512_BLOCK_BYTES;
-
- /* do the final "feedforward" xor, update ctx chaining vars */
- ctx->X[0] = ctx->X[0] ^ w[0];
- ctx->X[1] = ctx->X[1] ^ w[1];
- ctx->X[2] = ctx->X[2] ^ w[2];
- ctx->X[3] = ctx->X[3] ^ w[3];
- ctx->X[4] = ctx->X[4] ^ w[4];
- ctx->X[5] = ctx->X[5] ^ w[5];
- ctx->X[6] = ctx->X[6] ^ w[6];
- ctx->X[7] = ctx->X[7] ^ w[7];
-
- tweak[1] &= ~SKEIN_T1_FLAG_FIRST;
- } while (--blkCnt);
-
- ctx->h.T[0] = tweak[0];
- ctx->h.T[1] = tweak[1];
-}
-
-void Skein1024_Process_Block(struct skein1024_ctx *ctx, const u8 *blkPtr,
- size_t blkCnt, size_t byteCntAdd)
-{
- struct threefish_key key;
- u64 tweak[2];
- int i;
- u64 words[3];
- u64 w[SKEIN1024_STATE_WORDS]; /* local copy of input block */
-
- Skein_assert(blkCnt != 0); /* never call with blkCnt == 0! */
- tweak[0] = ctx->h.T[0];
- tweak[1] = ctx->h.T[1];
-
- do {
- u64 carry = byteCntAdd;
-
- words[0] = tweak[0] & 0xffffffffL;
- words[1] = ((tweak[0] >> 32) & 0xffffffffL);
- words[2] = (tweak[1] & 0xffffffffL);
-
- for (i = 0; i < 3; i++) {
- carry += words[i];
- words[i] = carry;
- carry >>= 32;
- }
- tweak[0] = words[0] & 0xffffffffL;
- tweak[0] |= (words[1] & 0xffffffffL) << 32;
- tweak[1] |= words[2] & 0xffffffffL;
-
- threefishSetKey(&key, Threefish1024, ctx->X, tweak);
-
- /* get input block in little-endian format */
- Skein_Get64_LSB_First(w, blkPtr, SKEIN1024_STATE_WORDS);
-
- threefishEncryptBlockWords(&key, w, ctx->X);
-
- blkPtr += SKEIN1024_BLOCK_BYTES;
-
- /* do the final "feedforward" xor, update ctx chaining vars */
- ctx->X[0] = ctx->X[0] ^ w[0];
- ctx->X[1] = ctx->X[1] ^ w[1];
- ctx->X[2] = ctx->X[2] ^ w[2];
- ctx->X[3] = ctx->X[3] ^ w[3];
- ctx->X[4] = ctx->X[4] ^ w[4];
- ctx->X[5] = ctx->X[5] ^ w[5];
- ctx->X[6] = ctx->X[6] ^ w[6];
- ctx->X[7] = ctx->X[7] ^ w[7];
- ctx->X[8] = ctx->X[8] ^ w[8];
- ctx->X[9] = ctx->X[9] ^ w[9];
- ctx->X[10] = ctx->X[10] ^ w[10];
- ctx->X[11] = ctx->X[11] ^ w[11];
- ctx->X[12] = ctx->X[12] ^ w[12];
- ctx->X[13] = ctx->X[13] ^ w[13];
- ctx->X[14] = ctx->X[14] ^ w[14];
- ctx->X[15] = ctx->X[15] ^ w[15];
-
- tweak[1] &= ~SKEIN_T1_FLAG_FIRST;
- } while (--blkCnt);
-
- ctx->h.T[0] = tweak[0];
- ctx->h.T[1] = tweak[1];
-}
diff --git a/drivers/staging/skein/skeinApi.c b/drivers/staging/skein/skein_api.c
similarity index 99%
rename from drivers/staging/skein/skeinApi.c
rename to drivers/staging/skein/skein_api.c
index dd109bf..4256365 100644
--- a/drivers/staging/skein/skeinApi.c
+++ b/drivers/staging/skein/skein_api.c
@@ -25,7 +25,7 @@ OTHER DEALINGS IN THE SOFTWARE.
*/
#include <linux/string.h>
-#include <skeinApi.h>
+#include "skein_api.h"
int skeinCtxPrepare(struct skein_ctx *ctx, enum skein_size size)
{
diff --git a/drivers/staging/skein/include/skeinApi.h b/drivers/staging/skein/skein_api.h
similarity index 99%
rename from drivers/staging/skein/include/skeinApi.h
rename to drivers/staging/skein/skein_api.h
index ace931a..4029b16 100644
--- a/drivers/staging/skein/include/skeinApi.h
+++ b/drivers/staging/skein/skein_api.h
@@ -79,7 +79,7 @@ OTHER DEALINGS IN THE SOFTWARE.
*/
#include <linux/types.h>
-#include <skein.h>
+#include "skein.h"
/**
* Which Skein size to use
diff --git a/drivers/staging/skein/skein_block.c b/drivers/staging/skein/skein_block.c
index fd96ca0..7d653a6 100644
--- a/drivers/staging/skein/skein_block.c
+++ b/drivers/staging/skein/skein_block.c
@@ -15,7 +15,7 @@
************************************************************************/
#include <linux/string.h>
-#include <skein.h>
+#include "skein.h"
#ifndef SKEIN_USE_ASM
#define SKEIN_USE_ASM (0) /* default is all C code (no ASM) */
diff --git a/drivers/staging/skein/include/skein_block.h b/drivers/staging/skein/skein_block.h
similarity index 92%
rename from drivers/staging/skein/include/skein_block.h
rename to drivers/staging/skein/skein_block.h
index b15c079..b81e968 100644
--- a/drivers/staging/skein/include/skein_block.h
+++ b/drivers/staging/skein/skein_block.h
@@ -10,7 +10,7 @@
#ifndef _SKEIN_BLOCK_H_
#define _SKEIN_BLOCK_H_
-#include <skein.h> /* get the Skein API definitions */
+#include "skein.h" /* get the Skein API definitions */
void Skein_256_Process_Block(struct skein_256_ctx *ctx, const u8 *blkPtr,
size_t blkCnt, size_t byteCntAdd);
diff --git a/drivers/staging/skein/include/skein_iv.h b/drivers/staging/skein/skein_iv.h
similarity index 98%
rename from drivers/staging/skein/include/skein_iv.h
rename to drivers/staging/skein/skein_iv.h
index 8dd5e4d..80d6bce 100644
--- a/drivers/staging/skein/include/skein_iv.h
+++ b/drivers/staging/skein/skein_iv.h
@@ -1,7 +1,7 @@
#ifndef _SKEIN_IV_H_
#define _SKEIN_IV_H_
-#include <skein.h> /* get Skein macros and types */
+#include "skein.h" /* get Skein macros and types */
/*
***************** Pre-computed Skein IVs *******************
diff --git a/drivers/staging/skein/threefish1024Block.c b/drivers/staging/skein/threefish_1024_block.c
similarity index 99%
rename from drivers/staging/skein/threefish1024Block.c
rename to drivers/staging/skein/threefish_1024_block.c
index fe7517b..82f7ae60 100644
--- a/drivers/staging/skein/threefish1024Block.c
+++ b/drivers/staging/skein/threefish_1024_block.c
@@ -1,5 +1,5 @@
#include <linux/string.h>
-#include <threefishApi.h>
+#include "threefish_api.h"
void threefishEncrypt1024(struct threefish_key *keyCtx, u64 *input, u64 *output)
diff --git a/drivers/staging/skein/threefish256Block.c b/drivers/staging/skein/threefish_256_block.c
similarity index 99%
rename from drivers/staging/skein/threefish256Block.c
rename to drivers/staging/skein/threefish_256_block.c
index 2ae746a..a116bdf 100644
--- a/drivers/staging/skein/threefish256Block.c
+++ b/drivers/staging/skein/threefish_256_block.c
@@ -1,5 +1,5 @@
#include <linux/string.h>
-#include <threefishApi.h>
+#include "threefish_api.h"
void threefishEncrypt256(struct threefish_key *keyCtx, u64 *input, u64 *output)
diff --git a/drivers/staging/skein/threefish512Block.c b/drivers/staging/skein/threefish_512_block.c
similarity index 99%
rename from drivers/staging/skein/threefish512Block.c
rename to drivers/staging/skein/threefish_512_block.c
index f428fd6..8450628 100644
--- a/drivers/staging/skein/threefish512Block.c
+++ b/drivers/staging/skein/threefish_512_block.c
@@ -1,5 +1,5 @@
#include <linux/string.h>
-#include <threefishApi.h>
+#include "threefish_api.h"
void threefishEncrypt512(struct threefish_key *keyCtx, u64 *input, u64 *output)
diff --git a/drivers/staging/skein/threefishApi.c b/drivers/staging/skein/threefish_api.c
similarity index 98%
rename from drivers/staging/skein/threefishApi.c
rename to drivers/staging/skein/threefish_api.c
index 1e70f66..69ae12c 100644
--- a/drivers/staging/skein/threefishApi.c
+++ b/drivers/staging/skein/threefish_api.c
@@ -1,7 +1,5 @@
-
-
#include <linux/string.h>
-#include <threefishApi.h>
+#include "threefish_api.h"
void threefishSetKey(struct threefish_key *keyCtx,
enum threefish_size stateSize,
diff --git a/drivers/staging/skein/include/threefishApi.h b/drivers/staging/skein/threefish_api.h
similarity index 99%
rename from drivers/staging/skein/include/threefishApi.h
rename to drivers/staging/skein/threefish_api.h
index e81675d..abf409d 100644
--- a/drivers/staging/skein/include/threefishApi.h
+++ b/drivers/staging/skein/threefish_api.h
@@ -29,7 +29,7 @@
*/
#include <linux/types.h>
-#include <skein.h>
+#include "skein.h"
#define KeyScheduleConst 0x1BD11BDAA9FC1A22L
--
1.8.1.2.459.gbcd45b4.dirty
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
