From 9947dd780b30c60f346af637f949fe20ac566116 Mon Sep 17 00:00:00 2001
From: Tino Reichardt <milky-7zip@mcmilk.de>
Date: Thu, 1 Nov 2018 22:47:25 +0100
Subject: [PATCH] Fix naming: Blake2s -> Blake2sp

---
 CPP/7zip/Bundles/Format7zF/Arc.mak             |  2 +-
 CPP/7zip/Bundles/Format7zFO/Arc.mak            |  2 +-
 CPP/7zip/UI/Explorer/ContextMenu.cpp           | 18 +++++++++---------
 CPP/7zip/UI/Explorer/ContextMenu.h             |  2 +-
 CPP/Common/{Blake2sReg.cpp => Blake2spReg.cpp} |  0
 5 files changed, 12 insertions(+), 12 deletions(-)
 rename CPP/Common/{Blake2sReg.cpp => Blake2spReg.cpp} (100%)

diff --git a/CPP/7zip/Bundles/Format7zF/Arc.mak b/CPP/7zip/Bundles/Format7zF/Arc.mak
index 990ee120..c76bb7e4 100644
--- a/CPP/7zip/Bundles/Format7zF/Arc.mak
+++ b/CPP/7zip/Bundles/Format7zF/Arc.mak
@@ -1,5 +1,5 @@
 COMMON_OBJS = \
-  $O\Blake2sReg.obj \
+  $O\Blake2spReg.obj \
   $O\CRC.obj \
   $O\CrcReg.obj \
   $O\DynLimBuf.obj \
diff --git a/CPP/7zip/Bundles/Format7zFO/Arc.mak b/CPP/7zip/Bundles/Format7zFO/Arc.mak
index a678f896..f9597f1e 100644
--- a/CPP/7zip/Bundles/Format7zFO/Arc.mak
+++ b/CPP/7zip/Bundles/Format7zFO/Arc.mak
@@ -1,5 +1,5 @@
 COMMON_OBJS = \
-  $O\Blake2sReg.obj \
+  $O\Blake2spReg.obj \
   $O\CRC.obj \
   $O\CrcReg.obj \
   $O\DynLimBuf.obj \
diff --git a/CPP/7zip/UI/Explorer/ContextMenu.cpp b/CPP/7zip/UI/Explorer/ContextMenu.cpp
index 1e00c4f3..78c3a037 100644
--- a/CPP/7zip/UI/Explorer/ContextMenu.cpp
+++ b/CPP/7zip/UI/Explorer/ContextMenu.cpp
@@ -221,14 +221,14 @@ struct CHashCommand
 
 static const CHashCommand g_HashCommands[] =
 {
-  { CZipContextMenu::kHash_CRC32,   "CRC-32",  "CRC32" },
-  { CZipContextMenu::kHash_CRC64,   "CRC-64",  "CRC64" },
-  { CZipContextMenu::kHash_SHA1,    "SHA-1",   "SHA1" },
-  { CZipContextMenu::kHash_SHA256,  "SHA-256", "SHA256" },
-  { CZipContextMenu::kHash_BLAKE2s, "BLAKE2s", "BLAKE2s" },
-  { CZipContextMenu::kHash_XXH32,   "XXH-32",  "XXH32" },
-  { CZipContextMenu::kHash_XXH64,   "XXH-64",  "XXH64" },
-  { CZipContextMenu::kHash_All,     "*",       "*" }
+  { CZipContextMenu::kHash_CRC32,    "CRC-32",   "CRC32" },
+  { CZipContextMenu::kHash_CRC64,    "CRC-64",   "CRC64" },
+  { CZipContextMenu::kHash_SHA1,     "SHA-1",    "SHA1" },
+  { CZipContextMenu::kHash_SHA256,   "SHA-256",  "SHA256" },
+  { CZipContextMenu::kHash_BLAKE2sp, "BLAKE2sp", "BLAKE2sp" },
+  { CZipContextMenu::kHash_XXH32,    "XXH-32",   "XXH32" },
+  { CZipContextMenu::kHash_XXH64,    "XXH-64",   "XXH64" },
+  { CZipContextMenu::kHash_All,      "*",        "*" }
 };
 
 static int FindCommand(CZipContextMenu::ECommandInternalID &id)
@@ -931,7 +931,7 @@ STDMETHODIMP CZipContextMenu::InvokeCommand(LPCMINVOKECOMMANDINFO commandInfo)
       case kHash_CRC64:
       case kHash_SHA1:
       case kHash_SHA256:
-      case kHash_BLAKE2s:
+      case kHash_BLAKE2sp:
       case kHash_XXH32:
       case kHash_XXH64:
       case kHash_All:
diff --git a/CPP/7zip/UI/Explorer/ContextMenu.h b/CPP/7zip/UI/Explorer/ContextMenu.h
index 914ac35c..231db845 100644
--- a/CPP/7zip/UI/Explorer/ContextMenu.h
+++ b/CPP/7zip/UI/Explorer/ContextMenu.h
@@ -36,7 +36,7 @@ public:
     kHash_CRC64,
     kHash_SHA1,
     kHash_SHA256,
-    kHash_BLAKE2s,
+    kHash_BLAKE2sp,
     kHash_XXH32,
     kHash_XXH64,
     kHash_All
diff --git a/CPP/Common/Blake2sReg.cpp b/CPP/Common/Blake2spReg.cpp
similarity index 100%
rename from CPP/Common/Blake2sReg.cpp
rename to CPP/Common/Blake2spReg.cpp