no-style-please2-plugins 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb824516aa69202aeb751b710764aea4f7c8e352bfcf94fe7ee426c66f354a45
-  data.tar.gz: dd951357fe4e823aa00456d13814ae8815fbf40026318b0e132554564a28dbfd
+  metadata.gz: 1481f05da7257deb43b4f2d8475d8e708e4bb3d4c31f23ca3f20580ee6ac60cf
+  data.tar.gz: df0238ad5567dc1ce3bb8e242b2258accf3ff65f752c007522dd1dea22f0f75f
 SHA512:
-  metadata.gz: d5ffba3bbbe75ba9dcfb62e15d01ce34ac76ec3d3dcdd554f4244dc93093575c4fbb93e3a67859b00e2ceee476baff27d911fefdf4aedff851d63042287cf3e2
-  data.tar.gz: 58266e9e6dfd9767022640fdc5bad66a5876537e4dcb49c744fff3a09180fba54b02d71a4807841d747f761b75166097da4b83437c19da9fb529592464ca22f3
+  metadata.gz: 3a655d2b12c8c5ccfaedeeebb186b5c41438861c293d2fa3a89dd173e72f6945cf2af2767e8a3be4df5b0cd4ca9ed221559b6c046b7a9720a3bfdf1925b752f6
+  data.tar.gz: cec5db851784412d946b307f55fb374efdaade832752d96dff3027c59298989f9cf0e1e27a1a9e7c0b8130038511669cd09d8abfc98f849e85eec87ec8ac5154

data/Gemfile.lock

@@ -1,7 +1,7 @@
 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)

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,39 @@ 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
 
-      newArr.join('#')  
+      Base64.strict_encode64(newArr.join)
+
     end
-    
+ 
 
     
   end
@@ -202,7 +216,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.0"
 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.0
 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