diff --git a/.eslintrc b/.eslintrc index e794fc75..1c90b8e6 100644 --- a/.eslintrc +++ b/.eslintrc @@ -13,7 +13,6 @@ env: node: true globals: - sjcl: false DOMPurify: false after: true before: true diff --git a/.jshintrc b/.jshintrc index fabd7e6d..5cf3fbd6 100644 --- a/.jshintrc +++ b/.jshintrc @@ -2,7 +2,7 @@ "bitwise": true, "curly": true, "eqeqeq": true, - "esversion": 5, + "esversion": 6, "forin": true, "freeze": true, "futurehostile": true, @@ -39,7 +39,6 @@ "window": true }, "globals": { - "sjcl": true, "DOMPurify": true, "kjua": true } diff --git a/js/privatebin.js b/js/privatebin.js index 86a83d90..c22c8c2c 100644 --- a/js/privatebin.js +++ b/js/privatebin.js @@ -736,7 +736,7 @@ jQuery.PrivateBin = (function($, RawDeflate) { {name: 'PBKDF2'}, // we use PBKDF2 for key derivation false, // the key may not be exported ['deriveKey'] // we may only use it for key derivation - ) + ); // derive a stronger key for use with AES const derivedKey = await window.crypto.subtle.deriveKey( @@ -754,7 +754,7 @@ jQuery.PrivateBin = (function($, RawDeflate) { }, false, // the key may not be exported ['encrypt'] // we may only use it for decryption - ) + ); // finally, encrypt message const encrypted = await window.crypto.subtle.encrypt( @@ -767,7 +767,7 @@ jQuery.PrivateBin = (function($, RawDeflate) { }, derivedKey, StrToArr(compress(message)) // compressed plain text to encrypt - ) + ); object.ct = btoa(ArrToStr(encrypted)); return JSON.stringify(object); }; @@ -821,7 +821,7 @@ jQuery.PrivateBin = (function($, RawDeflate) { }, false, // the key may not be exported ['decrypt'] // we may only use it for decryption - ) + ); // finally, decrypt message const decrypted = await window.crypto.subtle.decrypt( @@ -834,7 +834,7 @@ jQuery.PrivateBin = (function($, RawDeflate) { }, derivedKey, StrToArr(atob(object.ct)) // cipher text to decrypt - ) + ); return decompress(ArrToStr(decrypted)); } catch(err) { return ''; diff --git a/tpl/bootstrap.php b/tpl/bootstrap.php index 6f301dc6..21b0a8ec 100644 --- a/tpl/bootstrap.php +++ b/tpl/bootstrap.php @@ -70,7 +70,7 @@ if ($MARKDOWN): endif; ?> - + diff --git a/tpl/page.php b/tpl/page.php index df8673a1..e78856a8 100644 --- a/tpl/page.php +++ b/tpl/page.php @@ -48,7 +48,7 @@ if ($MARKDOWN): endif; ?> - +