no-style-please2-plugins 0.8.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb824516aa69202aeb751b710764aea4f7c8e352bfcf94fe7ee426c66f354a45
-  data.tar.gz: dd951357fe4e823aa00456d13814ae8815fbf40026318b0e132554564a28dbfd
+  metadata.gz: e4446905faa51bb7713c567160bd2461951a5ec5443ea219b5485efdc8ecbf2f
+  data.tar.gz: 900dfe6baaefc8bc5e13c8f6fba766ff856e845f753c7cf117e8daac2037e562
 SHA512:
-  metadata.gz: d5ffba3bbbe75ba9dcfb62e15d01ce34ac76ec3d3dcdd554f4244dc93093575c4fbb93e3a67859b00e2ceee476baff27d911fefdf4aedff851d63042287cf3e2
-  data.tar.gz: 58266e9e6dfd9767022640fdc5bad66a5876537e4dcb49c744fff3a09180fba54b02d71a4807841d747f761b75166097da4b83437c19da9fb529592464ca22f3
+  metadata.gz: fa92049758036c9a4256f13af7d10018a52c06f02cc4e473093aabc03c442d5c6c70f43883b90ee6e1308773f24242b4742ba918fe0729b84e89c2bb10908a22
+  data.tar.gz: f19c43180d4a043c9cb414aef28edc9900f682b81cc4d1419c77c3dc58c2acebd20cb6ffa878b51cda86936ca5cd1662871e288621e983b807bc179ce281f73e

data/Gemfile.lock

@@ -1,28 +1,27 @@
 PATH
   remote: .
   specs:
-    no-style-please2-plugins (0.7.4)
+    no-style-please2-plugins (0.9.0)
       digest
       jekyll (~> 4.0)
-      ltec (~> 0.1.2)
+      ltec (~> 0.1.4)
 
 GEM
   remote: https://rubygems.org/
   specs:
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
-    base64 (0.1.2)
-    bigdecimal (3.1.8)
+    bigdecimal (3.1.9)
     colorator (1.1.0)
-    concurrent-ruby (1.3.4)
+    concurrent-ruby (1.3.5)
     digest (3.1.1)
     em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0)
     eventmachine (1.2.7)
-    ffi (1.17.0-arm64-darwin)
+    ffi (1.17.1-arm64-darwin)
     forwardable-extended (2.6.0)
-    google-protobuf (4.29.1-arm64-darwin)
+    google-protobuf (4.29.3-arm64-darwin)
       bigdecimal
       rake (>= 13)
     http_parser.rb (0.8.0)
@@ -56,8 +55,7 @@ GEM
     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    ltec (0.1.3.1)
-      base64 (~> 0.1.0)
+    ltec (0.1.4)
       openssl
     mercenary (0.4.0)
     openssl (3.3.0)
@@ -71,8 +69,8 @@ GEM
     rexml (3.4.0)
     rouge (4.5.1)
     safe_yaml (1.0.5)
-    sass-embedded (1.82.0-arm64-darwin)
-      google-protobuf (~> 4.28)
+    sass-embedded (1.83.4-arm64-darwin)
+      google-protobuf (~> 4.29)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
     unicode-display_width (2.6.0)

data/lib/enc.rb

@@ -94,6 +94,11 @@ module Jekyll
       return   "#{key}"
     end
   end
+  # 大端模式
+  def self.nmberToBinary4(num)
+    [num].pack("N")[0, 4]
+  end
+
   module EncFilter
 
 
@@ -102,7 +107,7 @@ module Jekyll
       str.unpack('C*').map{ |b| "%02x" % b }.join('')
     end
   
-    def hex2bin(str)
+    def self.hex2bin(str)
       [str].pack "H*"
     end
     def genKey(password)
@@ -171,30 +176,38 @@ module Jekyll
       return bin2hex(OpenSSL::Random.random_bytes(n2))
     end
 
+    
     def encrypt_content_v2(content,pswHex)
       if !pswHex || pswHex.length != 64
         raise "invalid Key:" + pswHex
       end
-      cipher = OpenSSL::Cipher::AES.new(256, :CBC).encrypt
+      cipher = OpenSSL::Cipher::AES.new(256, :CTR).encrypt
       iv = cipher.random_iv
       cipher.iv = iv
-      cipher.key = hex2bin(pswHex)
+      cipher.key = EncFilter.hex2bin(pswHex)
       encrypted = cipher.update(content) + cipher.final
-      return  'E2.' + Base64.strict_encode64(iv  + encrypted )
-    end
 
+      
+      len = 4 +  iv.length + encrypted.length
+      lenBf = Jekyll.nmberToBinary4(len)
+      lenBf2 = lenBf.bytes.map.each_with_index do |v,i|
+        z = i ^ iv.bytes[i ]
+        v ^ z
+      end.pack('C*')
+      return   Base64.strict_encode64(lenBf2 + iv  + encrypted )
+    end
 
     def encrypt_key(x,page,keyHex2Enc,encid)
       arr = EncFilterTool.getAllKey(page)
       newArr = arr.map do |k| 
         key = genKey  encid + k + encid
         hexKey = bin2hex key
-        encrypt_content_v2(hex2bin(keyHex2Enc),hexKey)
+        Base64.strict_decode64(encrypt_content_v2(EncFilter.hex2bin(keyHex2Enc),hexKey))
       end
+      Base64.strict_encode64(newArr.join)
 
-      newArr.join('#')  
     end
-    
+ 
 
     
   end
@@ -202,7 +215,9 @@ module Jekyll
 
 Liquid::Template.register_filter(Jekyll::EncFilter)
 
-
+class Test
+  extend EncFilter
+end
 
 
 

data/lib/version/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module NoStylePlease2
-  VERSION = "0.8.0"
+  VERSION = "0.9.1"
 end

data/test.rb

@@ -2,6 +2,7 @@
 
 require 'openssl'
 require 'base64'
+require_relative "lib/enc"
 $Key = {}
 def genKey(password)
     cache = $Key[password]
@@ -51,6 +52,8 @@ def decrypt(enstring,password)
 end 
 
 
+
+
 msg = '我的 12a23007'
 z = encrypt msg,'123'
 puts z 
@@ -64,4 +67,13 @@ genKey '123'
 genKey '123'
 genKey '123'
 genKey '456'
-puts $Key
+ 
+puts '---'
+a = Jekyll::nmberToBinary4(256)
+puts a.unpack1('H*')
+a = a.bytes.map.each_with_index do |byte,i | byte ^ i 
+end.pack('C*')
+ 
+puts a.unpack1('H*') 
+
+puts Jekyll::Test.encrypt_content_v2('333333a','00000000000000052f5c9b07ebc4464717978b174c440573df03e2962d98946c')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: no-style-please2-plugins
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.1
 platform: ruby
 authors:
 - vitock
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2025-01-14 00:00:00.000000000 Z
+date: 2025-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.1.4
 - !ruby/object:Gem::Dependency
   name: digest
   requirement: !ruby/object:Gem::Requirement