ooxml_crypt 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb0f8f97c5ec68a5de68c8dbc7f7053cf4b9a05be3a40e566a0b55869011be8f
-  data.tar.gz: 8b83471bde9d88fdbc97fb4caa9bf6fa3e83a705f0f9ca7cbe43e09d69a6b978
+  metadata.gz: 3056f9d372b1df8ced53564a188890bebfde35d3a02776c009fbd577db36ed06
+  data.tar.gz: afcbc71db47b75a863ffc2bd6ce84b3350b006c1996ce2abd812b45614e731fe
 SHA512:
-  metadata.gz: 57d7880b74d24ca8d1471416f45b3deca40b2b513b0dc0ca7891064daddbbb1fe1d48dac7837d22af4c27c00bc956f7d4c2d5ea7d533f73a1f083d7d11c0eac4
-  data.tar.gz: 61618d149390ce0c83e8d3b65adb45e88644733e9e6eb2bee6e168a2b2a5fccf608d917b48b0dedc839f7e29ab2f95ebe739c1de8025c9e9774930bce6bb228c
+  metadata.gz: e4123c5016a908520e1a0dcd61614b26c81abfd1c467b61486c47ef47d44a92408339114db6eeedda2a962f46d369e4405e8d6a1e872029f872783e9827d905e
+  data.tar.gz: b2c0cfa98d5cf4b8e472957735dfa9010bc72df5f708b686ec8aa0831f18540423a468ce078bb801d4117b665fc119d39facb5ebb5d121dc81fad50cd42c5461

data/Rakefile

@@ -6,6 +6,7 @@ require "rake/extensiontask"
 task build: :compile
 
 Rake::ExtensionTask.new("ooxml_crypt") do |ext|
+  ext.name    = "native"
   ext.lib_dir = "lib/ooxml_crypt"
 end
 

data/ext/ooxml_crypt/extconf.rb

@@ -6,13 +6,15 @@ require "mkmf"
 have_library("stdc++")
 
 # check for OpenSSL
-abort("Please install OpenSSL development libraries!") unless have_header("openssl/hmac.h") && have_library("crypto")
+openssl_present = pkg_config("openssl") || (have_header("openssl/hmac.h") && have_library("crypto"))
+abort("Please install OpenSSL development libraries!") unless openssl_present
 
 # 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"]
 
 # create makefile
-create_makefile("ooxml_crypt/ooxml_crypt")
+create_makefile("ooxml_crypt/native")

data/ext/ooxml_crypt/ooxml_crypt.c

@@ -18,9 +18,10 @@ VALUE rb_decrypt_file(VALUE self, VALUE inFile, VALUE password, VALUE outFile)
   return INT2FIX(MSOC_decryptA(out, in, pass, NULL));
 }
 
-void Init_ooxml_crypt(void)
+void Init_native(void)
 {
-  VALUE mod = rb_define_module("OoxmlCryptNative");
+  VALUE parent = rb_define_module("OoxmlCrypt");
+  VALUE mod = rb_define_module_under(parent, "Native");
 
   rb_define_module_function(mod, "encrypt_file", rb_encrypt_file, 3);
   rb_define_module_function(mod, "decrypt_file", rb_decrypt_file, 3);

data/lib/ooxml_crypt/version.rb

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

data/lib/ooxml_crypt.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 require_relative "ooxml_crypt/version"
-require_relative "ooxml_crypt/ooxml_crypt"
 
 require "tempfile"
+require "ooxml_crypt/native"
 
 module OoxmlCrypt
   class Error < StandardError; end
@@ -29,7 +29,7 @@ module OoxmlCrypt
     raise EmptyPassword if password.nil? || password.empty?
     raise FileNotFound, input unless File.exist?(input)
 
-    result = OoxmlCryptNative.encrypt_file(input, password, output)
+    result = Native.encrypt_file(input, password, output)
     raise Error, ERRORS[-result] if result != 0
   end
 
@@ -37,7 +37,7 @@ module OoxmlCrypt
     raise EmptyPassword if password.nil? || password.empty?
     raise FileNotFound, input unless File.exist?(input)
 
-    result = OoxmlCryptNative.decrypt_file(input, password, output)
+    result = Native.decrypt_file(input, password, output)
     raise Error, ERRORS[-result] if result != 0
   end
 
@@ -56,6 +56,7 @@ module OoxmlCrypt
   private
 
   def self.with_temp_files(data)
+    input = output = nil
     input = Tempfile.new("ooxml_crypt_input", binmode: true)
     input.write(data)
     input.close
@@ -65,11 +66,9 @@ module OoxmlCrypt
 
     yield input.path, output.path
 
-    result = File.binread(output.path)
-
-    input.unlink
-    output.unlink
-
-    result
+    File.binread(output.path)
+  ensure
+    input&.unlink
+    output&.unlink
   end
 end

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

@@ -29,8 +29,10 @@
 		#endif
 	#endif
 #else
+#ifndef MCL_STANDALONE
 	#include <unistd.h> // for ssize_t
 #endif
+#endif
 
 #ifndef CYBOZU_ALIGN
 	#ifdef _MSC_VER
@@ -60,6 +62,7 @@
 	#else
 		#define CYBOZU_ALLOCA(x) __builtin_alloca(x)
 	#endif
+	#define CYBOZU_ALIGNED_ALLOCA(x, align) (void*)(size_t(CYBOZU_ALLOCA((x)+(align)-1)) & ~(size_t(align)-1))
 #endif
 #ifndef CYBOZU_NUM_OF_ARRAY
 	#define CYBOZU_NUM_OF_ARRAY(x) (sizeof(x) / sizeof(*x))

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

@@ -45,6 +45,14 @@ void reserve_if_exists(T& t, size_t size)
 	dispatch_reserve(t, size, 0);
 }
 
+// detect whether T::iterator exists
+template <typename T>
+struct has_iterator {
+    template <typename U> static char test(typename U::iterator*);
+    template <typename U> static int test(...);
+    static const bool value = sizeof(test<T>(0)) == 1;
+};
+
 } // serializer_local
 
 template<class InputStream, class T>
@@ -257,10 +265,11 @@ void save(OutputStream& os, const char *x)
 
 // for vector, list
 template<class InputStream, class T, class Alloc, template<class T_, class Alloc_>class Container>
-void load(Container<T, Alloc>& x, InputStream& is)
+void load(Container<T, Alloc>& x, InputStream& is, typename stream_local::enable_if<serializer_local::has_iterator<Container<T, Alloc> >::value>::type* = 0)
 {
 	size_t size;
 	load(size, is);
+	x.clear();
 	serializer_local::reserve_if_exists(x, size);
 	for (size_t i = 0; i < size; i++) {
 		x.push_back(T());
@@ -270,7 +279,7 @@ void load(Container<T, Alloc>& x, InputStream& is)
 }
 
 template<class OutputStream, class T, class Alloc, template<class T_, class Alloc_>class Container>
-void save(OutputStream& os, const Container<T, Alloc>& x)
+void save(OutputStream& os, const Container<T, Alloc>& x, typename stream_local::enable_if<serializer_local::has_iterator<Container<T, Alloc> >::value>::type* = 0)
 {
 	typedef Container<T, Alloc> V;
 	save(os, x.size());
@@ -281,7 +290,7 @@ void save(OutputStream& os, const Container<T, Alloc>& x)
 
 // for set
 template<class InputStream, class K, class Pred, class Alloc, template<class K_, class Pred_, class Alloc_>class Container>
-void load(Container<K, Pred, Alloc>& x, InputStream& is)
+void load(Container<K, Pred, Alloc>& x, InputStream& is, typename stream_local::enable_if<serializer_local::has_iterator<Container<K, Pred, Alloc> >::value>::type* = 0)
 {
 	size_t size;
 	load(size, is);
@@ -293,7 +302,7 @@ void load(Container<K, Pred, Alloc>& x, InputStream& is)
 }
 
 template<class OutputStream, class K, class Pred, class Alloc, template<class K_, class Pred_, class Alloc_>class Container>
-void save(OutputStream& os, const Container<K, Pred, Alloc>& x)
+void save(OutputStream& os, const Container<K, Pred, Alloc>& x, typename stream_local::enable_if<serializer_local::has_iterator<Container<K, Pred, Alloc> >::value>::type* = 0)
 {
 	typedef Container<K, Pred, Alloc> Set;
 	save(os, x.size());
@@ -304,7 +313,7 @@ void save(OutputStream& os, const Container<K, Pred, Alloc>& x)
 
 // for map
 template<class InputStream, class K, class V, class Pred, class Alloc, template<class K_, class V_, class Pred_, class Alloc_>class Container>
-void load(Container<K, V, Pred, Alloc>& x, InputStream& is)
+void load(Container<K, V, Pred, Alloc>& x, InputStream& is, typename stream_local::enable_if<serializer_local::has_iterator<Container<K, V, Pred, Alloc> >::value>::type* = 0)
 {
 	typedef Container<K, V, Pred, Alloc> Map;
 	size_t size;
@@ -318,7 +327,7 @@ void load(Container<K, V, Pred, Alloc>& x, InputStream& is)
 }
 
 template<class OutputStream, class K, class V, class Pred, class Alloc, template<class K_, class V_, class Pred_, class Alloc_>class Container>
-void save(OutputStream& os, const Container<K, V, Pred, Alloc>& x)
+void save(OutputStream& os, const Container<K, V, Pred, Alloc>& x, typename stream_local::enable_if<serializer_local::has_iterator<Container<K, V, Pred, Alloc> >::value>::type* = 0)
 {
 	typedef Container<K, V, Pred, Alloc> Map;
 	save(os, x.size());
@@ -330,7 +339,7 @@ void save(OutputStream& os, const Container<K, V, Pred, Alloc>& x)
 
 // unordered_map
 template<class InputStream, class K, class V, class Hash, class Pred, class Alloc, template<class K_, class V_, class Hash_, class Pred_, class Alloc_>class Container>
-void load(Container<K, V, Hash, Pred, Alloc>& x, InputStream& is)
+void load(Container<K, V, Hash, Pred, Alloc>& x, InputStream& is, typename stream_local::enable_if<serializer_local::has_iterator<Container<K, V, Hash, Pred, Alloc> >::value>::type* = 0)
 {
 	typedef Container<K, V, Hash, Pred, Alloc> Map;
 	size_t size;
@@ -346,7 +355,7 @@ void load(Container<K, V, Hash, Pred, Alloc>& x, InputStream& is)
 }
 
 template<class OutputStream, class K, class V, class Hash, class Pred, class Alloc, template<class K_, class V_, class Hash_, class Pred_, class Alloc_>class Container>
-void save(OutputStream& os, const Container<K, V, Hash, Pred, Alloc>& x)
+void save(OutputStream& os, const Container<K, V, Hash, Pred, Alloc>& x, typename stream_local::enable_if<serializer_local::has_iterator<Container<K, V, Hash, Pred, Alloc> >::value>::type* = 0)
 {
 	typedef Container<K, V, Hash, Pred, Alloc> Map;
 	save(os, x.size());

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

@@ -56,7 +56,7 @@ struct NewHash {
 		, md_(EVP_get_digestbyname(name))
 	{
 		if (md_ == 0) {
-			fprintf(stderr, "fatail error NewHash %s\n", name);
+			fprintf(stderr, "fatal error NewHash %s\n", name);
 		}
 		assert(md_);
 	}

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

@@ -1708,7 +1708,9 @@ void save(OutputStream& os, const cybozu::String& str)
 namespace boost {
 
 template<>
-struct hash<cybozu::String> : public std::unary_function<cybozu::String, size_t> {
+struct hash<cybozu::String> {
+	typedef cybozu::String argument_type;
+	typedef size_t result_type;
 	size_t operator()(const cybozu::String& str) const
 	{
 		return static_cast<size_t>(cybozu::hash64(str.c_str(), str.size()));
@@ -1726,7 +1728,9 @@ CYBOZU_NAMESPACE_TR1_BEGIN
 #endif
 
 template<>
-struct hash<cybozu::String> : public std::unary_function<cybozu::String, size_t> {
+struct hash<cybozu::String> {
+	typedef cybozu::String argument_type;
+	typedef size_t result_type;
 	size_t operator()(const cybozu::String& str) const
 	{
 		return static_cast<size_t>(cybozu::hash64(str.c_str(), str.size()));

data/vendor/msoffice/include/decode.hpp

@@ -113,7 +113,6 @@ inline bool getAgileSecretKey(std::string& secretKey, const EncryptionInfo& info
 inline bool decodeAgile(std::string& decData, const std::string& encryptedPackage, const EncryptionInfo& info, const std::string& pass, std::string& secretKey)
 {
 	const CipherParam& keyData = info.keyData;
-	const CipherParam& encryptedKey = info.encryptedKey;
 	if (secretKey.empty()) {
 		if (!getAgileSecretKey(secretKey, info, pass)) return false;
 		if (putSecretKeyInstance()) {
@@ -130,8 +129,8 @@ inline bool decodeAgile(std::string& decData, const std::string& encryptedPackag
 	const uint64_t decodeSize = GetEncodedData(encData, encryptedPackage);
 
 	// decode
-	normalizeKey(secretKey, encryptedKey.keyBits / 8);
-	DecContent(decData, encData, encryptedKey, secretKey, keyData.saltValue);
+	normalizeKey(secretKey, keyData.keyBits / 8);
+	DecContent(decData, encData, keyData, secretKey, keyData.saltValue);
 	decData.resize(size_t(decodeSize));
 	return true;
 }

data/vendor/msoffice/readme.md

@@ -17,6 +17,8 @@ Linux
     cd msoffice
     make -j RELEASE=1
 ```
+If you use an old OpenSSL library, then `make OLD_OPENSSL=1`.
+
 Windows
 ```
     mkdir work

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ooxml_crypt
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Ashish Kulkarni
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-02 00:00:00.000000000 Z
+date: 2024-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -274,12 +274,7 @@ files:
 - vendor/cybozulib/tool/vcproj_tmpl.py
 - vendor/msoffice/COPYRIGHT
 - vendor/msoffice/Makefile
-- vendor/msoffice/bin/64/msoc.dll
-- vendor/msoffice/bin/64/msocsample.exe
-- vendor/msoffice/bin/64/msoffice-crypt.exe
-- vendor/msoffice/bin/msoc.dll
-- vendor/msoffice/bin/msocsample.exe
-- vendor/msoffice/bin/msoffice-crypt.exe
+- vendor/msoffice/bin/.emptydir
 - vendor/msoffice/common.mk
 - vendor/msoffice/common.props
 - vendor/msoffice/debug.props
@@ -328,6 +323,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/teamsimplepay/ooxml_crypt
   source_code_uri: https://github.com/teamsimplepay/ooxml_crypt
+  msys2_mingw_dependencies: openssl
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -343,7 +339,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.15
+rubygems_version: 3.4.20
 signing_key:
 specification_version: 4
 summary: Library for encrypting/decrypting password-protected Microsoft Office XML