ooxml_crypt 0.1.0 → 0.1.1

data/vendor/cybozulib/test/base/proj/event_test/event_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/file_test/file_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/itoa_test/itoa_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/mecab_test/mecab_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|Win32">

data/vendor/cybozulib/test/base/proj/minixml_test/minixml_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/mmap_test/mmap_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/serializer_test/serializer_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/sha1_test/sha1_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/stream_test/stream_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/string_operation_test/string_operation_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/string_test/string_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/thread_test/thread_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/time_test/time_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/tls_test/tls_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/zlib_test/zlib_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/sha2_test.cpp

@@ -2,7 +2,7 @@
 #include <stdlib.h>
 #include <time.h>
 #include <vector>
-#define CYBOZU_DONT_USE_OPENSSL
+//#define CYBOZU_DONT_USE_OPENSSL
 #include <cybozu/sha2.hpp>
 #include <cybozu/test.hpp>
 #include <cybozu/itoa.hpp>

data/vendor/cybozulib/test/base/zlib_test.cpp

@@ -184,6 +184,7 @@ void compareMap(const Map& x, const Map& y)
 	}
 }
 
+#if 0
 CYBOZU_TEST_AUTO(serializer_with_zlib)
 {
 	typedef std::map<int, double> Map;
@@ -252,6 +253,7 @@ CYBOZU_TEST_AUTO(sparse_with_zlib)
 		CYBOZU_TEST_ASSERT(yi == y.end());
 	}
 }
+#endif
 
 CYBOZU_TEST_AUTO(random)
 {

data/vendor/msoffice/Makefile

@@ -9,7 +9,7 @@ all:
 	$(MAKE) $(MSOC_SLIB)
 
 test:
-	python test_all.py
+	python3 test_all.py
 clean:
 	$(MAKE) -C src clean
 	$(MAKE) -C test clean
@@ -25,5 +25,5 @@ $(MSOC_SLIB): src/$(OBJDIR)/msocdll.o
 	$(CXX) -o $@ $< -shared $(LDFLAGS)
 
 bin/minisample: src/minisample.c include/msoc.h $(MSOC_LIB)
-	$(CC) $< -o $@ $(MSOC_LIB) -lstdc++ -lcrypto -Iinclude -Wall -Wextra -lcrypto
+	$(CC) $< -o $@ $(MSOC_LIB) -lstdc++ -lcrypto -Iinclude -Wall -Wextra
 

data/vendor/msoffice/common.mk

@@ -2,16 +2,21 @@ CP = cp -f
 AR = ar r
 MKDIR=mkdir -p
 RM=rm -fr
-CFLAGS_OPT = -Ofast -fomit-frame-pointer -DNDEBUG -march=native -msse4
+CFLAGS_OPT = -O2 -DNDEBUG
 #CFLAGS_WARN=-Wall -Wextra -Wformat=2 -Wcast-qual -Wcast-align -Wwrite-strings -Wconversion -Wfloat-equal -Wpointer-arith #-Wswitch-enum -Wstrict-aliasing=2
 CFLAGS_WARN=-Wall -Wextra -Wformat=2 -Wcast-qual -Wcast-align -Wwrite-strings -Wfloat-equal -Wpointer-arith #-Wswitch-enum -Wstrict-aliasing=2
-CFLAGS = -g -D_FILE_OFFSET_BITS=64 -msse2 -fno-operator-names
+CFLAGS = -g -D_FILE_OFFSET_BITS=64
 CFLAGS+=$(CFLAGS_WARN)
-LDFLAGS = -lcrypto -lssl
+ifeq ($(OLD_OPENSSL),1)
+CFLAGS+=-DCYBOZU_USE_OPENSSL_NEW_HASH=0
+endif
+
+LDFLAGS = -lcrypto
 UNAME_S=$(shell uname -s)
 ifeq ($(UNAME_S),Darwin)
-  CFLAGS+=-I/usr/local/opt/openssl/include
-  LDFLAGS+=-L/usr/local/opt/openssl/lib
+  EXT_DIR?=/opt/homebrew/
+  CFLAGS+=-I$(EXT_DIR)/include
+  LDFLAGS+=-L$(EXT_DIR)/lib
   LIB_SUF=dylib
 else
   LIB_SUF=so
@@ -32,7 +37,7 @@ else
 endif
 
 TOPDIR:=$(realpath $(dir $(lastword $(MAKEFILE_LIST))))/
-CFLAGS+= -I$(TOPDIR)include -I$(TOPDIR)../cybozulib/include -I$(TOPDIR)../mie/include
+CFLAGS+= -I$(TOPDIR)include -I$(TOPDIR)../cybozulib/include
 LDFLAGS+= -L$(TOPDIR)lib -lcrypto -lpthread
 ifneq ($(UNAME_S),Darwin)
   LDFLAGS+=-lrt

data/vendor/msoffice/common.props

@@ -1,26 +1,26 @@
-<?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" />
-  <PropertyGroup>
-    <OutDir>$(SolutionDir)bin\</OutDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)../xbyak;$(SolutionDir)../cybozulib/include;$(SolutionDir)../cybozulib_ext/openssl/include;$(SolutionDir)../cybozulib_ext/mpir/include;$(SolutionDir)include</AdditionalIncludeDirectories>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeaderFile />
-      <PrecompiledHeaderOutputFile />
-      <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);NOMINMAX</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <AdditionalLibraryDirectories>$(SolutionDir)../cybozulib_ext/mpir/lib;$(SolutionDir)../cybozulib_ext/openssl/lib</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup />
+<?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" />
+  <PropertyGroup>
+    <OutDir>$(SolutionDir)bin\</OutDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(SolutionDir)../xbyak;$(SolutionDir)../cybozulib/include;$(SolutionDir)../cybozulib_ext/openssl/include;$(SolutionDir)../cybozulib_ext/mpir/include;$(SolutionDir)include</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeaderFile />
+      <PrecompiledHeaderOutputFile />
+      <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);NOMINMAX</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>$(SolutionDir)../cybozulib_ext/mpir/lib;$(SolutionDir)../cybozulib_ext/openssl/lib</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup />
 </Project>

data/vendor/msoffice/debug.props

@@ -1,14 +1,14 @@
-<?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" />
-  <PropertyGroup>
-    <TargetName>$(ProjectName)d</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup />
+<?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" />
+  <PropertyGroup>
+    <TargetName>$(ProjectName)d</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup />
 </Project>