From d72e7763da7e60d551b3ee585555bfa83e6ddd11 Mon Sep 17 00:00:00 2001 From: tykayn <15d65f2f-0b14-4f70-bf34-e130180ed62b@users.tedomum.net> Date: Wed, 10 Feb 2021 11:23:09 +0100 Subject: [PATCH] add md5 lib to ciphering page --- .../ciphering/ciphering.component.html | 35 +++- .../ciphering/ciphering.component.scss | 8 +- .../ciphering/ciphering.component.ts | 10 +- .../ui/static-pages/ciphering/lib_cipher.ts | 184 ++++++++++++++++++ src/styles/libraries/_overrides.scss | 4 + 5 files changed, 234 insertions(+), 7 deletions(-) create mode 100644 src/app/features/shared/components/ui/static-pages/ciphering/lib_cipher.ts diff --git a/src/app/features/shared/components/ui/static-pages/ciphering/ciphering.component.html b/src/app/features/shared/components/ui/static-pages/ciphering/ciphering.component.html index 7489eef5..bef038ed 100644 --- a/src/app/features/shared/components/ui/static-pages/ciphering/ciphering.component.html +++ b/src/app/features/shared/components/ui/static-pages/ciphering/ciphering.component.html @@ -30,10 +30,39 @@ > {{ simpleCipheredTextWithSalt }} +

On hashe le sel

+
+
+ Pour gagner en aléatoire on peut passer le sel dans une fonction de hashage cryptographique, + telle que MD5 (Message Digest 5). + fonctionnement de MD5 +
+
+ Voici ce que le hashage du sel donne: + + {{ md5(salt) }} + + ({{ md5(salt).length }}caractères) +
+ Le nouveau texte chiffré avec le sel hashé est donc: + + + {{ simpleCipheredTextWithHashedSalt }} + +
+
+

Légèrement épicé

- simple cipher avec un sel avant et un saupoudrage du sel sur chacun des caractères de la phrase. la + simple chiffrement avec un sel avant et un saupoudrage du sel sur chacun des caractères de la phrase. la valeur du caractère est ajoutée à la valeur du caractère du sel correspondant. une fois arrivé à la fin - du sel on reprend au début pour saupoudrer toute la phrase à chiffrer. + du sel on reprend au début pour saupoudrer toute la phrase à chiffrer. Ce qui donne + {{ simpleCipheredTextWithSpreadSalt.split('-').length }} chiffres. On en remet une couche Les nombres que l'on a obtenu peuvent être transmis après une opération de conversion en caractères. On a donc autant de caractères que juste avant. ça ressemble déjà plus à un message pas évident à - déchiffrer. + déchiffrer. Le nouveau texte fait {{ layerOnSpread.length }} caractères. {{ layerOnSpread }} diff --git a/src/app/features/shared/components/ui/static-pages/ciphering/ciphering.component.scss b/src/app/features/shared/components/ui/static-pages/ciphering/ciphering.component.scss index 5c92667c..a9a47b26 100644 --- a/src/app/features/shared/components/ui/static-pages/ciphering/ciphering.component.scss +++ b/src/app/features/shared/components/ui/static-pages/ciphering/ciphering.component.scss @@ -1,7 +1,8 @@ .boxed-shadow { padding: 1em; margin-bottom: 1em; - width: 85%; + max-width: 85%; + display: inline-block; } .cipher-result { @@ -13,11 +14,12 @@ display: block; min-width: 10ch; min-height: 2em; - max-width: 50%; + max-width: 25%; overflow-x: scroll; line-height: 2em; app-copy-text { - float: left; + //float: left; + margin-right: 1em; } } diff --git a/src/app/features/shared/components/ui/static-pages/ciphering/ciphering.component.ts b/src/app/features/shared/components/ui/static-pages/ciphering/ciphering.component.ts index 930fe5ae..4c801907 100644 --- a/src/app/features/shared/components/ui/static-pages/ciphering/ciphering.component.ts +++ b/src/app/features/shared/components/ui/static-pages/ciphering/ciphering.component.ts @@ -1,4 +1,5 @@ import { Component, OnInit } from '@angular/core'; +import CipherLib from './lib_cipher'; // eslint-disable-next-line @typescript-eslint/no-var-requires // documentation: @@ -38,8 +39,11 @@ export class CipheringComponent implements OnInit { get simpleCipheredTextWithSpreadSalt() { return this.convertTextToIntMixedSalt(this.salt + this.plainText); } + get simpleCipheredTextWithHashedSalt() { + return this.convertTextToIntMixedSalt(this.md5(this.salt) + this.plainText); + } get layerOnSpread() { - return this.convertIntToText(this.simpleCipheredTextWithSpreadSalt, false); + return this.convertIntToText(this.simpleCipheredTextWithHashedSalt, false); } // ---------------------- make readable ---------------------- @@ -158,4 +162,8 @@ export class CipheringComponent implements OnInit { // remove salt characters return result.slice(this.salt.length); } + + md5(someText) { + return CipherLib.md5(someText); + } } diff --git a/src/app/features/shared/components/ui/static-pages/ciphering/lib_cipher.ts b/src/app/features/shared/components/ui/static-pages/ciphering/lib_cipher.ts new file mode 100644 index 00000000..4f1c9e5f --- /dev/null +++ b/src/app/features/shared/components/ui/static-pages/ciphering/lib_cipher.ts @@ -0,0 +1,184 @@ +class lib_cipher { + hex_chr = '0123456789abcdef'.split(''); + + md5cycle(x, k) { + let a = x[0], + b = x[1], + c = x[2], + d = x[3]; + + a = this.ff(a, b, c, d, k[0], 7, -680876936); + d = this.ff(d, a, b, c, k[1], 12, -389564586); + c = this.ff(c, d, a, b, k[2], 17, 606105819); + b = this.ff(b, c, d, a, k[3], 22, -1044525330); + a = this.ff(a, b, c, d, k[4], 7, -176418897); + d = this.ff(d, a, b, c, k[5], 12, 1200080426); + c = this.ff(c, d, a, b, k[6], 17, -1473231341); + b = this.ff(b, c, d, a, k[7], 22, -45705983); + a = this.ff(a, b, c, d, k[8], 7, 1770035416); + d = this.ff(d, a, b, c, k[9], 12, -1958414417); + c = this.ff(c, d, a, b, k[10], 17, -42063); + b = this.ff(b, c, d, a, k[11], 22, -1990404162); + a = this.ff(a, b, c, d, k[12], 7, 1804603682); + d = this.ff(d, a, b, c, k[13], 12, -40341101); + c = this.ff(c, d, a, b, k[14], 17, -1502002290); + b = this.ff(b, c, d, a, k[15], 22, 1236535329); + + a = this.gg(a, b, c, d, k[1], 5, -165796510); + d = this.gg(d, a, b, c, k[6], 9, -1069501632); + c = this.gg(c, d, a, b, k[11], 14, 643717713); + b = this.gg(b, c, d, a, k[0], 20, -373897302); + a = this.gg(a, b, c, d, k[5], 5, -701558691); + d = this.gg(d, a, b, c, k[10], 9, 38016083); + c = this.gg(c, d, a, b, k[15], 14, -660478335); + b = this.gg(b, c, d, a, k[4], 20, -405537848); + a = this.gg(a, b, c, d, k[9], 5, 568446438); + d = this.gg(d, a, b, c, k[14], 9, -1019803690); + c = this.gg(c, d, a, b, k[3], 14, -187363961); + b = this.gg(b, c, d, a, k[8], 20, 1163531501); + a = this.gg(a, b, c, d, k[13], 5, -1444681467); + d = this.gg(d, a, b, c, k[2], 9, -51403784); + c = this.gg(c, d, a, b, k[7], 14, 1735328473); + b = this.gg(b, c, d, a, k[12], 20, -1926607734); + + a = this.hh(a, b, c, d, k[5], 4, -378558); + d = this.hh(d, a, b, c, k[8], 11, -2022574463); + c = this.hh(c, d, a, b, k[11], 16, 1839030562); + b = this.hh(b, c, d, a, k[14], 23, -35309556); + a = this.hh(a, b, c, d, k[1], 4, -1530992060); + d = this.hh(d, a, b, c, k[4], 11, 1272893353); + c = this.hh(c, d, a, b, k[7], 16, -155497632); + b = this.hh(b, c, d, a, k[10], 23, -1094730640); + a = this.hh(a, b, c, d, k[13], 4, 681279174); + d = this.hh(d, a, b, c, k[0], 11, -358537222); + c = this.hh(c, d, a, b, k[3], 16, -722521979); + b = this.hh(b, c, d, a, k[6], 23, 76029189); + a = this.hh(a, b, c, d, k[9], 4, -640364487); + d = this.hh(d, a, b, c, k[12], 11, -421815835); + c = this.hh(c, d, a, b, k[15], 16, 530742520); + b = this.hh(b, c, d, a, k[2], 23, -995338651); + + a = this.ii(a, b, c, d, k[0], 6, -198630844); + d = this.ii(d, a, b, c, k[7], 10, 1126891415); + c = this.ii(c, d, a, b, k[14], 15, -1416354905); + b = this.ii(b, c, d, a, k[5], 21, -57434055); + a = this.ii(a, b, c, d, k[12], 6, 1700485571); + d = this.ii(d, a, b, c, k[3], 10, -1894986606); + c = this.ii(c, d, a, b, k[10], 15, -1051523); + b = this.ii(b, c, d, a, k[1], 21, -2054922799); + a = this.ii(a, b, c, d, k[8], 6, 1873313359); + d = this.ii(d, a, b, c, k[15], 10, -30611744); + c = this.ii(c, d, a, b, k[6], 15, -1560198380); + b = this.ii(b, c, d, a, k[13], 21, 1309151649); + a = this.ii(a, b, c, d, k[4], 6, -145523070); + d = this.ii(d, a, b, c, k[11], 10, -1120210379); + c = this.ii(c, d, a, b, k[2], 15, 718787259); + b = this.ii(b, c, d, a, k[9], 21, -343485551); + + x[0] = this.add32(a, x[0]); + x[1] = this.add32(b, x[1]); + x[2] = this.add32(c, x[2]); + x[3] = this.add32(d, x[3]); + } + + cmn(q, a, b, x, s, t) { + a = this.add32(this.add32(a, q), this.add32(x, t)); + return this.add32((a << s) | (a >>> (32 - s)), b); + } + + ff(a, b, c, d, x, s, t) { + return this.cmn((b & c) | (~b & d), a, b, x, s, t); + } + + gg(a, b, c, d, x, s, t) { + return this.cmn((b & d) | (c & ~d), a, b, x, s, t); + } + + hh(a, b, c, d, x, s, t) { + return this.cmn(b ^ c ^ d, a, b, x, s, t); + } + + ii(a, b, c, d, x, s, t) { + return this.cmn(c ^ (b | ~d), a, b, x, s, t); + } + + md51(s) { + // eslint-disable-next-line prefer-const + let n = s.length, + // eslint-disable-next-line prefer-const + state = [1732584193, -271733879, -1732584194, 271733878], + i; + for (i = 64; i <= s.length; i += 64) { + this.md5cycle(state, this.md5blk(s.substring(i - 64, i))); + } + s = s.substring(i - 64); + const tail = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]; + for (i = 0; i < s.length; i++) tail[i >> 2] |= s.charCodeAt(i) << (i % 4 << 3); + tail[i >> 2] |= 0x80 << (i % 4 << 3); + if (i > 55) { + this.md5cycle(state, tail); + for (i = 0; i < 16; i++) tail[i] = 0; + } + tail[14] = n * 8; + this.md5cycle(state, tail); + return state; + } + + /* there needs to be support for Unicode here, + * unless we pretend that we can redefine the MD-5 + * algorithm for multi-byte characters (perhaps + * by adding every four 16-bit characters and + * shortening the sum to 32 bits). Otherwise + * I suggest performing MD-5 as if every character + * was two bytes--e.g., 0040 0025 = @%--but then + * how will an ordinary MD-5 sum be matched? + * There is no way to standardize text to something + * like UTF-8 before transformation; speed cost is + * utterly prohibitive. The JavaScript standard + * itself needs to look at this: it should start + * providing access to strings as preformed UTF-8 + * 8-bit unsigned value arrays. + */ + md5blk(s) { + /* I figured global was faster. */ + + const md5blks = []; /* Andy King said do it this way. */ + for (let i = 0; i < 64; i += 4) { + md5blks[i >> 2] = + s.charCodeAt(i) + + (s.charCodeAt(i + 1) << 8) + + (s.charCodeAt(i + 2) << 16) + + (s.charCodeAt(i + 3) << 24); + } + return md5blks; + } + + rhex(n) { + let s = '', + j = 0; + for (; j < 4; j++) s += this.hex_chr[(n >> (j * 8 + 4)) & 0x0f] + this.hex_chr[(n >> (j * 8)) & 0x0f]; + return s; + } + + hex(x) { + for (let i = 0; i < x.length; i++) x[i] = this.rhex(x[i]); + return x.join(''); + } + + md5(s) { + return this.hex(this.md51(s)); + } + + /* this function is much faster, + so if possible we use it. Some IEs + are the only ones I know of that + need the idiotic second function, + generated by an if clause. */ + + add32(a, b) { + return (a + b) & 0xffffffff; + } +} +const CipherLib = new lib_cipher(); + +export default CipherLib; diff --git a/src/styles/libraries/_overrides.scss b/src/styles/libraries/_overrides.scss index af040a3e..12c528d7 100644 --- a/src/styles/libraries/_overrides.scss +++ b/src/styles/libraries/_overrides.scss @@ -11,3 +11,7 @@ $body-background-color: $black; $control-border-width: 2px; $input-border-color: transparent; $input-shadow: none; + +.notification { + margin: 1em 0; +}