From a688e07cc4e998fa29b196625c7bd572795c896c Mon Sep 17 00:00:00 2001
From: ja <ja@verag.ag>
Date: Mon, 3 Jan 2022 10:05:47 +0100
Subject: [PATCH] PW zum Testen der Serverfunktion wird nun dynamisch generiert
 bei jedem Neustart der Session.

---
 App_Code/TestPerformance.vb       |   6 +++---
 App_Code/VERAG_VARIABLES.vb       |  13 ++++++-------
 Berechnung Memorysize argon2.xlsx | Bin 9121 -> 9118 bytes
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/App_Code/TestPerformance.vb b/App_Code/TestPerformance.vb
index cf397fe..0e15980 100644
--- a/App_Code/TestPerformance.vb
+++ b/App_Code/TestPerformance.vb
@@ -129,14 +129,14 @@ Public Class TestPerformance
 
         For zahl As Integer = 0 To zahlint
             sw1.Start()
-            hashsalts.Add(VERAG_VARIABLES.GenerateSalt(VERAG_VARIABLES.RandomInteger(Math.Pow(2, 4), Math.Pow(2, 8))))
+            hashsalts.Add(VERAG_VARIABLES.GenerateSalt(VERAG_VARIABLES.RandomInteger(Math.Pow(2, 4), Math.Pow(2, 6))))
             arrzahl_iterats.Add(VERAG_VARIABLES.getiterationnumber)
             arrzahl.Add(zahlint)
             sw1.Stop()
             arrzeitp1.Add(sw1.ElapsedMilliseconds)
             sw1.Reset()
         Next
-        Dim pw As String = "q!V64nS4"
+        Dim pw As String = "PasswordV" + VERAG_VARIABLES.RandomInteger(5, zahlint - 5).ToString + "!!%"
         For zahl As Integer = 0 To zahlint
             sw2.Start()
             hashbytes.Add(VERAG_VARIABLES.HashPassword(pw, hashsalts(zahl), arrzahl_iterats(zahl), arrzahl(zahl)))
@@ -184,7 +184,7 @@ Public Class TestPerformance
             arrzeitp1.Add(sw1.ElapsedMilliseconds)
             sw1.Reset()
         Next
-        Dim pw As String = "q!V64nS4"
+        Dim pw As String = "PasswordV" + VERAG_VARIABLES.RandomInteger(5, zahlint - 5).ToString + "!!%"
         For zahl As Integer = 0 To zahlint
             sw2.Start()
             hashbytes.Add(Await VERAG_VARIABLES.HashPasswordAsync(pw, hashsalts(zahl), arrzahl_iterats(zahl), arrzahl(zahl)))
diff --git a/App_Code/VERAG_VARIABLES.vb b/App_Code/VERAG_VARIABLES.vb
index 4c5064e..f56cfb2 100644
--- a/App_Code/VERAG_VARIABLES.vb
+++ b/App_Code/VERAG_VARIABLES.vb
@@ -44,9 +44,9 @@ Public Class VERAG_VARIABLES
         Else
             Dim Argon As Argon2id = New Argon2id(Encoding.UTF8.GetBytes(VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(password)))
             Argon.Salt = salt
-            Argon.DegreeOfParallelism = 24 * (nHash / nHash * 1.03)
-            Argon.Iterations = nIterations * VERAG_VARIABLES.RandomInteger(1, 3)
-            Argon.MemorySize = (((nIterations * 8.485 - (nIterations * 0.56) / 1.85 * 2.28) / 8.28) + 1.024 * 416)
+            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)
             Return Argon.GetBytes(nHash)
         End If
 
@@ -65,12 +65,11 @@ Public Class VERAG_VARIABLES
         Else
             Dim Argon As Argon2id = New Argon2id(Encoding.UTF8.GetBytes(VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(password)))
             Argon.Salt = salt
-            Argon.DegreeOfParallelism = 24 * (nHash / nHash * 1.03)
-            Argon.Iterations = nIterations * VERAG_VARIABLES.RandomInteger(1, 3)
-            Argon.MemorySize = (((nIterations * 8.485 - (nIterations * 0.56) / 1.85 * 2.28) / 8.28) + 1.024 * 416)
+            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)
             Return Await Argon.GetBytesAsync(nHash)
         End If
-
     End Function
 
     Public Shared Function Verifyhash(ByVal passw As String, salt As Byte(), ByVal hash As Byte(), ByVal nIterations As Integer, ByVal nHash As Integer) As Boolean
diff --git a/Berechnung Memorysize argon2.xlsx b/Berechnung Memorysize argon2.xlsx
index 73bee4a7744676519c174d0784ddaa44c43487fb..23e3f5d72d08b48c99f4d7425b33022ddb10c3cc 100644
GIT binary patch
delta 2230
zcmV;n2ub&$N1jKp8wmyJh4aY_lOPE$f7`SR61zfdftO0iP29#JiL<stixB_5<D}vG
z!opUmZ{r-FnK|Pe9`DM+x?@stQH>Bez{p}%Dl%SeM(A=ew+F~lnpPPtM8!tvo+)&E
z^!?l6R><3x5VsZpRBD8Bt?SrvRGPDrssmB83M^|OOR8ZiH;$?$qnXMX(`Dhfe;9{O
zNqL1jgjjwAL#)?4Wr;|el2y6`k*uH^=&PL9sz)o+kHD2w-Zr(Jin0cX6)(8HZ$Xh&
zrt#^f5|XY8aC=7rYbW6e;ZHC$ZhsP(-W^r)R0<{5`T(Gvj`TbK33dp16@uOS7<>%L
zcO<*xCWlX~WcW!|;S*N)3`X#mf6)j?tJO*j!TTgy@WjnUM~7=(u&YkG7Om@Fv^1G2
zkX2BnXBpQl8=(lMV#{7F$flk&ya20<y~sn((UY9drIoQYZ3?{rA@}f58DThd1G5u^
zF)lQd71eAiDh)c^`}I}Lwb;{KfWoZ{_NU>JL1BTuz*lH#8q<|Jr#iP9e_4#sG+tgR
zaDO@Gn~KS0UlnTkgX@!KwY-{LjDOsmh?3QG!<H`uOW#+=KS-9QCJqh+q9fal-v$LZ
z%ea^2xt11;Pm?o9&2M@Ki2^xf`#L^_Oc3v;N@YxL9_D@!`W_kBZZZjMKNv^$!1u77
zBojCChF<6=gGX>ihH)xrf1~rg1`PBFc}BHwO+V?bw-6jRJbR|`fcHP!^lzHp_Glb7
zx7`(ITlK6KGqrZtyvoG3_2~Y^c-t;t^GxR;v_TYs$KBcq<C`3~5;F8nRY=!x8li_^
z;^KJ___iC4$F`3HY)^({Y7;z<A|KDEGe2p$I4{VwH!6^7d#h@ze_%mZtSA_P%iG+y
zZGe#_V{?i;%}ATT{>79QDd^sG?ZzR&?$GRDJAI~f+k@md5F|bxM|kMlc;-QF21D26
z#<iz@;?9C-mdqxB$&L9Y#Q)=FY?UAP9~;9mr&2E@O>f~7b-~sXsz6MgL%<ib*t2%}
zw~qb-009600{~D<vq=mq3kl-}v4i~r004oLeHS5rU2obj6n&qx|6o~t045UK#33MH
z;-hGNm^AJ4*#rlyCUIt)k80X~-*p1CTRRCAk>uLGKIdHfI2pY^7CG8WW0fw)m<9wR
zS*Cie%FP&m`?~BV7+ELEwa9fT$M`{7{C@KG&FG-bz1>Rb5FnIxjJM8J!!WezRu;kr
zx{@V-jAYsr!a>t)LR%Rr*7c+!4;dkGSO`_(24QHf!O&TzQn}FSu8^f`K#a_V1O0ZZ
zDtksN(re%fVeWTTH`PT25G$1{_fUgkRHVbZO{tAo<xuyLMj}N=1Ahir?@UwoKVvFX
zYP8jv3jjH6G(RtY5Dr3-UXY&Ge-#XkLL>Ko%5UH!6nmW{$}d>#5v=!0u=oPzm&*)y
zYCXokX31=DyIArroi1rNig>R(oAO1Mktx6B%cz$u<KK8PS}WLLUllSk8{;V*&U-kV
zjB5XUSMp$=#K?)&7n#e{N#LLud3&z3zW0fD&_w{z)(IX_q)zSST;};0&p@30S#v;t
z2n6AU;c0wkTh@mDWY9`jIoJ6QwRT&egoCq|nb_s-vp#%~YO{6F%b{@ZoZ<RmA#Dnl
z1t|gJo+s5gfWjRW%AY;3oH#b(8%)Lm8j%>XQM$8E7iX^1>}DQpR6P%#hm#f>B%DWa
z(tmMg*bvuME`$@4k<kYP?gIt368<cI)1lw77lngjpF5+lp!*4<bQJDkol>{}=7I%k
zuEv@|GOUZO5y=Iw;bG95O>Sm4w8KVW=1C(4(TTK9nm0+UR%^yk2eDv~pe||}G+@0p
z3Q^<-d;sq_-bU{b^&JD!K7mpek${t^AJaj7PhKv}yXERd>eb>wNXXh9er6(n9Kyf!
zpYmEQG-sVSh!gJhLySOE+^B{=Um8n%GpV0YL_nCYETZwHkRFQy%KDTrLOJ0{^iLs;
zznh(}#72G;W}`}ra+%fc>|<ma`;q`+rz`K-e$tNsuOAJXUyRX8J22&c2Dk94mtYhU
zz=~yByK}>zu*=6|@&^C_|NjG%Mhp)HlJ826ShKGhBmsYXl3h!~Fc^jJ1^+|IeV3#Y
zH$vMnKPHF+(fWaRA$hk2+q5K^-M}Aj+HQ3+^)fl<eR9rA;>o7SgAXuPl{!ImKu`c$
zlv3$sf}XNjI7WeWTuYvp8WOYxizeymNh~TRN(1+%tiU)0Ht-~EnWz%9a;{<+Td{(I
z+ktmzFD`#dQ*h^xW{E2<-uV)6M94WVz;VeP#|<#7dLr5(rRb5>+T<-j3Jf_Epq<5Z
zK=HTNfhp{-1Fdr4ER@?;zSA!5AzO-0?A;rydShMJgL>G;@cAizo!>pSRYRqlT?s&G
zECmw=xGPQieEl%J2|k0{b*|Pnn5v})6XOF%v&~eTTQ~QMUnr0l+rNg6jsB&!Soa*r
zz(-|WvAyy#yu8Y0D2+%&LmGv2lu^P6VMF@X<oGe)MDH$&U7G)iQAlV=h8Y>Nvxw2r
z0dWsVV|?^o(k}p$K@1cL>|MO;q5uE@=#xGj8Gk_v!Y~v>_kwo_e{WMOh)B~y3!Xp^
z5Yn#+BtIoTh~C}^+Kp}o=FKon+dqOAcTDUeDcDvu2qY6HM>hqR^J#Mc!CBL!eI!)y
zM25awuUezM8Lf6C$^x+hoAZ2>l8wcnxr#GVNv<&kor_I3$#X(Iu|>?m%cidPGL!-6
zS{oyhf?)^3l@B2NTjd9jU%Y_kZ*Ta)a{1W30Fyxs6tf5(mjeaqh4aY_lcXV10Y;Pe
zAwdBalQ|+l0hN<_A|M;%2C;+v0ssJk1^@sU0000000000000000A-W4A}bq`?@EqX
z0RRAd0ssIJ0000000000000000GN~eA|wgyUA*g}0002!lPDuk0r!)5BO?aNAOHXW
E04k*sa{vGU

delta 2237
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
LBL>YN00000H-ZZB