staging/skein: rename files and clean up directory structure

PATCH Superseded Jake Edge 2 participants 3 messages May 18, 2014 Staging

Share & tools

Jake Edge

author

2014-05-18 18:35 UTC #0 lore raw

PATCH 1/1 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 <[email protected]>

---

Against next-20140516

Diff appears to be huge because of the rearranging, not that much to it, really ...

drivers/staging/skein/Makefile +5 -7

index 2bb386e..395454c 100644
@@ -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

drivers/staging/skein/TODO +0 -1

index f5c167a..1a4ce28 100644
@@ -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

drivers/staging/skein/include/skein.h deleted +0 ~~-344~~

344 lines not on this page · raw message

drivers/staging/skein/include/skeinApi.h deleted +0 ~~-230~~

230 lines not on this page · raw message

drivers/staging/skein/include/skein_block.h deleted +0 ~~-22~~

deleted file mode 100644
index b15c079..0000000
@@ -1,22 +0,0 @@
-/***********************************************************************
-**
-** Implementation of the Skein hash function.
-**
-** Source code author: Doug Whiting, 2008.
-**
-** This algorithm and source code is released to the public domain.
-**
-************************************************************************/
-#ifndef _SKEIN_BLOCK_H_
-#define _SKEIN_BLOCK_H_
-
-#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);
-void Skein_512_Process_Block(struct skein_512_ctx *ctx, const u8 *blkPtr,
-				size_t blkCnt, size_t byteCntAdd);
-void Skein1024_Process_Block(struct skein1024_ctx *ctx, const u8 *blkPtr,
-				size_t blkCnt, size_t byteCntAdd);
-
-#endif

drivers/staging/skein/include/skein_iv.h deleted +0 ~~-186~~

186 lines not on this page · raw message

drivers/staging/skein/include/threefishApi.h deleted +0 ~~-164~~

164 lines not on this page · raw message

drivers/staging/skein/skein.c +3 -3

index 096b86b..77cfedd 100644
@@ -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                                             */

drivers/staging/skein/skein.h new file +344 -0

344 lines not on this page · raw message

drivers/staging/skein/skeinApi.c deleted +0 ~~-237~~

237 lines not on this page · raw message

drivers/staging/skein/skeinBlockNo3F.c deleted +0 ~~-175~~

175 lines not on this page · raw message

drivers/staging/skein/skein_api.c new file +237 -0

237 lines not on this page · raw message

drivers/staging/skein/skein_api.h new file +230 -0

230 lines not on this page · raw message

drivers/staging/skein/skein_block.c +1 -1

index fd96ca0..7d653a6 100644
@@ -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) */

drivers/staging/skein/skein_block.h new file +22 -0

new file mode 100644
index 0000000..b81e968
@@ -0,0 +1,22 @@
+/***********************************************************************
+**
+** Implementation of the Skein hash function.
+**
+** Source code author: Doug Whiting, 2008.
+**
+** This algorithm and source code is released to the public domain.
+**
+************************************************************************/
+#ifndef _SKEIN_BLOCK_H_
+#define _SKEIN_BLOCK_H_
+
+#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);
+void Skein_512_Process_Block(struct skein_512_ctx *ctx, const u8 *blkPtr,
+				size_t blkCnt, size_t byteCntAdd);
+void Skein1024_Process_Block(struct skein1024_ctx *ctx, const u8 *blkPtr,
+				size_t blkCnt, size_t byteCntAdd);
+
+#endif

drivers/staging/skein/skein_iv.h new file +186 -0

186 lines not on this page · raw message

drivers/staging/skein/threefish1024Block.c deleted +0 ~~-4900~~

578 lines not on this page · raw message

drivers/staging/skein/threefish256Block.c deleted +0 ~~-1137~~

1,137 lines not on this page · raw message

drivers/staging/skein/threefish512Block.c deleted +0 ~~-2223~~

2,223 lines not on this page · raw message

drivers/staging/skein/threefishApi.c deleted +0 ~~-79~~

79 lines not on this page · raw message

drivers/staging/skein/threefish_1024_block.c new file +4900 -0

4,900 lines not on this page · raw message

drivers/staging/skein/threefish_256_block.c new file +1137 -0

1,137 lines not on this page · raw message

drivers/staging/skein/threefish_512_block.c new file +2223 -0

2,223 lines not on this page · raw message

drivers/staging/skein/threefish_api.c new file +77 -0

77 lines not on this page · raw message

drivers/staging/skein/threefish_api.h new file +164 -0

164 lines not on this page · raw message

The rest of this diff is not shown. View the raw message.

Signature · 1 line

Jake Edge - LWN - [email protected] - http://lwn.net

Part of the diff is not shown here. View the raw message.

Joe Perches

2014-05-18 18:42 UTC #1 lore raw

Quoted 3 lines · Jake Edge

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?).

[]

Quoted 2 lines

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 <[email protected]>
Date: Sun, 18 May 2014 12:36:10 -0600
Subject: [PATCH] staging/skein: rename files and clean up directory structure

Signed-off-by Jake Edge <[email protected]>

---
 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%)

drivers/staging/skein/Makefile +5 -7

index 2bb386e..395454c 100644
@@ -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

drivers/staging/skein/TODO +0 -1

index f5c167a..1a4ce28 100644
@@ -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

drivers/staging/skein/skein.c +3 -3

index 096b86b..77cfedd 100644
@@ -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                                             */

drivers/staging/skein/skein.h renamed from drivers/staging/skein/include/skein.h +0 -0

similarity index 100%
rename from drivers/staging/skein/include/skein.h
rename to drivers/staging/skein/skein.h

drivers/staging/skein/skeinBlockNo3F.c deleted +0 ~~-175~~

175 lines not on this page · raw message

drivers/staging/skein/skein_api.c renamed from drivers/staging/skein/skeinApi.c +1 -1

similarity index 99%
rename from drivers/staging/skein/skeinApi.c
rename to drivers/staging/skein/skein_api.c
index dd109bf..4256365 100644
@@ -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)
 {

drivers/staging/skein/skein_api.h renamed from drivers/staging/skein/include/skeinApi.h +1 -1

similarity index 99%
rename from drivers/staging/skein/include/skeinApi.h
rename to drivers/staging/skein/skein_api.h
index ace931a..4029b16 100644
@@ -79,7 +79,7 @@ OTHER DEALINGS IN THE SOFTWARE.
  */
 
 #include <linux/types.h>
-#include <skein.h>
+#include "skein.h"
 
 /**
  * Which Skein size to use

drivers/staging/skein/skein_block.c +1 -1

index fd96ca0..7d653a6 100644
@@ -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) */

drivers/staging/skein/skein_block.h renamed from drivers/staging/skein/include/skein_block.h +1 -1

similarity index 92%
rename from drivers/staging/skein/include/skein_block.h
rename to drivers/staging/skein/skein_block.h
index b15c079..b81e968 100644
@@ -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);

drivers/staging/skein/skein_iv.h renamed from drivers/staging/skein/include/skein_iv.h +1 -1

similarity index 98%
rename from drivers/staging/skein/include/skein_iv.h
rename to drivers/staging/skein/skein_iv.h
index 8dd5e4d..80d6bce 100644
@@ -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 *******************

drivers/staging/skein/threefish_1024_block.c renamed from drivers/staging/skein/threefish1024Block.c +1 -1

similarity index 99%
rename from drivers/staging/skein/threefish1024Block.c
rename to drivers/staging/skein/threefish_1024_block.c
index fe7517b..82f7ae60 100644
@@ -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)

drivers/staging/skein/threefish_256_block.c renamed from drivers/staging/skein/threefish256Block.c +1 -1

similarity index 99%
rename from drivers/staging/skein/threefish256Block.c
rename to drivers/staging/skein/threefish_256_block.c
index 2ae746a..a116bdf 100644
@@ -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)

drivers/staging/skein/threefish_512_block.c renamed from drivers/staging/skein/threefish512Block.c +1 -1

similarity index 99%
rename from drivers/staging/skein/threefish512Block.c
rename to drivers/staging/skein/threefish_512_block.c
index f428fd6..8450628 100644
@@ -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)

drivers/staging/skein/threefish_api.c renamed from drivers/staging/skein/threefishApi.c +1 -3

similarity index 98%
rename from drivers/staging/skein/threefishApi.c
rename to drivers/staging/skein/threefish_api.c
index 1e70f66..69ae12c 100644
@@ -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,

drivers/staging/skein/threefish_api.h renamed from drivers/staging/skein/include/threefishApi.h +1 -1

similarity index 99%
rename from drivers/staging/skein/include/threefishApi.h
rename to drivers/staging/skein/threefish_api.h
index e81675d..abf409d 100644
@@ -29,7 +29,7 @@
  */
 
 #include <linux/types.h>
-#include <skein.h>
+#include "skein.h"
 
 #define KeyScheduleConst 0x1BD11BDAA9FC1A22L

Signature · 1 line

1.8.1.2.459.gbcd45b4.dirty

Jake Edge

author

2014-05-18 18:50 UTC #2 lore raw

Quoted 6 lines · On Sun, 18 May 2014 11:42:53 -0700 Joe Perches wrote:

Quoted 4 lines · Jake Edge
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?).
[]

Quoted 8 lines

Quoted 2 lines
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.

Ah, so it does, thank you! I'll send a v2 here in a second ...

jake

Signature · 1 line

Jake Edge - LWN - [email protected] - http://lwn.net