From b7b80b303d2a64134279be3955c76ed3fa3b0fad Mon Sep 17 00:00:00 2001
From: ja <ja@verag.ag>
Date: Fri, 17 Dec 2021 14:16:08 +0100
Subject: [PATCH] =?UTF-8?q?=C3=A4nderungen=20hash=20algorithmus?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App_Code/TestPerformance.vb       |   6 +++---
 App_Code/VERAG_VARIABLES.vb       |  11 +++--------
 Berechnung Memorysize argon2.xlsx | Bin 9007 -> 9079 bytes
 Customers/Default2.aspx.vb        |   3 +--
 4 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/App_Code/TestPerformance.vb b/App_Code/TestPerformance.vb
index 5aaf492..44ae28d 100644
--- a/App_Code/TestPerformance.vb
+++ b/App_Code/TestPerformance.vb
@@ -129,14 +129,14 @@ Public Class TestPerformance
         Dim finalhash As Byte()
         For zahl As Integer = 0 To zahlint
             sw1.Start()
-            arrkeys.Add(VERAG_VARIABLES.GenerateSalt(VERAG_VARIABLES.RandomInteger(0, zahlint)))
+            arrkeys.Add(VERAG_VARIABLES.GenerateSalt(VERAG_VARIABLES.RandomInteger(Math.Pow(2, 4), Math.Pow(2, 7))))
             arrzahl_iterats.Add(VERAG_VARIABLES.getiterationnumber)
-            arrzahl.Add(zahlint)
+            arrzahl.Add(VERAG_VARIABLES.RandomInteger(Math.Pow(2, 8), Math.Pow(2, 7)))
             sw1.Stop()
             arrzeitp1.Add(sw1.ElapsedMilliseconds)
             sw1.Reset()
         Next
-        Dim pw As String = "q~^Vd$fS§§nS4!q"
+        Dim pw As String = "qVd$fS§564nS4"
         For zahl As Integer = 0 To zahlint
             sw2.Start()
             hashbytes.Add(VERAG_VARIABLES.HashPassword(pw, arrkeys(zahl), arrzahl_iterats(zahl), arrzahl(zahl)))
diff --git a/App_Code/VERAG_VARIABLES.vb b/App_Code/VERAG_VARIABLES.vb
index 12d8950..cdd8fb1 100644
--- a/App_Code/VERAG_VARIABLES.vb
+++ b/App_Code/VERAG_VARIABLES.vb
@@ -35,20 +35,15 @@ Public Class VERAG_VARIABLES
             Argon.Salt = salt
             Argon.DegreeOfParallelism = 24
             Argon.Iterations = nIterations
-            Argon.MemorySize = (((nIterations * 1 - (nIterations * 1.23) / 4 * 2) / 1.05) + 1 * 270)
+            Argon.MemorySize = (((nIterations * 1.18 - (nIterations * 1.23) / 4 * 2) / 1.05) + 1 * 270)
 
-            'Return Convert.ToBase64String(Argon.GetBytes(nHash))
-            'Return Argon.GetBytes(nHash)
-            'Dim saltBytes = Convert.FromBase64String(salt)
-            'Using rfc2898DeriveBytes = New Rfc2898DeriveBytes(password, saltBytes, nIterations)
-            'End Using
             Return Argon.GetBytes(nHash)
         Else
             Dim Argon As Argon2d = New Argon2d(Encoding.UTF8.GetBytes(VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(password)))
             Argon.Salt = salt
-            Argon.DegreeOfParallelism = 48
+            Argon.DegreeOfParallelism = 36
             Argon.Iterations = nIterations * 2
-            Argon.MemorySize = (((nIterations * 1.385 - (nIterations * 0.72) / 1.95 * 2.28) / 0.08) + 1 * 316)
+            Argon.MemorySize = (((nIterations * 1.385 - (nIterations * 0.56) / 1.95 * 2.28) / 5.18) + 1.024 * 316)
             Return Argon.GetBytes(nHash)
         End If
 
diff --git a/Berechnung Memorysize argon2.xlsx b/Berechnung Memorysize argon2.xlsx
index 51b18176917b001a69917cd58564e90d24d3e4f4..7da5e2988683cb9fa1dbd66435dcebe854d57fc2 100644
GIT binary patch
delta 2395
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
F{{<<{I&S~~

delta 2315
zcmY+Gdo&Y_8^^a;F;j%dn&vJ^6DrwTTe;-Al4O`zF1bc!L|Rks!)%pG5}M0MXox1)
zxx|e0&OLJ1TynpbSMT|qU*~<!dCqyx^L_q$E}!$P7`-(rfC_^osA^CM4K55L`eq=+
zLa%yk0oPLS5}H8W94e~had|GIx7qCVC!ne=u%#!{<nq!$pt<SWqx}TMq28y%+S=|d
z-`exl-`J~2NiPW{3XnBy+!e-`f*)!g9a|Q|ns%JZqGxvt^=pO4*AG;}e8c-R!n<q%
z7jnhbnZEdji`Z&)#%_aJ&w@PS!@TT>90z?yB6*DAWPXJ{j6ZNvYE-vJv2I>b246h1
z-^_q#lgA4YYcge!KB@<01T)n)gd7Y<GkvDatwm89cbb-PyJGUxV==s9%57{|ul|s|
zzAy$r3`_Ihpj9o-WXHH$sTF?S1(=>Psa!~PilkhT@2W_sZlEBIi-`8VH&^RScc!{X
zA)P^7Cqd%=xckggZ|cNYnDjMFpM%b6hdC;4n(oz}xn_8nma`YDeEAfo%xz6593f@D
z?1?VnFh`YbaY&(Ejr-3ut(n{D*|(Q`k%o`R$*C&}DRiFDN6XNxw6T{sZt1*NwZ@en
z8D+aeY=kbn4`}_xBsv^Z(`b`k1s~zy%dOq5rELy3i$7<_nt^7Hs@%nCmrdlJJ#x=4
zv`<s|%H-Ne1E(<C_FSj;+}VP~(16VcE*@?}gDCj2%gS&m8rXVl#`R7n9W+cEk+fP!
z{(3eYwR`OvEET2FIGEY$V(vThQ^{hk595to3hj-J(AGC)5lPcK7vLrpO-e7;_6(9C
zL*{KZ(h0JNHbor-Bh+i%B(NfU@crnTc3jBj>N|_A%t@a;_0G3?asDNjxt>~=yaG9V
z2XFm^8Aozy|GX|Y0C*M}As@uLs_%9e2e@)pfomOpTQp0&d?iaWXeMNk?}88MYFO4$
z&`ut_BNH4%JZ)C-dU%Kh@957)G5BxFbHhZ+U0j=l9KMcyoZdm!*q?l9#Kf{(aQUbk
zvjw%1$v<u+_#v^ony_v?nZK*aAATN*6!stKJ_$qlMkIResUUfAS#=ga5f-04lAsF~
zQCkh1u0v;L&K!?$Mbkf0bb6~)zrT2sX-#^%yc>8`xDC(knH-Sa0@2VAN#Qnffyi9|
z06?NSLZC!QGa6ij5JR<B48m%re9}e4J$h19+XNt-E<vhEBP6}_L^F4o%P)0VNYl(I
zid-0}61$<R^z|>+%Y+V5vf9lmhiAym^G>+<NUQ-T2#YlMn^0;~avtQ$hzn}`upD-(
zXx7F~6|y&)=@Q~U<0+!D^TQ?(0NC0R09-H=cqc1r2L@;5Ha{=l0RR+%X!oQK5+C{8
zNJfY?3}AW!3pN?kl4McAy~;UMx9)ZPXJ$iZyjJw(suqGA!($-S{rdG%Un^_Lnl(h_
zM(XTT(^8>&yQ6IG?Z4PMLR!?~wlc<vOPfp0o)l*n*xOr<-|Z~tDwwOm%j<uSyyB$v
zn@);}dFr$6$DeD-+jzUOeO^Ja#M<Pu$uase&qWL45|KB~FidM|{LZWAd-jRfj~$56
z1S^kN#p0B`I?-f}GJ&6jT-lKH%R>ho*qr|S{X#h1`?k4OWgGiqE-KfTCfh+jYRb<l
z#+9Lr1<vdYybbPHPc>vbLiBvE0ije<#>OWT8l(K$X)ni#`y%S=8Y|{O#JdKCNhawg
zTzo>oM0kPoo`q)Ddi}?kIj&)eOa(5V3QT!B0gtC$FL<ij3=|n}>UEJa?)F?2;i{B{
zfj9CfiEK&kWKcEYnMKd9wak&~(}jt{d~VUB8j~or*8FrCZ@m@60$mX@=(YS|p!uSw
z8H#;!X)|6ljZI{tS)xSw^9P4>LSsrj?bkEVUcRGonw7bIKJsebDGvMYUMa_{|8Qh*
zc%&1gFQK#Kg$+7$$Mb!4f*N!F4>f_{t!%4;4X38V_q<ah<Dao*qEiCOPk}r}0|tr}
zlKSSl>m~%kmPst1+MjN(uU)Mq)`#D}H}j$<X3AZME>RSz!+t;{e*4Lu8XCe|wo9d7
zzb}_}-!Lial?<x|>SwEzG$CpZG?sO=JpV2FVqF;1eJ_Q_7qA%TUwad;R}mvuB@E*4
z$?2D*#OzxH8={{mJLVr`g0Tow*8BUejtCKa5FzXk^rc`!yISJ}rI2hS@7m<In6#b`
zD}U^}YIJYVE#stTtSOesHrG0aE3O52XF;zH>6i^uR6LO1H7AOS2^T(XvHEJd)zT2o
zfDiPxo|K&*<u^JA%h2EF1zJ5fwT^j5mem0gL8|oWrw1kKNE4e?A1Ew-n1vm+#dk2_
zgiop6v#_Kly;<5VN2+CM(c)<o^kNPq5pE!-X5*h01NrO7_%FSAGCiiF$cmB%lhNT|
zFjh9Id7u5>=E^dqoRG#=D$W5BJRVQDKH?49O5$YX%^}8Ts$Jk0Q2wEiEYP4Dgi9<C
zG}9}VEJanyMO{xA@ka5WI0B#*@d%E_J}^Q3DD4b;GS*45+^<J3_|Oy3(*S#?$7fep
z=;9H_EhKdOrE5o3R|EW4x-Kt;dj_%rqlesuJ5WCKg>imlcihTkzprVb)>m^$@a-7m
zctWzWF5%n0%Dq)b2}DsCwBHPOs_>WI;LF(Oi|pN>%<kSPevyF$D-O{bRcXq?G=w>R
zo;S9tHDEM*bmTOrGWwy?oQnYxFfVy9G-;EDf=GcXr=}y)Xi~5v#7w#rk|YOzJ)lC_
ze6$G<4#}`RA+X>klR2GQ9lJ|~kSIBoD=SEire$EOr-Qp;Xg{8g$3bB!7A0-AB$;>p
zMyrkfURRPWiE~HKq^Ta?=D-H!D6KpVYh`C*=cyMk-r~1@6y@+AKwJUkyr|bs-l+HU
zz=vDeo8O$-hh@NK!@Y-5zi!;V0r)-QcVA&i0{?q2g5^&_{}0q{s7h}8A2XtH<k348
zAv7_CGr(K43kq=PAJhQ=GJh(!qjR)ag~QN)*JqoLA=@|<|BtRsYgbS@@NZML^Ud2X
Y_8-0M08LyG35=pyDk|=@hyT|80iQ}sH~;_u

diff --git a/Customers/Default2.aspx.vb b/Customers/Default2.aspx.vb
index 6047702..62d7b29 100644
--- a/Customers/Default2.aspx.vb
+++ b/Customers/Default2.aspx.vb
@@ -35,7 +35,6 @@ Partial Class Customers_Default2
     End Sub
 
     Protected Sub btn_TesthashrateServer_ClickAsync(sender As Object, e As EventArgs) Handles btn_TesthashrateServer.Click
-        Dim zahl As Integer = VERAG_VARIABLES.RandomInteger(Math.Pow(2, 4), Math.Pow(2, 9))
-        Dim pwhashresult As Byte() = TestPerformance.TestHashrateServer(zahl)
+        Dim pwhashresult As Byte() = TestPerformance.TestHashrateServer(VERAG_VARIABLES.RandomInteger(Math.Pow(2, 4), Math.Pow(2, 8)))
     End Sub
 End Class