ooxml_crypt 0.1.0

data/vendor/msoffice/src/proj/attack/attack.vcxproj

@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{40B5AD5D-5F35-4FFD-945D-022E7F1AAB31}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>attack</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v110</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v110</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\common.props" />
+    <Import Project="..\..\..\debug.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\common.props" />
+    <Import Project="..\..\..\release.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions);NOMINMAX</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions);NOMINMAX</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\attack.cpp" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

data/vendor/msoffice/src/proj/main/msoffice-crypt.vcxproj

@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{9E396E79-C168-4C40-BDE0-C9413B33C8CE}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>msoffice-crypt</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v110</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v110</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\common.props" />
+    <Import Project="..\..\..\debug.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\common.props" />
+    <Import Project="..\..\..\release.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions);NOMINMAX</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions);NOMINMAX</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\msoffice-crypt.cpp" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

data/vendor/msoffice/src/sha1.cpp

@@ -0,0 +1,234 @@
+/**
+	@file
+	@brief sha1 sample
+	Copyright (C) 2012 Cybozu Labs, Inc., all rights reserved.
+*/
+#include <stdio.h>
+#include <stdlib.h>
+#include <cybozu/sha1.hpp>
+#include "aes.hpp"
+#include <cybozu/base64.hpp>
+#include <sstream>
+#include <fstream>
+#include <cybozu/mmap.hpp>
+#include <cybozu/minixml.hpp>
+#include <cybozu/atoi.hpp>
+
+/*
+<keyData
+  saltSize="16"
+  blockSize="16"
+  keyBits="128"
+  hashSize="20"
+  cipherAlgorithm="AES"
+  cipherChaining="ChainingModeCBC"
+  hashAlgorithm="SHA1"
+  saltValue="xJqq7pkATGsBfuXNEbhnKQ=="
+/>
+<dataIntegrity
+  encryptedHmacKey="rxCSo+nqBf18m0mctP82tZbBRRaC5h7DM1q7q/bKPrU="
+  encryptedHmacValue="yuBiZXxrtgU3WNRWahDolVZJ8PbwsI9w7Hksnu2UkvM="
+/>
+<keyEncryptors>
+  <p:encryptedKey
+    spinCount="100000"
+    saltSize="16"
+    blockSize="16"
+    keyBits="128"
+    hashSize="20"
+    cipherAlgorithm="AES"
+    cipherChaining="ChainingModeCBC"
+    hashAlgorithm="SHA1"
+    saltValue="9JlPmy3NXg6EvGOG1FI9LA=="
+    encryptedVerifierHashInput="xpwBRhK5VWSrmM9kspOnwg=="
+    encryptedVerifierHashValue="jpuVmPpsYgBZR1fvJ21E9BhRTtuIlbJsknEjEPz1wmI="
+    encryptedKeyValue="cnNcvlFXRSEykrLjpWgYlw=="
+  />
+</keyEncryptor>
+*/
+
+void dump(const std::string& str)
+{
+	for (size_t i = 0; i < str.size(); i++) {
+		printf("%02X:", (unsigned char)str[i]);
+	}
+	printf("\n");
+}
+
+std::string hex(const std::string& str)
+{
+	std::string ret;
+	for (size_t i = 0; i < str.size(); i++) {
+		char buf[64];
+		CYBOZU_SNPRINTF(buf, sizeof(buf), "%02X", (unsigned char)str[i]);
+		ret.append(buf, 2);
+	}
+	return ret;
+}
+
+inline std::string dec64(const std::string& str)
+{
+	cybozu::MemoryInputStream is(str);
+	cybozu::StringOutputStream os;
+	cybozu::DecodeFromBase64(os, is);
+	return os.str_;
+}
+
+std::string hashPassword(const std::string& salt, const std::string& pass, int spinCount)
+{
+	cybozu::Sha1 s;
+	s.update(salt);
+	std::string h = s.digest(pass);
+	for (int i = 0; i < spinCount; i++) {
+		char iter[4];
+		cybozu::Set32bitAsLE(iter, i);
+		cybozu::Sha1 s;
+		s.update(iter, sizeof(iter));
+		h = s.digest(h);
+	}
+	return h;
+}
+
+std::string hash(const std::string& msg)
+{
+	cybozu::Sha1 s;
+	return s.digest(msg);
+}
+
+std::string generateKey(const std::string& hash, const std::string& blockKey)
+{
+	cybozu::Sha1 s;
+	s.update(hash);
+	return s.digest(blockKey).substr(0, 16);
+}
+
+std::string generateIv(const std::string& salt, const std::string& blockKey)
+{
+	if (blockKey.empty()) {
+		return salt.substr(0, 16);
+	}
+	return generateKey(salt, blockKey);
+}
+
+std::string cipher(const char *msg, size_t msgLen, const std::string& key, const std::string& iv)
+{
+	printf("msg len=%d\n", (int)msgLen);
+	if ((msgLen % 16) != 0) {
+		puts("only size= 16x");
+		exit(1);
+	}
+	cybozu::Aes cipher;
+	if (!cipher.setup(hex(key).c_str(), cybozu::Aes::DECODING, 128, hex(iv).c_str())) {
+		fprintf(stderr, "can't setup\n");
+		exit(1);
+	}
+	std::string ret;
+	for (size_t i = 0; i < msgLen; i += 16) {
+		char outBuf[256];
+		int writeSize = cipher.update(&msg[i], 16, outBuf);
+		if (writeSize < 0) {
+			exit(1);
+		}
+		ret.append(outBuf, writeSize);
+	}
+	return ret;
+}
+
+std::string cipher(const std::string& msg, const std::string& key, const std::string& iv)
+{
+	return cipher(msg.c_str(), msg.size(), key, iv);
+}
+
+std::string decContent(const std::string& data, const std::string& key, const std::string& salt)
+{
+	std::string dec;
+	dec.reserve(data.size());
+	const size_t n = (data.size() + 4095) / 4096;
+	for (size_t i = 0; i < n; i++) {
+		const size_t len = (i < n - 1) ? 4096 : (data.size() % 4096);
+		std::string blockKey(4, 0);
+		cybozu::Set32bitAsLE(&blockKey[0], i);
+		const std::string iv = generateKey(salt, blockKey);
+		dec.append(cipher(data.c_str() + i * 4096, len, key, iv));
+	}
+	return dec;
+}
+
+int main()
+	try
+{
+	cybozu::Mmap xmlFile("EncryptionInfo");
+	cybozu::MiniXml xml(xmlFile.get() + 8, xmlFile.get() + xmlFile.size());
+
+	const cybozu::minixml::Node *keyData = xml.get().getFirstTagByName("keyData");
+	const std::string keyData_saltValue(dec64(keyData->attr["saltValue"]));
+
+	const cybozu::minixml::Node *dataIntegrity = xml.get().getFirstTagByName("dataIntegrity");
+
+	const std::string encryptedHmacKey(dec64(dataIntegrity->attr["encryptedHmacKey"]));
+	const std::string encryptedHmacValue(dec64(dataIntegrity->attr["encryptedHmacValue"]));
+
+	// keyEncryptors
+	const cybozu::minixml::Node *p_encryptedKey = xml.get().getFirstTagByName("p:encryptedKey");
+	const int spinCount = cybozu::atoi(p_encryptedKey->attr["spinCount"]);
+	const std::string encryptedKey_saltValue(dec64(p_encryptedKey->attr["saltValue"]));
+	const std::string encryptedVerifierHashInput(dec64(p_encryptedKey->attr["encryptedVerifierHashInput"]));
+	const std::string encryptedVerifierHashValue(dec64(p_encryptedKey->attr["encryptedVerifierHashValue"]));
+	const std::string encryptedKeyValue(dec64(p_encryptedKey->attr["encryptedKeyValue"]));
+
+	std::string pass("t\x00""e\x00""s\x00""t\x00", 8);
+	const std::string kV("\xfe" "\xa7" "\xd2" "\x76" "\x3b" "\x4b" "\x9e" "\x79", 8);
+	const std::string kH("\xd7" "\xaa" "\x0f" "\x6d" "\x30" "\x61" "\x34" "\x4e", 8);
+	const std::string kC("\x14" "\x6e" "\x0b" "\xe7" "\xab" "\xac" "\xd0" "\xd6", 8);
+
+	puts("pass"); dump(pass);
+	const std::string pwHash = hashPassword(encryptedKey_saltValue, pass, spinCount);
+
+	const std::string iv = encryptedKey_saltValue;
+	const std::string skey1 = generateKey(pwHash, kV);
+	const std::string verifierHashInput = cipher(encryptedVerifierHashInput, skey1, iv);
+	puts("verifierHashInput");
+	dump(verifierHashInput);
+	const std::string hashedVerifier = hash(verifierHashInput);
+	puts("hashedVerifier"); dump(hashedVerifier);
+
+	const std::string skey2 = generateKey(pwHash, kH);
+	const std::string verifierHash = cipher(encryptedVerifierHashValue, skey2, iv).substr(0, hashedVerifier.size());
+	puts("verifierHash"); dump(verifierHash);
+
+	if (hashedVerifier != verifierHash) {
+		puts("miss");
+		return 1;
+	}
+	const std::string skey3 = generateKey(pwHash, kC);
+	std::string secretKey = cipher(encryptedKeyValue, skey3, iv);
+	puts("secretKey"); dump(secretKey);
+
+	cybozu::Mmap m("EncryptedPackage");
+	uint64_t fileSize = cybozu::Get64bitAsLE(m.get());
+	printf("fileSize=%d\n", (int)fileSize);
+	std::string encData(m.get() + 8, (int)m.size() - 8);
+printf("encData.size=%d\n", (int)encData.size());
+
+	// decode
+	std::string decData = decContent(encData, secretKey, keyData_saltValue);
+	{
+		std::ofstream ofs("dec.pptx", std::ios::binary);
+		ofs.write(decData.c_str(), (int)fileSize);
+	}
+	// integrity
+	{
+		const std::string b1("\x5f" "\xb2" "\xad" "\x01" "\x0c" "\xb9" "\xe1" "\xf6", 8);
+		const std::string iv1 = generateIv(keyData_saltValue, b1);
+		const std::string salt = cipher(encryptedHmacKey, secretKey, iv1).substr(0, 20);
+		printf("salt=%s\n", hex(salt).c_str());
+	}
+	{
+		const std::string b2("\xa0" "\x67" "\x7f" "\x02" "\xb2" "\x2c" "\x84" "\x33", 8);
+		const std::string iv2 = generateIv(keyData_saltValue, b2);
+		const std::string r2 = cipher(encryptedHmacValue, secretKey, iv2).substr(0, 20);
+		printf("  r2=%s\n", hex(r2).c_str());
+	}
+} catch (cybozu::Exception& e) {
+	printf("ERR %s\n", e.what());
+}

data/vendor/msoffice/test/Makefile

@@ -0,0 +1,20 @@
+include ../common.mk
+
+TARGET=$(TEST_FILE)
+LIBS=
+
+SRC=$(wildcard *.cpp)
+
+all: $(TARGET)
+
+test: $(TARGET)
+	@$(UNIT_TEST)
+
+$(OBJDIR):
+	@$(MKDIR) $(OBJDIR)
+
+clean:
+	$(CLEAN)
+
+-include $(DEPEND_FILE)
+

data/vendor/msoffice/test/cfb_test.cpp

@@ -0,0 +1,74 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string>
+#include <locale>
+#include <fstream>
+#include <cybozu/mmap.hpp>
+#include "cfb.hpp"
+
+void usage()
+{
+	fprintf(stderr, "cfb_test -f <inFile>\n");
+	exit(0);
+}
+
+std::string toAscii(const cybozu::String16& str)
+{
+	std::string ret;
+	if (cybozu::ConvertUtf16ToUtf8(&ret, str)) {
+		return ret;
+	}
+	return "";
+}
+
+void run(const std::string& inFile)
+{
+	cybozu::Mmap m(inFile);
+	if (m.size() > 0xffffffff) {
+		fprintf(stderr, "too large file size %lld\n", (long long)m.size());
+		exit(1);
+	}
+	const uint32_t mSize = static_cast<uint32_t>(m.size());
+	ms::cfb::CompoundFile cfb(m.get(), mSize);
+	cfb.put();
+	const char nameTbl[][128] = {
+		"EncryptedPackage",
+		"EncryptionInfo",
+	};
+	const ms::cfb::DirectoryEntryVec& dirs = cfb.dirs;
+	for (size_t i = 0; i < dirs.size(); i++) {
+		const ms::cfb::DirectoryEntry& dir = dirs[i];
+		for (size_t j = 0; j < CYBOZU_NUM_OF_ARRAY(nameTbl); j++) {
+			std::string asc = toAscii(dir.directoryEntryName);
+			if (asc == nameTbl[j]) {
+printf("save %s\n", nameTbl[j]);
+				std::ofstream ofs(nameTbl[j], std::ios::binary);
+				ofs.write((const char*)&dir.content[0], (size_t)dir.streamSize);
+			}
+		}
+	}
+}
+
+int main(int argc, char *argv[])
+	try
+{
+	argc--, argv++;
+	std::string inFile;
+	while (argc > 0) {
+		if (argc > 1 && strcmp(*argv, "-f") == 0) {
+			argc--, argv++;
+			inFile = *argv;
+		} else
+		{
+			usage();
+		}
+		argc--, argv++;
+	}
+	if (inFile.empty()) {
+		usage();
+	}
+	run(inFile);
+} catch (std::exception& e) {
+	fprintf(stderr, "exception:%s\n", e.what());
+	return 1;
+}

data/vendor/msoffice/test/hash_test.cpp

@@ -0,0 +1,59 @@
+#include <cybozu/test.hpp>
+#include <crypto_util.hpp>
+#include <cybozu/benchmark.hpp>
+#include "custom_sha1.hpp"
+
+namespace ms {
+
+inline std::string hashPasswordOrg(cybozu::crypto::Hash::Name name, const std::string& salt, const std::string& pass, int spinCount)
+{
+	cybozu::crypto::Hash s(name);
+	std::string h = s.digest(salt + pass);
+	assert(h.size() == 20);
+	for (int i = 0; i < spinCount; i++) {
+		char iter[4];
+		cybozu::Set32bitAsLE(iter, i);
+		s.update(iter, sizeof(iter));
+		s.digest(&h[0], &h[0], h.size());
+	}
+	return h;
+}
+
+inline std::string sha1PasswordNew(const std::string& salt, const std::string& pass, int spinCount)
+{
+	std::string h = cybozu::crypto::Hash::digest(cybozu::crypto::Hash::N_SHA1, salt + pass);
+	assert(h.size() == 20);
+	CustomSha1::digest(&h[0], spinCount);
+	return h;
+}
+
+} // ms
+
+CYBOZU_TEST_AUTO(hashPassword)
+{
+	cybozu::crypto::Hash::Name hash = cybozu::crypto::Hash::N_SHA1;
+	const std::string pass[8] = { "adsfasdf", "xxx", "12345234", "999", "abcD", "XXX", "---", "---------sfas" };
+	const std::string salt = "sdfa3rvawvfafas";
+	std::string out[8];
+	const int spinCount = 10000;
+	const std::string x = ms::hashPasswordOrg(hash, salt, pass[0], spinCount);
+	const std::string y = ms::sha1PasswordNew(salt, pass[0], spinCount);
+	CYBOZU_TEST_EQUAL(x, y);
+#ifdef SHA1_USE_SIMD
+	const int N = Uint32Vec::size;
+	printf("SIMD=%d\n", N);
+	ms::sha1PasswordX<N>(out, salt, pass, spinCount);
+	for (int i = 0; i < N; i++) {
+		CYBOZU_TEST_EQUAL(ms::hex(out[i]), ms::hex(ms::hashPasswordOrg(hash, salt, pass[i], spinCount)));
+	}
+#endif
+#ifdef NDEBUG
+	if (x == y) {
+		CYBOZU_BENCH("org", ms::hashPasswordOrg, hash, salt, pass[0], spinCount);
+		CYBOZU_BENCH("new", ms::sha1PasswordNew, salt, pass[0], spinCount);
+#ifdef SHA1_USE_SIMD
+		CYBOZU_BENCH("xN ", ms::sha1PasswordX<Uint32Vec::size>,  out, salt, pass, spinCount);
+#endif
+	}
+#endif
+}

data/vendor/msoffice/test/proj/cfb/cfb_test.vcxproj

@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{9E396E79-C168-4C40-BDE0-C9413B33C8CE}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>cfb_test</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v110</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v110</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\common.props" />
+    <Import Project="..\..\..\debug.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\common.props" />
+    <Import Project="..\..\..\release.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions);NOMINMAX</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)include;$(SolutionDir)..\cybozulib\include;$(SolutionDir)..\cybozulib_ext\openssl\include</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions);NOMINMAX</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)include;$(SolutionDir)..\cybozulib\include;$(SolutionDir)..\cybozulib_ext\openssl\include</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\cfb_test.cpp" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>