crypto: sha1-mb - rename sha-mb to sha1-mb

Until now, there was only support for the SHA1 multibuffer algorithm. Hence, there was just one sha-mb folder. Now, with the introduction of the SHA256 multi-buffer algorithm , it is logical to name the existing folder as sha1-mb. Signed-off-by: Megha Dey <megha.dey@linux.intel.com> Reviewed-by: Fenghua Yu <fenghua.yu@intel.com> Reviewed-by: Tim Chen <tim.c.chen@linux.intel.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
mariux64 · Jun 27, 2016 · 4c79f6f · 4c79f6f
1 parent 087bcd2
commit 4c79f6f
Show file tree

Hide file tree

Showing 10 changed files with 4 additions and 4 deletions.
diff --git a/arch/x86/crypto/Makefile b/arch/x86/crypto/Makefile
@@ -49,7 +49,7 @@ endif
 ifeq ($(avx2_supported),yes)
 	obj-$(CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64) += camellia-aesni-avx2.o
 	obj-$(CONFIG_CRYPTO_SERPENT_AVX2_X86_64) += serpent-avx2.o
-	obj-$(CONFIG_CRYPTO_SHA1_MB) += sha-mb/
+	obj-$(CONFIG_CRYPTO_SHA1_MB) += sha1-mb/
 	obj-$(CONFIG_CRYPTO_SHA256_MB) += sha256-mb/
 endif
 

diff --git a/arch/x86/crypto/sha-mb/Makefile → arch/x86/crypto/sha1-mb/Makefile b/arch/x86/crypto/sha-mb/Makefile → arch/x86/crypto/sha1-mb/Makefile
diff --git a/arch/x86/crypto/sha-mb/sha1_mb.c → arch/x86/crypto/sha1-mb/sha1_mb.c b/arch/x86/crypto/sha-mb/sha1_mb.c → arch/x86/crypto/sha1-mb/sha1_mb.c
@@ -67,7 +67,7 @@
 #include <asm/byteorder.h>
 #include <linux/hardirq.h>
 #include <asm/fpu/api.h>
-#include "sha_mb_ctx.h"
+#include "sha1_mb_ctx.h"
 
 #define FLUSH_INTERVAL 1000 /* in usec */
 

diff --git a/arch/x86/crypto/sha-mb/sha_mb_ctx.h → arch/x86/crypto/sha1-mb/sha1_mb_ctx.h b/arch/x86/crypto/sha-mb/sha_mb_ctx.h → arch/x86/crypto/sha1-mb/sha1_mb_ctx.h
@@ -54,7 +54,7 @@
 #ifndef _SHA_MB_CTX_INTERNAL_H
 #define _SHA_MB_CTX_INTERNAL_H
 
-#include "sha_mb_mgr.h"
+#include "sha1_mb_mgr.h"
 
 #define HASH_UPDATE          0x00
 #define HASH_FIRST           0x01

diff --git a/arch/x86/crypto/sha-mb/sha_mb_mgr.h → arch/x86/crypto/sha1-mb/sha1_mb_mgr.h b/arch/x86/crypto/sha-mb/sha_mb_mgr.h → arch/x86/crypto/sha1-mb/sha1_mb_mgr.h
diff --git a/...86/crypto/sha-mb/sha1_mb_mgr_datastruct.S → ...6/crypto/sha1-mb/sha1_mb_mgr_datastruct.S b/...86/crypto/sha-mb/sha1_mb_mgr_datastruct.S → ...6/crypto/sha1-mb/sha1_mb_mgr_datastruct.S
diff --git a/...86/crypto/sha-mb/sha1_mb_mgr_flush_avx2.S → ...6/crypto/sha1-mb/sha1_mb_mgr_flush_avx2.S b/...86/crypto/sha-mb/sha1_mb_mgr_flush_avx2.S → ...6/crypto/sha1-mb/sha1_mb_mgr_flush_avx2.S
diff --git a/...x86/crypto/sha-mb/sha1_mb_mgr_init_avx2.c → ...86/crypto/sha1-mb/sha1_mb_mgr_init_avx2.c b/...x86/crypto/sha-mb/sha1_mb_mgr_init_avx2.c → ...86/crypto/sha1-mb/sha1_mb_mgr_init_avx2.c
@@ -51,7 +51,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "sha_mb_mgr.h"
+#include "sha1_mb_mgr.h"
 
 void sha1_mb_mgr_init_avx2(struct sha1_mb_mgr *state)
 {

diff --git a/...6/crypto/sha-mb/sha1_mb_mgr_submit_avx2.S → .../crypto/sha1-mb/sha1_mb_mgr_submit_avx2.S b/...6/crypto/sha-mb/sha1_mb_mgr_submit_avx2.S → .../crypto/sha1-mb/sha1_mb_mgr_submit_avx2.S
diff --git a/arch/x86/crypto/sha-mb/sha1_x8_avx2.S → arch/x86/crypto/sha1-mb/sha1_x8_avx2.S b/arch/x86/crypto/sha-mb/sha1_x8_avx2.S → arch/x86/crypto/sha1-mb/sha1_x8_avx2.S