From 7a0343007da03a6256f844095bef84af330072e6 Mon Sep 17 00:00:00 2001
From: ja <ja@verag.ag>
Date: Mon, 10 Jan 2022 08:40:21 +0100
Subject: [PATCH] =?UTF-8?q?Optimierte=20Hashgenerierungswerte=20f=C3=BCr?=
 =?UTF-8?q?=20mehr=20Sicherheit=20bei=20ausgewogener=20Geschwindigkeit=20b?=
 =?UTF-8?q?eim=20Berechnen.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App_Code/VERAG_VARIABLES.vb       |   8 ++++----
 Berechnung Memorysize argon2.xlsx | Bin 9118 -> 9127 bytes
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/App_Code/VERAG_VARIABLES.vb b/App_Code/VERAG_VARIABLES.vb
index f56cfb2..c73c4d9 100644
--- a/App_Code/VERAG_VARIABLES.vb
+++ b/App_Code/VERAG_VARIABLES.vb
@@ -38,7 +38,7 @@ Public Class VERAG_VARIABLES
             Argon.Salt = salt
             Argon.DegreeOfParallelism = 24
             Argon.Iterations = nIterations * 2
-            Argon.MemorySize = (((nIterations * 4.98 - (nIterations * 1.23) / 4 * 1.5) / 1.05) + 1 * 290)
+            Argon.MemorySize = (((nIterations * 7.98 - (nIterations * 0.23) / 4 * 2) / 4.05) + 1 * 290)
 
             Return Argon.GetBytes(nHash)
         Else
@@ -46,7 +46,7 @@ Public Class VERAG_VARIABLES
             Argon.Salt = salt
             Argon.DegreeOfParallelism = 28
             Argon.Iterations = nIterations * VERAG_VARIABLES.RandomInteger(2, 5)
-            Argon.MemorySize = (((nIterations * 6.685 - (nIterations * 0.56) / 1.85 * 2.28) / 8.28) + 1.024 * 416)
+            Argon.MemorySize = (((nIterations * 8.685 - (nIterations * 0.56) / 1.85 * 2.28) / 10.28) + 1.024 * 816)
             Return Argon.GetBytes(nHash)
         End If
 
@@ -59,7 +59,7 @@ Public Class VERAG_VARIABLES
             Argon.Salt = salt
             Argon.DegreeOfParallelism = 24
             Argon.Iterations = nIterations * 2
-            Argon.MemorySize = (((nIterations * 4.98 - (nIterations * 1.23) / 4 * 1.5) / 1.05) + 1 * 290)
+            Argon.MemorySize = (((nIterations * 7.98 - (nIterations * 0.23) / 4 * 2) / 4.05) + 1 * 290)
 
             Return Await Argon.GetBytesAsync(nHash)
         Else
@@ -67,7 +67,7 @@ Public Class VERAG_VARIABLES
             Argon.Salt = salt
             Argon.DegreeOfParallelism = 28
             Argon.Iterations = nIterations * VERAG_VARIABLES.RandomInteger(2, 5)
-            Argon.MemorySize = (((nIterations * 6.685 - (nIterations * 0.56) / 1.85 * 2.28) / 8.28) + 1.024 * 416)
+            Argon.MemorySize = (((nIterations * 8.685 - (nIterations * 0.56) / 1.85 * 2.28) / 10.28) + 1.024 * 816)
             Return Await Argon.GetBytesAsync(nHash)
         End If
     End Function
diff --git a/Berechnung Memorysize argon2.xlsx b/Berechnung Memorysize argon2.xlsx
index 23e3f5d72d08b48c99f4d7425b33022ddb10c3cc..21d2a6cb6ce584df333720b40d3777a5b14d16a5 100644
GIT binary patch
delta 2256
zcmV;>2ru`ZN2f=y8wmyFiBTX9lOPEle{Q2N5Pe^1{{i`(ViO>MnpO!(x0Sl9s++bi
zktzqAU==WHn<iD&f8Q~L-ty9IHzK}`IX*LU#vC4R%fh;6QgKm@5IMleVpS?KUad#y
zYJOse$WoeC87)M`M(BYlbbR#v+u=sYyQL6!764RggmSIx*l|>vvy!R<QL_pxe=8wN
zs$nYEj;bZ2naUZ{W#PCO2Tn<Og*t>-egs3TRy<`>kv1i(bO$0?K{e1<Ij>cZR;C|;
zE2+F|YC9EW4G>FSaQ)DNBCAZ}vvnmTT^8W>miX3I!V|!sU})U_BrxqARq|8{C06<X
zpq-BNp8o_pguDsCc0UFmL-HKSf9|=-;WH~4e3Di0j1|0q5&UH|0@7-=5<~DliRM3Z
zbJ5Y^iWls<ldeVU`WG!trV3;gROwm9HOoe52vf0PZx&=zPa0l;)y0F*Mb6Q)oG+x6
zu@!9!JqIE8@K6~+5V^kD3Bni`n#qc4mWWD&4tIWiRdX$Nk_%9{b;<rTe_S#sEYKJD
z3N1}zx>Ofb=T;+&5lZ64l>+w{W4^AKT=Z3;7C*Q?ZI+Ac+2#1h?WrhPP1kJkO0aal
zI{rbjG&ON>AP^ndZu~wdz*)w<EHAXQV0<<`ht&M0_mC)%L$<5qGspxP+*YZK$?fAH
zj3C&7YrDxfv^_FS>}WO|f7@Z?xzjKRlh6yFz!@3Dsi2L{cN#FzBQ!9oeQ)|nx4nhn
zxZ&9gjYquu*`|Nj^tLDCu(|E7IoqfgwV0{3z2Q|RHmyewug05p`G#jY2cd<-A$Z)a
zoie`8fh!@AXR1QFhSLZ=`V$wQ_`YYm!FX(Y*vIxHB8g4#$#Cf5f0Jb9O<OL`D>Chk
z3Z&ZJs@f`;(<LhkM&R-`_iY<sWXaf^BF{3?Ca`}or9}$5H(k3iBG`@04z|_jO1C{o
zjsrpB;qeeho{eV%-}b`DwL@><+KD%HXZ~<DolSg`8}m(w|HsYPDnIT&Hil(RrJhTg
z-oYp8lC36GftWgn3xF?Zv1je{Zyo&wlOY`xli48<vt$ep3kl_XP+<oH004rMd>0^p
zmD`TuI1q;KN1AuAthu0jMI4(rBnTLB7_@z{(rR}O*Cse%brNT6b7-yh-M1WbSgCs?
z)QCXEE`Rlx{RhUMPj!V3(paUN38qnuk!%XRQO$OOzkOZxGmNYg%|=wZkrVtPE&e?H
z_+fn1=GpF~bO;EIo#35w?T8Rt>|`x}Y@}P+z)Y!4EgamMEwQbUV$&_EE5hP9CAClu
z4up}phoQ?-6>_PIeJvXoAVyZgfquJFt-a9d;vQTr%=5nO7rJf%u~wCGFC7%4x)?oe
z8*Rk8g1%2Q5d}IKcr&;LmonY>t4g&hjJCRT5s*pH{JQ;|<U|x#((C^3!q9|&7<o|s
z0B<PvK1q~cS?mTIyc3pQVSc;JXs<RC{Leg_=U<j9-lww_?I#Hz^yf3a?6Y{rzwlKu
z$X4mUcskxFIAPxvGP0cD867PKm`ul=f4(buwEv5d6YIZaB?~8^2F1wRbFKBWPke%*
z7>Kq@@I+BKb&v~LRTB(UWPf&lH9`S$tuP(m;!CwvXXrl-S_>-|y859uZU-gd!P&@C
z>?`+|KK?G%cIRM}L*w2#qs_}w+5#*KQX<BEBZaO23ZJM}{@DY|iBk|Cn2bd<iBrf%
z#ojtyUuvCKhjnmJ-8%R_p0&^@<2*^T;hQT-DBN|q6i!UXMjsKl4;0vcR`_R`j{J$e
zDI660+&P5}Jxm#;V{(9fD&PXll?7_<X3ZcO_QiI@_{s})7>t(FPxDXok&Q{|izW=B
zbI~qo5t4en-khOFG>q~L^-;Ki-5xw3f)bcuT@c0m0sV%kAIRf}GnCRek2oFhEM`fX
zL-2NE-Ys`;(x4L$LI`_*cm!Z4pT_*g4*Jh|y&hVy$1F-S?)5{A;)thSwLelXIAU3M
z3vEFFT|^)kCNi2{J4y2_N>a)bFc0NJdfTmVM8VYI=v%Rse+aWxjYX9#J9`c>GQq!b
z1hLbtH|;PRCNbcWJiJnj*4lw9e=)g(-+Bp7i6hvuQfqg)0qc_m>%YhJKa(IG6$PA*
z8Y@?`s~R)`e-$U8?U)}EL_u_Z;9W@Gb-^|*NoF_j$D6j>tW3R3&Uv4l^O9t;E{os;
zj8&CR5gic}fEJZhI#1Eld={Rez&fraFDeZw+JHrq?D!}VH4~MAdsEe5oB|tolD16L
zDOx&LGmNcRLdosOJG2)Ul_|ONN0Z~4i+7#_jtDu$e<e6Bx#PG6hV`C^wn!=V$a-ap
z4j=`F0!q-%VmhMu+v~uT_Sb<<88}PjHns1xjXPvZ(TjWc+N!;=X_`?JcQJf^ieK+;
zAG@ld((SGUpe&Js2?N|!CVRemm|h2;!Of~rD;rEzuE8XD;App5aO>{;;ui|!`R1>o
zL!*DGLMzrk2Qu(cSzm0Yyu=rm^BKw_648)GAsx>tVT7=lzO^}i%(v0|i*lRhe_|98
z4<&OlX7QMv!~^0EkR|xwyJTOJARQG66TmQFpa1{>?vp+p8GlU*!Y~kp_kwo_v$v@g
zM5Jk<1y7&{2<g}al1a$~(c2pry0M!F?}x|N_RrwO0~5PQ3ieeE0?EY5(X8Nhz3fgP
zIBS};kAw<d$k2D&O>49_qt%W?c_3C`b6(C;vauL6S8+iq%{``|bFpcbyd=~UTf`i^
zZ0h<bLpgx1H5no)7!M#^VF2MjD!*~F8V~F1;cqQ}q}>~{@g1uJ1?7oRAP$qEAyNTI
zlk_1$0T`1uB0vF`lXoH@9OZmaVFv>M0D=Yp02lxO00000000000001I7n6Y(8k5Z;
z5F4D18Y@=;004Ue000pH000000000000000q?7m}BpVaJFkqkn008a)000mG00000
e0000000000GLttWJpuq8lXfE_2Gbw_0000i@d=Os

delta 2265
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
n0000G00000000000000004I|`BRvB59g}|}A_mGJ00000tTPqL