no-style-please2 0.7.5 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2474095f91956917b41fcc10d0147da50a80547ef3e4c87df38a35be68df4f3
-  data.tar.gz: d94c224978d92b368033cdd60433c54859ab9783831f2cc1f485a518c62a8b59
+  metadata.gz: 2c0380a5261d5da61615ac60d982f565abd4c29aea473be81123ded47c65da1a
+  data.tar.gz: c3581628085f7d9ac0d0b2d5399baa0d61da96c4fbf405986b75928aaffe0715
 SHA512:
-  metadata.gz: 8e3a656dd5634e6fdce8ba2eac363bc6121cf9c910de43ec5483e86b57f227f68aada871e3074f9826e7b3c3c16ce93a1ff87b7dfffd70879d82581d0c10b158
-  data.tar.gz: e5c2df4754b05e29386783db23592bc7211e91c69d54d969545244a27daf905e369d7aa960e242d9fb7a61ef33e8d33ce2f5ced53522f2396eaf1f840bad7244
+  metadata.gz: bcc8f939c61568ae7a261f1e6d5f1cdd080dd28a786106acb0f462630a9960ab06c5661522efc7c40691e775f72265a4044fb81d8f6baeb1daf4123e1c62a1e4
+  data.tar.gz: 9c980dcd91f580f2f7dbd4b11c51cab945efc86c67a9caf5451d08d3bc51d7f3af83596639580631e65bdf1d5c24f4a53c2938137696e308e9c93f31527ff624

data/_config.yml

@@ -49,7 +49,7 @@ enc_tags:
     - tag: ZZ
       password: '1'
     - tag: encrypt1
-      password: "123"  # plain text ,not recommed
+      password: "12345"  # plain text ,not recommed
 
       # do Not write you public or privatekey in your repo,
       # use ltectool g to generate a new one for your own blog

data/_includes/encrypted.html

@@ -21,47 +21,59 @@
         <div id = 'decryptContent'>
         </div>
     </div>
-    <script src="//cdn.jsdelivr.net/gh/vitock/jsdelivr@0.1.1/js/salsa20.min.js"></script>
-    <script src="//cdn.jsdelivr.net/gh/vitock/jsdelivr@0.1.1/js/base64.js"></script>
-    <script src="//cdn.jsdelivr.net/gh/vitock/jsdelivr@0.1.1/js/md5.js"></script>
+    <script>
+        var exports = exports || {} 
+    </script>
+    <script src="//cdn.jsdelivr.net/gh/vitock/jsdelivr@0.1.2/js/base64js.js"></script>
     <script>
         !function(){
-        const preFix = '{{encid}}';
-        const encid = preFix
-        var encryptedContent = '{{ content | encrypt_content:page, encid}}'
-        const nonceStr = encryptedContent.substring(0,16);
-        const msg = encryptedContent.substring(17)
-    
-        function hexToUint8Arr(hexString){
-            return new Uint8Array(hexString.match(/.{1,2}/g).map(byte => parseInt(byte, 16)));
-        }
+
+            const substl = crypto.subtle
+            const preFix = '{{encid}}';
+            const encid = preFix
+            const encryptedContent = '{{ content | encrypt_content:page, encid}}'
+            const base64str = encryptedContent.substring(3)
+            const bfMsg = base64js.decode(base64str)
+            const bfIv = bfMsg.subarray(0,12)
+            const bfCipher = bfMsg.subarray(12)
+            
+            async function genKey(psw){
+                var keyRaw = new TextEncoder().encode(psw)
+                var key = await substl.importKey('raw',keyRaw,'PBKDF2',false,["deriveBits"])
+                const salt = 'this is a salt string 20221019'
+                let pbkdf2  = {
+                    name:"PBKDF2",hash: "SHA-256",iterations: 12345,salt: new TextEncoder().encode(salt)
+                }
+                return  await substl.deriveBits(pbkdf2,key,256);
+            }
 
 
-        function decrypt (key0,isCached){
+ 
+        async function decrypt (key0,isCached){
             // const key = Uint8Array([...]); // 32 bytes key
             
             var key  = ''
-            var keyDgst = ""
             if(isCached){
-                keyDgst= key0
-                key = new TextEncoder("utf-8").encode(keyDgst);
+                key = readKey()
             }
             else{
                 var keyS = preFix + key0 +  preFix
-                keyDgst = md5(keyS)
-                key = new TextEncoder("utf-8").encode(keyDgst);
+                key = await genKey(keyS)
             }
-            var nonce = hexToUint8Arr(nonceStr)
-    
-            
-            const message = Base64.toUint8Array(msg)
-            // Encrypt //
-            const decrypt = new JSSalsa20(key, nonce).decrypt(message);
-            var plain = new TextDecoder("utf-8").decode(decrypt)
-            var check = md5(plain)
-            if(check.indexOf(nonceStr) == 0){
-                setKey(keyDgst)
-                /// hide input
+            if (key.length == 0) {
+                return
+            }
+
+            var aeskey = {
+                name:"AES-GCM",
+                length:256
+            }
+            var keyObj = await substl.importKey('raw',key,aeskey,false,['decrypt'])
+            var aesDec= {name: "AES-GCM",iv:bfIv,tagLength:128}
+            try {
+                var bfDec  = await substl.decrypt(aesDec,keyObj,bfCipher)
+                var plain = new TextDecoder().decode(bfDec);
+                setKey(key)
                 document.getElementById("encrypted").style.display = 'none'
                 // / show decrypted 
     
@@ -77,13 +89,11 @@
     
                     window.dispatchEvent(loadevent)
                     window.dispatchEvent(DOMContentLoaded_event)
-                    console.log('333a334a')
     
                 }, 500);
-                
-            }else{
+            } catch (error) {
                 alert("wrong password.")
-            }   
+            }
         }
         
         document.getElementById("DecryptBtn").onclick = function(){
@@ -130,11 +140,18 @@
         {% else %}
             function readKey(){
                 var key = encid;
-                return localStorage.getItem(key)
+                var v = localStorage.getItem(key)
+                if (v) {
+                    return base64js.decode(v)
+                }else{
+                    return null
+                }
             }
             function setKey(value){
                 var key = encid
-                return localStorage.setItem(key,value)
+                var arr = new Uint8Array(value)
+                var b64 = base64js.encode(arr)
+                return localStorage.setItem(key,b64)
             }
             function clearKey() {
                 var key = encid
@@ -148,7 +165,7 @@
         {% endif %}
         
         
-    
+ 
     }()
     
     </script>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: no-style-please2
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.8.0
 platform: ruby
 authors:
 - vitock
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-21 00:00:00.000000000 Z
+date: 2022-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.0
 description:
 email:
 - r