diff --git a/arib_std_b25.sln b/arib_std_b25.sln
index 148a969..90a7e7a 100644
--- a/arib_std_b25.sln
+++ b/arib_std_b25.sln
@@ -1,12 +1,16 @@

Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.31702.278
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "b25", "aribb25\b25.vcxproj", "{6E77C1AC-A31A-49B9-9A52-9FE1E03B8FEC}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libaribb25", "aribb25\libaribb25.vcxproj", "{32FCD075-2C1D-4796-926B-A0009ECCD1E8}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "b1", "aribb25\b1.vcxproj", "{26304970-9A5E-4DF0-AF69-8E01B9DEDDAE}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libaribb1", "aribb25\libaribb1.vcxproj", "{92B17263-5DE9-49F5-8B3C-7A89F7561ED5}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -31,8 +35,27 @@ Global
{32FCD075-2C1D-4796-926B-A0009ECCD1E8}.Release|Win32.Build.0 = Release|Win32
{32FCD075-2C1D-4796-926B-A0009ECCD1E8}.Release|x64.ActiveCfg = Release|x64
{32FCD075-2C1D-4796-926B-A0009ECCD1E8}.Release|x64.Build.0 = Release|x64
+ {26304970-9A5E-4DF0-AF69-8E01B9DEDDAE}.Debug|Win32.ActiveCfg = Debug|Win32
+ {26304970-9A5E-4DF0-AF69-8E01B9DEDDAE}.Debug|Win32.Build.0 = Debug|Win32
+ {26304970-9A5E-4DF0-AF69-8E01B9DEDDAE}.Debug|x64.ActiveCfg = Debug|x64
+ {26304970-9A5E-4DF0-AF69-8E01B9DEDDAE}.Debug|x64.Build.0 = Debug|x64
+ {26304970-9A5E-4DF0-AF69-8E01B9DEDDAE}.Release|Win32.ActiveCfg = Release|Win32
+ {26304970-9A5E-4DF0-AF69-8E01B9DEDDAE}.Release|Win32.Build.0 = Release|Win32
+ {26304970-9A5E-4DF0-AF69-8E01B9DEDDAE}.Release|x64.ActiveCfg = Release|x64
+ {26304970-9A5E-4DF0-AF69-8E01B9DEDDAE}.Release|x64.Build.0 = Release|x64
+ {92B17263-5DE9-49F5-8B3C-7A89F7561ED5}.Debug|Win32.ActiveCfg = Debug|Win32
+ {92B17263-5DE9-49F5-8B3C-7A89F7561ED5}.Debug|Win32.Build.0 = Debug|Win32
+ {92B17263-5DE9-49F5-8B3C-7A89F7561ED5}.Debug|x64.ActiveCfg = Debug|x64
+ {92B17263-5DE9-49F5-8B3C-7A89F7561ED5}.Debug|x64.Build.0 = Debug|x64
+ {92B17263-5DE9-49F5-8B3C-7A89F7561ED5}.Release|Win32.ActiveCfg = Release|Win32
+ {92B17263-5DE9-49F5-8B3C-7A89F7561ED5}.Release|Win32.Build.0 = Release|Win32
+ {92B17263-5DE9-49F5-8B3C-7A89F7561ED5}.Release|x64.ActiveCfg = Release|x64
+ {92B17263-5DE9-49F5-8B3C-7A89F7561ED5}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ SolutionGuid = {0F37AEF8-7E0B-410F-8933-3AB6C5A8B836}
+ EndGlobalSection
EndGlobal
diff --git a/aribb25/b1.vcxproj b/aribb25/b1.vcxproj
new file mode 100644
index 0000000..791087c
--- /dev/null
+++ b/aribb25/b1.vcxproj
@@ -0,0 +1,212 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Debug
+ x64
+
+
+ Release
+ Win32
+
+
+ Release
+ x64
+
+
+
+ {26304970-9A5E-4DF0-AF69-8E01B9DEDDAE}
+ arib_std_b1
+ Win32Proj
+ 10.0
+
+
+
+ Application
+ v142
+ Unicode
+ true
+
+
+ Application
+ v142
+ Unicode
+ true
+
+
+ Application
+ v142
+ Unicode
+
+
+ Application
+ v142
+ Unicode
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <_ProjectFileVersion>12.0.30501.0
+
+
+ $(SolutionDir)$(Platform)\$(Configuration)\
+ $(SolutionDir)Intermediate\$(ProjectName)\$(Platform)\$(Configuration)\
+ true
+ $(ProjectName)
+
+
+ true
+ $(ProjectName)
+ $(SolutionDir)Intermediate\$(ProjectName)\$(Platform)\$(Configuration)\
+
+
+ $(SolutionDir)$(Platform)\$(Configuration)\
+ $(SolutionDir)Intermediate\$(ProjectName)\$(Platform)\$(Configuration)\
+ false
+ $(ProjectName)
+
+
+ false
+ $(ProjectName)
+ $(SolutionDir)Intermediate\$(ProjectName)\$(Platform)\$(Configuration)\
+
+
+
+ Disabled
+ ENABLE_ARIB_STD_B1;ENABLE_MULTI2_SIMD;USE_BENCHMARK;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
+ true
+ EnableFastChecks
+ MultiThreadedDebug
+
+ Level3
+ EditAndContinue
+ /source-charset:utf-8 %(AdditionalOptions)
+
+
+ winscard.lib;%(AdditionalDependencies)
+ $(OutDir)$(TargetName)$(TargetExt)
+ Debug
+ Console
+ MachineX86
+
+
+
+
+
+ Disabled
+ ENABLE_ARIB_STD_B1;ENABLE_MULTI2_SIMD;USE_BENCHMARK;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
+ EnableFastChecks
+ MultiThreadedDebug
+
+
+ Level3
+ ProgramDatabase
+ /source-charset:utf-8 %(AdditionalOptions)
+
+
+ winscard.lib;%(AdditionalDependencies)
+ $(OutDir)$(TargetName)$(TargetExt)
+ Debug
+ Console
+
+
+
+
+ ENABLE_ARIB_STD_B1;ENABLE_MULTI2_SIMD;USE_BENCHMARK;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
+ MultiThreadedDLL
+
+ Level3
+ ProgramDatabase
+ MaxSpeed
+ AnySuitable
+ true
+ Speed
+ true
+ false
+ true
+ Fast
+ /source-charset:utf-8 %(AdditionalOptions)
+
+
+ winscard.lib;%(AdditionalDependencies)
+ $(OutDir)$(TargetName)$(TargetExt)
+ false
+ Console
+ true
+ true
+ MachineX86
+ UseLinkTimeCodeGeneration
+
+
+
+
+ ENABLE_ARIB_STD_B1;ENABLE_MULTI2_SIMD;USE_BENCHMARK;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
+ MultiThreadedDLL
+
+
+ Level3
+ ProgramDatabase
+ MaxSpeed
+ AnySuitable
+ true
+ Speed
+ true
+ false
+ true
+ Fast
+ /source-charset:utf-8 %(AdditionalOptions)
+
+
+ winscard.lib;%(AdditionalDependencies)
+ $(OutDir)$(TargetName)$(TargetExt)
+ false
+ Console
+ true
+ true
+ UseLinkTimeCodeGeneration
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/aribb25/b1.vcxproj.filters b/aribb25/b1.vcxproj.filters
new file mode 100644
index 0000000..037073b
--- /dev/null
+++ b/aribb25/b1.vcxproj.filters
@@ -0,0 +1,75 @@
+
+
+
+
+ {4FC737F1-C7A5-4376-A066-2A32D752A2FF}
+ cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx
+
+
+ {93995380-89BD-4b04-88EB-625FBE52EBFB}
+ h;hpp;hxx;hm;inl;inc;xsd
+
+
+ {67DA6AB6-F800-4c08-8B7A-83BB121AAD01}
+ rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav
+
+
+
+
+ ソース ファイル
+
+
+ ソース ファイル
+
+
+ ソース ファイル
+
+
+ ソース ファイル
+
+
+ ソース ファイル
+
+
+ ソース ファイル
+
+
+
+
+ ヘッダー ファイル
+
+
+ ヘッダー ファイル
+
+
+ ヘッダー ファイル
+
+
+ ヘッダー ファイル
+
+
+ ヘッダー ファイル
+
+
+ ヘッダー ファイル
+
+
+ ヘッダー ファイル
+
+
+ ヘッダー ファイル
+
+
+ ヘッダー ファイル
+
+
+ ヘッダー ファイル
+
+
+ ヘッダー ファイル
+
+
+ ヘッダー ファイル
+
+
+
\ No newline at end of file
diff --git a/aribb25/b25.vcxproj b/aribb25/b25.vcxproj
index 473a268..9710130 100644
--- a/aribb25/b25.vcxproj
+++ b/aribb25/b25.vcxproj
@@ -98,6 +98,7 @@
Level3
EditAndContinue
+ /source-charset:utf-8 %(AdditionalOptions)
winscard.lib;%(AdditionalDependencies)
@@ -118,6 +119,7 @@
Level3
ProgramDatabase
+ /source-charset:utf-8 %(AdditionalOptions)
winscard.lib;%(AdditionalDependencies)
@@ -141,6 +143,7 @@
false
true
Fast
+ /source-charset:utf-8 %(AdditionalOptions)
winscard.lib;%(AdditionalDependencies)
@@ -169,6 +172,7 @@
false
true
Fast
+ /source-charset:utf-8 %(AdditionalOptions)
winscard.lib;%(AdditionalDependencies)
diff --git a/aribb25/libaribb1.vcxproj b/aribb25/libaribb1.vcxproj
new file mode 100644
index 0000000..f064ab8
--- /dev/null
+++ b/aribb25/libaribb1.vcxproj
@@ -0,0 +1,190 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Release
+ Win32
+
+
+ Debug
+ x64
+
+
+ Release
+ x64
+
+
+
+ {92B17263-5DE9-49F5-8B3C-7A89F7561ED5}
+ libaribb1
+ 10.0
+
+
+
+ DynamicLibrary
+ true
+ v142
+ Unicode
+
+
+ DynamicLibrary
+ false
+ v142
+ true
+ Unicode
+
+
+ DynamicLibrary
+ true
+ v142
+ Unicode
+
+
+ DynamicLibrary
+ false
+ v142
+ true
+ Unicode
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $(SolutionDir)Intermediate\$(ProjectName)\$(Platform)\$(Configuration)\
+
+
+ $(SolutionDir)Intermediate\$(ProjectName)\$(Platform)\$(Configuration)\
+ $(SolutionDir)$(Platform)\$(Configuration)\
+
+
+ $(SolutionDir)Intermediate\$(ProjectName)\$(Platform)\$(Configuration)\
+ $(SolutionDir)$(Platform)\$(Configuration)\
+
+
+ $(SolutionDir)Intermediate\$(ProjectName)\$(Platform)\$(Configuration)\
+
+
+
+ Level3
+ Disabled
+
+
+ ENABLE_ARIB_STD_B1;ENABLE_MULTI2_SIMD;_WINDLL;%(PreprocessorDefinitions)
+ /source-charset:utf-8 %(AdditionalOptions)
+
+
+ winscard.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
+ $(IntDir)$(TargetName).lib
+
+
+
+
+ Level3
+ Disabled
+
+
+ ENABLE_ARIB_STD_B1;ENABLE_MULTI2_SIMD;_WINDLL;%(PreprocessorDefinitions)
+ /source-charset:utf-8 %(AdditionalOptions)
+
+
+ winscard.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
+ $(IntDir)$(TargetName).lib
+
+
+
+
+ Level3
+ MaxSpeed
+ true
+ true
+
+
+ AnySuitable
+ Speed
+ true
+ false
+ Fast
+ ENABLE_ARIB_STD_B1;ENABLE_MULTI2_SIMD;_WINDLL;%(PreprocessorDefinitions)
+ /source-charset:utf-8 %(AdditionalOptions)
+
+
+ true
+ true
+ winscard.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
+ false
+ UseLinkTimeCodeGeneration
+ $(IntDir)$(TargetName).lib
+
+
+
+
+ Level3
+ MaxSpeed
+ true
+ true
+
+
+ AnySuitable
+ Speed
+ true
+ false
+ Fast
+ ENABLE_ARIB_STD_B1;ENABLE_MULTI2_SIMD;_WINDLL;%(PreprocessorDefinitions)
+ /source-charset:utf-8 %(AdditionalOptions)
+
+
+ true
+ true
+ winscard.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
+ false
+ UseLinkTimeCodeGeneration
+ $(IntDir)$(TargetName).lib
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/aribb25/libaribb1.vcxproj.filters b/aribb25/libaribb1.vcxproj.filters
new file mode 100644
index 0000000..0176305
--- /dev/null
+++ b/aribb25/libaribb1.vcxproj.filters
@@ -0,0 +1,81 @@
+
+
+
+
+ {4FC737F1-C7A5-4376-A066-2A32D752A2FF}
+ cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx
+
+
+ {93995380-89BD-4b04-88EB-625FBE52EBFB}
+ h;hh;hpp;hxx;hm;inl;inc;xsd
+
+
+ {67DA6AB6-F800-4c08-8B7A-83BB121AAD01}
+ rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms
+
+
+
+
+ ソース ファイル
+
+
+ ソース ファイル
+
+
+ ソース ファイル
+
+
+ ソース ファイル
+
+
+ ソース ファイル
+
+
+ ソース ファイル
+
+
+
+
+ ヘッダー ファイル
+
+
+ ヘッダー ファイル
+
+
+ ヘッダー ファイル
+
+
+ ヘッダー ファイル
+
+
+ ヘッダー ファイル
+
+
+ ヘッダー ファイル
+
+
+ ヘッダー ファイル
+
+
+ ヘッダー ファイル
+
+
+ ヘッダー ファイル
+
+
+ ヘッダー ファイル
+
+
+ ヘッダー ファイル
+
+
+ ヘッダー ファイル
+
+
+ ヘッダー ファイル
+
+
+ ヘッダー ファイル
+
+
+
\ No newline at end of file
diff --git a/aribb25/libaribb25.vcxproj b/aribb25/libaribb25.vcxproj
index edca0b0..42e92b6 100644
--- a/aribb25/libaribb25.vcxproj
+++ b/aribb25/libaribb25.vcxproj
@@ -89,6 +89,7 @@
ENABLE_MULTI2_SIMD;_WINDLL;%(PreprocessorDefinitions)
+ /source-charset:utf-8 %(AdditionalOptions)
winscard.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
@@ -102,6 +103,7 @@
ENABLE_MULTI2_SIMD;_WINDLL;%(PreprocessorDefinitions)
+ /source-charset:utf-8 %(AdditionalOptions)
winscard.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
@@ -122,6 +124,7 @@
false
Fast
ENABLE_MULTI2_SIMD;_WINDLL;%(PreprocessorDefinitions)
+ /source-charset:utf-8 %(AdditionalOptions)
true
@@ -146,6 +149,7 @@
false
Fast
ENABLE_MULTI2_SIMD;_WINDLL;%(PreprocessorDefinitions)
+ /source-charset:utf-8 %(AdditionalOptions)
true
diff --git a/aribb25/multi2_simd.c b/aribb25/multi2_simd.c
index 93283d8..bc81f1b 100644
--- a/aribb25/multi2_simd.c
+++ b/aribb25/multi2_simd.c
@@ -144,13 +144,13 @@ static __forceinline const uint32_t left_rotate_uint32_for_simd(const uint32_t v
static __forceinline void round_pi1(uint32_t *left, uint32_t *right)
{
- // Elementary Encryption Function ƒÎ1
+ // Elementary Encryption Function Æ’ÃŽ1
*right ^= *left;
}
static __forceinline void round_pi2(uint32_t *left, uint32_t *right, const uint32_t k1)
{
- // Elementary Encryption Function ƒÎ2
+ // Elementary Encryption Function Æ’ÃŽ2
const uint32_t y = *right + k1;
const uint32_t z = left_rotate_uint32_for_simd(y, 1UL) + y - 1UL;
*left ^= left_rotate_uint32_for_simd(z, 4UL) ^ z;
@@ -158,7 +158,7 @@ static __forceinline void round_pi2(uint32_t *left, uint32_t *right, const uint3
static __forceinline void round_pi3(uint32_t *left, uint32_t *right, const uint32_t k2, const uint32_t k3)
{
- // Elementary Encryption Function ƒÎ3
+ // Elementary Encryption Function Æ’ÃŽ3
const uint32_t y = *left + k2;
const uint32_t z = left_rotate_uint32_for_simd(y, 2UL) + y + 1UL;
const uint32_t a = left_rotate_uint32_for_simd(z, 8UL) ^ z;
@@ -169,7 +169,7 @@ static __forceinline void round_pi3(uint32_t *left, uint32_t *right, const uint3
static __forceinline void round_pi4(uint32_t *left, uint32_t *right, const uint32_t k4)
{
- // Elementary Encryption Function ƒÎ4
+ // Elementary Encryption Function Æ’ÃŽ4
const uint32_t y = *right + k4;
*left ^= (left_rotate_uint32_for_simd(y, 2UL) + y + 1UL);
}