pindo 4.7.4 → 4.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df037923380f2b620207356880503d0999f322ff1567b91f851cab7e16a5c3d5
-  data.tar.gz: cfe5b3f9a2968750ed4e78bf0d3127a74bbd20c53a703ae74606394fc0433ab2
+  metadata.gz: e8159df0872fa738e51e47c58871fd774599288933ad5b0abb06a1f75d034576
+  data.tar.gz: 7092870505178a36f55cc54d5eaa8248314a0f5c0af5188f446dab6e42bb65d0
 SHA512:
-  metadata.gz: 4f05b640b14b6f4d7de61e8b359b0350a15b5b48dd63f39ef71e6f8287d62f8350eaac767b5935241af9b8df8d9b2482329b33f31cca4b9911c96114b9f27528
-  data.tar.gz: d2fe50e1eb3cd860248c05e746d307e9a8ca554225f9134788fa7ab3aed3b4f2470a7610bf3048c5f82ff5e2a4930d046cb6ca4888f1b34fcccaf5fcd8b3c0f6
+  metadata.gz: bb1cf7c60caf44e8d92ee0d0cab2118c63fd842c4d0a27a3d4e0a0b33ac03d01a3a4b59b29c7589f30476f957dcd5011c4b0753bb155aa1efe2762fa19730ee3
+  data.tar.gz: b734c08d987650edd74d00b63a1c7bd9eec5dd7ba5ba947691f5a82a539b04e09fb3d96d76d5fde205f6fbca1bab6ec23137afc5503ad0cd42a9d8edc6b0a8d7

data/lib/pindo/base/aeshelper.rb

@@ -1,7 +1,7 @@
 require 'openssl'
 
 module Pindo
- 
+
 
   module AESHelper
 
@@ -17,7 +17,7 @@ module Pindo
 
       unless password
           password = FastlaneCore::Helper.ask_password(message: "请输入证书仓库的加密密码: ", confirm: true)
-          Security::InternetPassword.add(server_name, "", password)     
+          Security::InternetPassword.add(server_name, "", password)
       end
       return password
     end
@@ -54,17 +54,9 @@ module Pindo
     def self.encrypt_specific_file(src_file: nil, password: nil, output_dir: nil)
       UI.user_error!("No password supplied") if password.to_s.strip.length == 0
 
-      data_to_encrypt = File.binread(path)
-      salt = SecureRandom.random_bytes(8)
-
-      # The :: is important, as there is a name clash
-      cipher = ::OpenSSL::Cipher.new('AES-256-CBC')
-      cipher.encrypt
-      cipher.pkcs5_keyivgen(password, salt, 1, "MD5")
-      encrypted_data = "Salted__" + salt + cipher.update(data_to_encrypt) + cipher.final
-
       destfile = File.join(output_dir, File.basename(src_file))
-      File.write(destfile, Base64.encode64(encrypted_data))
+      e = Match::Encryption::MatchFileEncryption.new
+      e.encrypt(file_path: src_file, password: password, output_path:destfile)
       return destfile
     rescue error
       puts path
@@ -74,32 +66,20 @@ module Pindo
     # The encryption parameters in this implementations reflect the old behavior which depended on the users' local OpenSSL version
     # 1.0.x OpenSSL and earlier versions use MD5, 1.1.0c and newer uses SHA256, we try both before giving an error
     def self.decrypt_specific_file(src_file: nil, password: nil, output_dir: nil, hash_algorithm: "MD5")
-      
-      begin 
-        stored_data = Base64.decode64(File.read(src_file))
-        salt = stored_data[8..15]
-        data_to_decrypt = stored_data[16..-1]
 
-        decipher = ::OpenSSL::Cipher.new('AES-256-CBC')
-        decipher.decrypt
-        decipher.pkcs5_keyivgen(password, salt, 1, hash_algorithm)
-
-        decrypted_data = decipher.update(data_to_decrypt) + decipher.final
+      begin
         destfile = File.join(output_dir, File.basename(src_file))
-        File.binwrite(destfile, decrypted_data)
+        e = Match::Encryption::MatchFileEncryption.new
+        e.decrypt(file_path: src_file, password: password, output_path:destfile)
         return destfile
       rescue => error
-        fallback_hash_algorithm = "SHA256"
-        if hash_algorithm != fallback_hash_algorithm
-          decrypt_specific_file(src_file: src_file, password: password, hash_algorithm: fallback_hash_algorithm)
-        else
           Funlog.instance.fancyinfo_error("解析文件失败: #{src_file}")
+          raise Informative, error
           return nil
-        end
       end
     end
 
-  end
 
 
+  end
 end

data/lib/pindo/version.rb

@@ -1,13 +1,13 @@
 module Pindo
 
-  	VERSION = "4.7.4"
+  	VERSION = "4.7.5"
 
   	class VersionCheck
 
 		def self.check_pindo_new_version
 
-			puts
-			puts "pindo #{Pindo::VERSION}"
+			# puts
+			# puts "pindo #{Pindo::VERSION}"
 
 			begin
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pindo
 version: !ruby/object:Gem::Version
-  version: 4.7.4
+  version: 4.7.5
 platform: ruby
 authors:
 - wade
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-04 00:00:00.000000000 Z
+date: 2024-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide