ooxml_crypt 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64e15ec061f119a4cd42d96bf9d78379ab414baac2a7cf112c1949dd2c8cf7dd
-  data.tar.gz: 8d2d7db90bf52b382930d39fb0cd1070d354b40554a02b77dda4bea37ba3d919
+  metadata.gz: 56e9f314d176274949daedac49d7d95477067389a622183e53563fc431293644
+  data.tar.gz: 80ea63bd8a6ecbce9379ce1273422fce8f8e385db3e10ace6dc8019a452384b4
 SHA512:
-  metadata.gz: a750fccb3208adafc918e7b215875348e6c8afd372a759d8d3eb8eb89fc4c11225b7a4e2f3cdb0ba0dab938a33c9513e1489c48edd1160a66463a8acb6fedaac
-  data.tar.gz: 47abbf6cb88ec6eedea69c89fa10cb743d36b14c1e71d4567afa4771364b5aa4273a71f57c96cb96ec39f19087f18efbd2c68e88c1be175fb24fdd14afbc3a32
+  metadata.gz: 7ce0ee6c41ccbe97fe1534365498d294706890273f99026762c17c7bb6e397af3e702efac0b9863d7c1c0d883b1a9b4c22d815beddd6429e0cac2aaf7e8237b3
+  data.tar.gz: 11f8442f5a69161f0800de3439904950c46b164dd6274854e478cf6cc483dfbff67166a82be5e939e660ababce291d23db27fc4acb38d41443f327b3ec83eb25

data/ext/ooxml_crypt/extconf.rb

@@ -11,6 +11,7 @@ abort("Please install OpenSSL development libraries!") unless have_header("opens
 # setup build configuration
 vendor = File.realpath(File.join(__dir__, "..", "..", "vendor"))
 $INCFLAGS << " -I#{vendor}/cybozulib/include -I#{vendor}/msoffice/include"
+$defs << "-DCYBOZU_USE_OPENSSL_NEW_HASH=0" # fix compatibility with old OpenSSL versions
 $VPATH << "#{vendor}/msoffice/src"
 $srcs = ["ooxml_crypt.c", "msocdll.cpp"]
 

data/lib/ooxml_crypt/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module OoxmlCrypt
-  VERSION = "0.1.0"
+  VERSION = "0.1.2"
 end

data/vendor/cybozulib/common.mk

@@ -65,9 +65,9 @@ EXTDIR:=$(TOPDIR)../cybozulib_ext/
 
 CFLAGS+= -I$(TOPDIR)include
 LDFLAGS += -lz -lpthread -lssl -lcrypto
-HAS_BOOST=$(shell echo "\#include <boost/version.hpp>" | ($(CXX) -E - 2>/dev/null) | grep "boost/version.hpp" >/dev/null && echo "1")
-HAS_MECAB=$(shell echo "\#include <mecab.h>" | ($(CXX) -E - 2>/dev/null) | grep "mecab.h" >/dev/null && echo "1")
-HAS_EIGEN=$(shell echo "\#include <eigen3/Eigen/Sparse>" | ($(CXX) -E - 2>/dev/null) | grep "eigen3/Eigen/Sparse" >/dev/null && echo "1")
+HAS_BOOST=0#$(shell echo "\#include <boost/version.hpp>" | ($(CXX) -E - 2>/dev/null) | grep "boost/version.hpp" >/dev/null && echo "1")
+HAS_MECAB=0#$(shell echo "\#include <mecab.h>" | ($(CXX) -E - 2>/dev/null) | grep "mecab.h" >/dev/null && echo "1")
+HAS_EIGEN=0#$(shell echo "\#include <eigen3/Eigen/Sparse>" | ($(CXX) -E - 2>/dev/null) | grep "eigen3/Eigen/Sparse" >/dev/null && echo "1")
 ifeq ($(HAS_BOOST),1)
   LDFLAGS += -lboost_regex
 endif

data/vendor/cybozulib/common.props

@@ -1,4 +1,4 @@
-����<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ImportGroup Label="PropertySheets" />
   <PropertyGroup Label="UserMacros" />

data/vendor/cybozulib/debug.props

@@ -1,4 +1,4 @@
-����<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ImportGroup Label="PropertySheets" />
   <PropertyGroup Label="UserMacros" />

data/vendor/cybozulib/include/cybozu/atomic.hpp

@@ -8,13 +8,17 @@
 */
 #include <cybozu/inttype.hpp>
 #ifdef _WIN32
+#include <intrin.h>
+#if CYBOZU_HOST == CYBOZU_HOST_INTEL
 #ifndef WIN32_LEAN_AND_MEAN
 	#define WIN32_LEAN_AND_MEAN
 #endif
-#include <windows.h>
-#include <intrin.h>
+#include <windows.h> // _mm_mfence
+#endif
 #else
-#include <emmintrin.h>
+#if CYBOZU_HOST == CYBOZU_HOST_INTEL
+#include <x86intrin.h>
+#endif
 #endif
 
 namespace cybozu {
@@ -136,10 +140,16 @@ T AtomicExchange(T *p, T newValue)
 
 inline void mfence()
 {
-#ifdef _MSC_VER
+#if defined(_WIN32) && CYBOZU_HOST == CYBOZU_HOST_INTEL
 	MemoryBarrier();
-#else
+#elif defined(_WIN32) && CYBOZU_HOST == CYBOZU_HOST_ARM
+	__dsb(0xf);
+#elif CYBOZU_HOST == CYBOZU_HOST_INTEL
 	_mm_mfence();
+#elif CYBOZU_HOST == CYBOZU_HOST_ARM
+	__sync_synchronize();
+#else
+	#error "not supported"
 #endif
 }
 

data/vendor/cybozulib/include/cybozu/bfd.hpp

@@ -89,7 +89,7 @@ private:
 		Data *data = (Data*)self;
 		if (data->found) return;
 		if (section == 0) return;
-		bfd_vma vma = bfd_section_vma(bfd, section);
+		bfd_vma vma = bfd_section_vma(section);
 		if (data->pc < vma) return;
 		bfd_size_type size = bfd_section_size(section);
 		if (data->pc >= vma + size) return;

data/vendor/cybozulib/include/cybozu/bit_operation.hpp

@@ -6,14 +6,8 @@
 #include <assert.h>
 #include <cybozu/inttype.hpp>
 
-#if (CYBOZU_HOST == CYBOZU_HOST_INTEL)
-	#if defined(_WIN32)
-		#include <intrin.h>
-	#elif defined(__linux__) || defined(__CYGWIN__) || defined(__clang__)
-		#include <x86intrin.h>
-	#elif defined(__GNUC__)
-		#include <emmintrin.h>
-	#endif
+#if defined(_WIN32)
+	#include <intrin.h>
 #endif
 
 namespace cybozu {
@@ -117,7 +111,9 @@ uint32_t popcnt(T x);
 template<>
 inline uint32_t popcnt<uint32_t>(uint32_t x)
 {
-#if defined(_MSC_VER)
+#if defined(_M_ARM64)
+	return static_cast<uint32_t>(_CountOneBits(x));
+#elif defined(_MSC_VER) && !defined(__clang__)
 	return static_cast<uint32_t>(_mm_popcnt_u32(x));
 #else
 	return static_cast<uint32_t>(__builtin_popcount(x));
@@ -127,7 +123,9 @@ inline uint32_t popcnt<uint32_t>(uint32_t x)
 template<>
 inline uint32_t popcnt<uint64_t>(uint64_t x)
 {
-#if defined(__x86_64__)
+#if defined(_M_ARM64)
+	return static_cast<uint32_t>(_CountOneBits64(x));
+#elif defined(__x86_64__)
 	return static_cast<uint32_t>(__builtin_popcountll(x));
 #elif defined(_WIN64)
 	return static_cast<uint32_t>(_mm_popcnt_u64(x));

data/vendor/cybozulib/include/cybozu/crypto.hpp

@@ -6,6 +6,13 @@
 */
 
 #include <cybozu/exception.hpp>
+
+#ifndef CYBOZU_USE_OPENSSL_NEW_HASH
+#ifndef _MSC_VER
+#define CYBOZU_USE_OPENSSL_NEW_HASH 1
+#endif
+#endif
+
 #ifdef __APPLE__
 	#pragma GCC diagnostic push
 	#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
@@ -22,8 +29,10 @@
 #else
 #include <openssl/hmac.h>
 #include <openssl/evp.h>
+#if CYBOZU_USE_OPENSSL_NEW_HASH != 1
 #include <openssl/sha.h>
 #endif
+#endif
 #ifdef _MSC_VER
 	#include <cybozu/link_libeay32.hpp>
 #endif
@@ -44,20 +53,33 @@ public:
 private:
 	Name name_;
 	size_t hashSize_;
+#if CYBOZU_USE_OPENSSL_NEW_HASH == 1
+	EVP_MD_CTX *ctx_;
+	void setCTX(const char *name)
+	{
+		const EVP_MD *md = EVP_get_digestbyname(name);
+		if (md == 0) {
+			throw cybozu::Exception("EVP_get_digestbyname") << name;
+		}
+		EVP_MD_CTX_reset(ctx_);
+		EVP_DigestInit_ex(ctx_, md, NULL);
+	}
+#else
 	union {
 		SHA_CTX sha1;
 		SHA256_CTX sha256;
 		SHA512_CTX sha512;
 	} ctx_;
+#endif
 public:
 	static inline size_t getSize(Name name)
 	{
 		switch (name) {
-		case N_SHA1:   return SHA_DIGEST_LENGTH;
-		case N_SHA224: return SHA224_DIGEST_LENGTH;
-		case N_SHA256: return SHA256_DIGEST_LENGTH;
-		case N_SHA384: return SHA384_DIGEST_LENGTH;
-		case N_SHA512: return SHA512_DIGEST_LENGTH;
+		case N_SHA1:   return 160 / 8;
+		case N_SHA224: return 224 / 8;
+		case N_SHA256: return 256 / 8;
+		case N_SHA384: return 384 / 8;
+		case N_SHA512: return 512 / 8;
 		default:
 			throw cybozu::Exception("crypto:Hash:getSize") << name;
 		}
@@ -94,11 +116,23 @@ public:
 	explicit Hash(Name name = N_SHA1)
 		: name_(name)
 		, hashSize_(getSize(name))
+#if CYBOZU_USE_OPENSSL_NEW_HASH == 1
+		, ctx_(EVP_MD_CTX_new())
+#endif
 	{
 		reset();
 	}
+#if CYBOZU_USE_OPENSSL_NEW_HASH == 1
+	~Hash()
+	{
+		EVP_MD_CTX_free(ctx_);
+	}
+#endif
 	void update(const void *buf, size_t bufSize)
 	{
+#if CYBOZU_USE_OPENSSL_NEW_HASH == 1
+		EVP_DigestUpdate(ctx_, buf, bufSize);
+#else
 		switch (name_) {
 		case N_SHA1:   SHA1_Update(&ctx_.sha1, buf, bufSize);     break;
 		case N_SHA224: SHA224_Update(&ctx_.sha256, buf, bufSize); break;
@@ -106,6 +140,7 @@ public:
 		case N_SHA384: SHA384_Update(&ctx_.sha512, buf, bufSize); break;
 		case N_SHA512: SHA512_Update(&ctx_.sha512, buf, bufSize); break;
 		}
+#endif
 	}
 	void update(const std::string& buf)
 	{
@@ -114,11 +149,19 @@ public:
 	void reset()
 	{
 		switch (name_) {
+#if CYBOZU_USE_OPENSSL_NEW_HASH == 1
+		case N_SHA1:   setCTX("sha1"); break;
+		case N_SHA224: setCTX("sha224"); break;
+		case N_SHA256: setCTX("sha256"); break;
+		case N_SHA384: setCTX("sha384"); break;
+		case N_SHA512: setCTX("sha512"); break;
+#else
 		case N_SHA1:   SHA1_Init(&ctx_.sha1);     break;
 		case N_SHA224: SHA224_Init(&ctx_.sha256); break;
 		case N_SHA256: SHA256_Init(&ctx_.sha256); break;
 		case N_SHA384: SHA384_Init(&ctx_.sha512); break;
 		case N_SHA512: SHA512_Init(&ctx_.sha512); break;
+#endif
 		default:
 			throw cybozu::Exception("crypto:Hash:rset") << name_;
 		}
@@ -131,6 +174,10 @@ public:
 	{
 		update(buf, bufSize);
 		unsigned char *md = reinterpret_cast<unsigned char*>(out);
+#if CYBOZU_USE_OPENSSL_NEW_HASH == 1
+		unsigned int len;
+		EVP_DigestFinal_ex(ctx_, md, &len);
+#else
 		switch (name_) {
 		case N_SHA1:   SHA1_Final(md, &ctx_.sha1);     break;
 		case N_SHA224: SHA224_Final(md, &ctx_.sha256); break;
@@ -140,6 +187,7 @@ public:
 		default:
 			throw cybozu::Exception("crypto:Hash:digest") << name_;
 		}
+#endif
 		reset();
 	}
 	std::string digest(const void *buf, size_t bufSize)
@@ -159,6 +207,11 @@ public:
 	*/
 	static inline size_t digest(void *out, Name name, const void *buf, size_t bufSize)
 	{
+#if 1
+		Hash h(name);
+		h.digest(out, buf, bufSize);
+		return getSize(name);
+#else
 		unsigned char *md = (unsigned char*)out;
 		const unsigned char *src = cybozu::cast<const unsigned char *>(buf);
 		switch (name) {
@@ -170,6 +223,7 @@ public:
 		default:
 			return 0;
 		}
+#endif
 	}
 	static inline std::string digest(Name name, const void *buf, size_t bufSize)
 	{

data/vendor/cybozulib/include/cybozu/endian.hpp

@@ -8,8 +8,6 @@
 */
 #include <cybozu/inttype.hpp>
 #include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
 
 namespace cybozu {
 

data/vendor/cybozulib/include/cybozu/inttype.hpp

@@ -71,6 +71,20 @@
 		#define CYBOZU_SNPRINTF(x, len, ...) (void)snprintf(x, len, __VA_ARGS__)
 	#endif
 #endif
+#ifndef CYBOZU_ASSUME
+	#ifdef NDEBUG
+		#if defined(__clang__)
+			#define CYBOZU_ASSUME(x) __builtin_assume(x)
+		#elif defined(_MSC_VER) || defined(__ICC)
+			#define CYBOZU_ASSUME(x) __assume(x)
+		#else
+			#define CYBOZU_ASSUME(x) if (!(x)) { __builtin_unreachable(); }
+		#endif
+	#else
+		#define CYBOZU_ASSUME(x) assert(x)
+	#endif
+#endif
+
 
 // LLONG_MIN in limits.h is not defined in some env.
 #define CYBOZU_LLONG_MIN (-9223372036854775807ll-1)
@@ -118,7 +132,7 @@
 #endif
 
 #ifndef CYBOZU_OS_BIT
-	#if defined(_WIN64) || defined(__x86_64__) || defined(__AARCH64EL__) || defined(__EMSCRIPTEN__) || defined(__LP64__)
+	#if defined(_WIN64) || defined(__x86_64__) || defined(__AARCH64EL__) || defined(__EMSCRIPTEN__) || defined(__LP64__) || defined(_M_ARM64)
 		#define CYBOZU_OS_BIT 64
 	#else
 		#define CYBOZU_OS_BIT 32
@@ -131,7 +145,7 @@
 	#define CYBOZU_HOST_ARM 2
 	#if defined(_M_IX86) || defined(_M_AMD64) || defined(__x86_64__) || defined(__i386__)
 		#define CYBOZU_HOST CYBOZU_HOST_INTEL
-	#elif defined(__arm__) || defined(__AARCH64EL__)
+	#elif defined(__arm__) || defined(__AARCH64EL__) || defined(_M_ARM64)
 		#define CYBOZU_HOST CYBOZU_HOST_ARM
 	#else
 		#define CYBOZU_HOST CYBOZU_HOST_UNKNOWN
@@ -144,7 +158,7 @@
 	#define CYBOZU_ENDIAN_BIG 2
 	#if (CYBOZU_HOST == CYBOZU_HOST_INTEL)
 		#define CYBOZU_ENDIAN CYBOZU_ENDIAN_LITTLE
-	#elif (CYBOZU_HOST == CYBOZU_HOST_ARM) && (defined(__ARM_EABI__) || defined(__AARCH64EL__))
+	#elif (CYBOZU_HOST == CYBOZU_HOST_ARM) && (defined(__ARM_EABI__) || defined(__AARCH64EL__) || defined(_M_ARM64))
 		#define CYBOZU_ENDIAN CYBOZU_ENDIAN_LITTLE
 	#elif defined(__s390x__)
 		#define CYBOZU_ENDIAN CYBOZU_ENDIAN_BIG

data/vendor/cybozulib/include/cybozu/link_libeay32.hpp

@@ -4,7 +4,7 @@
 	@brief link libeay32.lib of openssl
 	@author MITSUNARI Shigeo(@herumi)
 */
-#if defined(_WIN32) && defined(_MT)
+#if defined(_MSC_VER) && defined(_MT)
 	#if _MSC_VER >= 1900 // VC2015
 		#ifdef _WIN64
 			#pragma comment(lib, "mt/14/libeay32.lib")

data/vendor/cybozulib/include/cybozu/link_mpir.hpp

@@ -4,7 +4,7 @@
 	@brief link mpir/mpirxx of mpir
 	@author MITSUNARI Shigeo(@herumi)
 */
-#if defined(_WIN32) && defined(_MT)
+#if defined(_MSC_VER) && defined(_MT)
 	#if _MSC_VER >= 1900 // VC2015, VC2017(1910)
 		#pragma comment(lib, "mt/14/mpir.lib")
 		#pragma comment(lib, "mt/14/mpirxx.lib")

data/vendor/cybozulib/include/cybozu/link_ssleay32.hpp

@@ -4,7 +4,7 @@
 	@brief link ssleay32.lib of openssl
 	@author MITSUNARI Shigeo(@herumi)
 */
-#if defined(_WIN32) && defined(_MT)
+#if defined(_MSC_VER) && defined(_MT)
 	#if _MSC_VER >= 1900 // VC2015
 		#ifdef _WIN64
 			#pragma comment(lib, "mt/14/ssleay32.lib")

data/vendor/cybozulib/include/cybozu/random_generator.hpp

@@ -20,6 +20,7 @@
 #pragma comment (lib, "advapi32.lib")
 #endif
 #else
+#include <stdio.h>
 #include <sys/types.h>
 #include <fcntl.h>
 #endif

data/vendor/cybozulib/include/cybozu/sha2.hpp

@@ -16,11 +16,23 @@
 #include <memory.h>
 
 #ifdef CYBOZU_USE_OPENSSL_SHA
+
+#ifndef CYBOZU_USE_OPENSSL_NEW_HASH
+#ifndef _MSC_VER
+#define CYBOZU_USE_OPENSSL_NEW_HASH 1
+#endif
+#endif
+
 #ifdef __APPLE__
 	#pragma GCC diagnostic push
 	#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #endif
+#if CYBOZU_USE_OPENSSL_NEW_HASH == 1
+#include <openssl/evp.h>
+#include <assert.h>
+#else
 #include <openssl/sha.h>
+#endif
 #ifdef _MSC_VER
 	#include <cybozu/link_libeay32.hpp>
 #endif
@@ -31,27 +43,90 @@
 
 namespace cybozu {
 
+#if CYBOZU_USE_OPENSSL_NEW_HASH == 1
+namespace local {
+
+template<size_t MD_SIZE_>
+struct NewHash {
+	static const size_t MD_SIZE = MD_SIZE_;
+	EVP_MD_CTX *mdctx_;
+	const EVP_MD *md_;
+	explicit NewHash(const char *name)
+		: mdctx_(EVP_MD_CTX_new())
+		, md_(EVP_get_digestbyname(name))
+	{
+		if (md_ == 0) {
+			fprintf(stderr, "fatail error NewHash %s\n", name);
+		}
+		assert(md_);
+	}
+	~NewHash()
+	{
+		EVP_MD_CTX_free(mdctx_);
+	}
+	void clear()
+	{
+		EVP_MD_CTX_reset(mdctx_);
+		EVP_DigestInit_ex(mdctx_, md_, NULL);
+	}
+	void update(const void *buf, size_t bufSize)
+	{
+		EVP_DigestUpdate(mdctx_, buf, bufSize);
+	}
+	size_t digest(void *md, size_t mdSize, const void *buf, size_t bufSize)
+	{
+		if (mdSize < MD_SIZE) return 0;
+		update(buf, bufSize);
+		unsigned int len;
+		EVP_DigestFinal_ex(mdctx_, (unsigned char*)md, &len);
+		assert(len == MD_SIZE);
+		return MD_SIZE;
+	}
+};
+
+} // local
+#endif
+
 class Sha256 {
+#if CYBOZU_USE_OPENSSL_NEW_HASH == 1
+	local::NewHash<32> ctx_;
+#else
 	SHA256_CTX ctx_;
+#endif
 public:
 	Sha256()
+#if CYBOZU_USE_OPENSSL_NEW_HASH == 1
+		: ctx_("sha256")
+#endif
 	{
 		clear();
 	}
 	void clear()
 	{
+#if CYBOZU_USE_OPENSSL_NEW_HASH == 1
+		ctx_.clear();
+#else
 		SHA256_Init(&ctx_);
+#endif
 	}
 	void update(const void *buf, size_t bufSize)
 	{
+#if CYBOZU_USE_OPENSSL_NEW_HASH == 1
+		ctx_.update(buf, bufSize);
+#else
 		SHA256_Update(&ctx_, buf, bufSize);
+#endif
 	}
 	size_t digest(void *md, size_t mdSize, const void *buf, size_t bufSize)
 	{
+#if CYBOZU_USE_OPENSSL_NEW_HASH == 1
+		return ctx_.digest(md, mdSize, buf, bufSize);
+#else
 		if (mdSize < SHA256_DIGEST_LENGTH) return 0;
 		update(buf, bufSize);
 		SHA256_Final(reinterpret_cast<uint8_t*>(md), &ctx_);
 		return SHA256_DIGEST_LENGTH;
+#endif
 	}
 #ifndef CYBOZU_DONT_USE_STRING
 	void update(const std::string& buf)
@@ -64,7 +139,11 @@ public:
 	}
 	std::string digest(const void *buf, size_t bufSize)
 	{
+#if CYBOZU_USE_OPENSSL_NEW_HASH == 1
+		std::string md(ctx_.MD_SIZE, 0);
+#else
 		std::string md(SHA256_DIGEST_LENGTH, 0);
+#endif
 		digest(&md[0], md.size(), buf, bufSize);
 		return md;
 	}
@@ -72,26 +151,45 @@ public:
 };
 
 class Sha512 {
+#if CYBOZU_USE_OPENSSL_NEW_HASH == 1
+	local::NewHash<64> ctx_;
+#else
 	SHA512_CTX ctx_;
+#endif
 public:
 	Sha512()
+#if CYBOZU_USE_OPENSSL_NEW_HASH == 1
+		: ctx_("sha512")
+#endif
 	{
 		clear();
 	}
 	void clear()
 	{
+#if CYBOZU_USE_OPENSSL_NEW_HASH == 1
+		ctx_.clear();
+#else
 		SHA512_Init(&ctx_);
+#endif
 	}
 	void update(const void *buf, size_t bufSize)
 	{
+#if CYBOZU_USE_OPENSSL_NEW_HASH == 1
+		ctx_.update(buf, bufSize);
+#else
 		SHA512_Update(&ctx_, buf, bufSize);
+#endif
 	}
 	size_t digest(void *md, size_t mdSize, const void *buf, size_t bufSize)
 	{
+#if CYBOZU_USE_OPENSSL_NEW_HASH == 1
+		return ctx_.digest(md, mdSize, buf, bufSize);
+#else
 		if (mdSize < SHA512_DIGEST_LENGTH) return 0;
 		update(buf, bufSize);
 		SHA512_Final(reinterpret_cast<uint8_t*>(md), &ctx_);
 		return SHA512_DIGEST_LENGTH;
+#endif
 	}
 #ifndef CYBOZU_DONT_USE_STRING
 	void update(const std::string& buf)
@@ -104,7 +202,11 @@ public:
 	}
 	std::string digest(const void *buf, size_t bufSize)
 	{
+#if CYBOZU_USE_OPENSSL_NEW_HASH == 1
+		std::string md(ctx_.MD_SIZE, 0);
+#else
 		std::string md(SHA512_DIGEST_LENGTH, 0);
+#endif
 		digest(&md[0], md.size(), buf, bufSize);
 		return md;
 	}

data/vendor/cybozulib/sample/proj/ssl_smpl/ssl_smpl.vcxproj

@@ -1,4 +1,4 @@
-����<?xml version="1.0" encoding="utf-8"?>
+<?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">

data/vendor/cybozulib/sample/proj/stacktrace_smpl/stacktrace_smpl.vcxproj

@@ -1,4 +1,4 @@
-����<?xml version="1.0" encoding="utf-8"?>
+<?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">

data/vendor/cybozulib/test/Makefile

@@ -1,12 +1,12 @@
 
 all:
 	$(MAKE) -C base
-	$(MAKE) -C nlp
+#	$(MAKE) -C nlp
 
 test:
 	$(MAKE) -C base test
-	$(MAKE) -C nlp test
+#	$(MAKE) -C nlp test
 clean:
 	$(MAKE) -C base clean
-	$(MAKE) -C nlp clean
+#	$(MAKE) -C nlp clean
 

data/vendor/cybozulib/test/base/proj/array_test/array_test.vcxproj

@@ -1,4 +1,4 @@
-����<?xml version="1.0" encoding="utf-8"?>
+<?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">

data/vendor/cybozulib/test/base/proj/atoi_test/atoi_test.vcxproj

@@ -1,4 +1,4 @@
-����<?xml version="1.0" encoding="utf-8"?>
+<?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">

data/vendor/cybozulib/test/base/proj/atomic_test/atomic_test.vcxproj

@@ -1,4 +1,4 @@
-����<?xml version="1.0" encoding="utf-8"?>
+<?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">

data/vendor/cybozulib/test/base/proj/base64_test/base64_test.vcxproj

@@ -1,4 +1,4 @@
-����<?xml version="1.0" encoding="utf-8"?>
+<?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">

data/vendor/cybozulib/test/base/proj/condition_variable_cs_test/condition_variable_cs_test.vcxproj

@@ -1,4 +1,4 @@
-����<?xml version="1.0" encoding="utf-8"?>
+<?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">

data/vendor/cybozulib/test/base/proj/condition_variable_test/condition_variable_test.vcxproj

@@ -1,4 +1,4 @@
-����<?xml version="1.0" encoding="utf-8"?>
+<?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">

data/vendor/cybozulib/test/base/proj/config_test/config_test.vcxproj

@@ -1,4 +1,4 @@
-����<?xml version="1.0" encoding="utf-8"?>
+<?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">

data/vendor/cybozulib/test/base/proj/csv_test/csv_test.vcxproj

@@ -1,4 +1,4 @@
-����<?xml version="1.0" encoding="utf-8"?>
+<?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">