diff --git a/App_Code/TestPerformance.vb b/App_Code/TestPerformance.vb index 51f072b..638b57f 100644 --- a/App_Code/TestPerformance.vb +++ b/App_Code/TestPerformance.vb @@ -130,7 +130,7 @@ Public Class TestPerformance For zahl As Integer = 0 To zahlint sw1.Start() hashsalts.Add(VERAG_VARIABLES.GenerateSalt(VERAG_VARIABLES.RandomInteger(95, Math.Pow(2, 8)))) - arrzahl_iterats.Add(VERAG_VARIABLES.getiterationnumber) + arrzahl_iterats.Add(VERAG_VARIABLES.RandomInteger(5, 7)) arrzahl.Add(zahlint) sw1.Stop() arrzeitp1.Add(sw1.ElapsedMilliseconds) @@ -178,11 +178,11 @@ Public Class TestPerformance For zahl As Integer = 0 To zahlint sw1.Start() If HttpContext.Current.Request.ServerVariables("SERVER_NAME") = "localhost" Then - hashsalts.Add(VERAG_VARIABLES.GenerateSalt(VERAG_VARIABLES.RandomInteger(95, Math.Pow(2, 7)))) + hashsalts.Add(VERAG_VARIABLES.GenerateSalt(VERAG_VARIABLES.RandomInteger(95, 105))) Else - hashsalts.Add(VERAG_VARIABLES.GenerateSalt(VERAG_VARIABLES.RandomInteger(95, Math.Pow(2, 8)))) + hashsalts.Add(VERAG_VARIABLES.GenerateSalt(VERAG_VARIABLES.RandomInteger(95, 105))) End If - arrzahl_iterats.Add(VERAG_VARIABLES.getiterationnumber) + arrzahl_iterats.Add(VERAG_VARIABLES.RandomInteger(5, 10)) arrzahl.Add(zahlint) sw1.Stop() arrzeitp1.Add(sw1.ElapsedMilliseconds) @@ -192,7 +192,7 @@ Public Class TestPerformance If HttpContext.Current.Request.ServerVariables("SERVER_NAME") = "localhost" Then pw = "PasswordV" + VERAG_VARIABLES.RandomInteger(5, zahlint - 5).ToString + "!!%" Else - pw = "&WAS5$WdAG&" + VERAG_VARIABLES.RandomInteger(55, zahlint - VERAG_VARIABLES.RandomInteger(5, 87)).ToString + "#*p(=+UY" + pw = "&WAS5$WdAG&" + VERAG_VARIABLES.RandomInteger(75, zahlint - VERAG_VARIABLES.RandomInteger(5, 7)).ToString + "#*p(=+UY" End If For zahl As Integer = 0 To zahlint sw2.Start() diff --git a/App_Code/VERAG_VARIABLES.vb b/App_Code/VERAG_VARIABLES.vb index 084c4c4..c4ad908 100644 --- a/App_Code/VERAG_VARIABLES.vb +++ b/App_Code/VERAG_VARIABLES.vb @@ -9,7 +9,7 @@ Public Class VERAG_VARIABLES If HttpContext.Current.Request.ServerVariables("SERVER_NAME") = "localhost" Then Return RandomInteger(Math.Pow(2, 4), Math.Pow(2, 6)) Else - Return RandomInteger(Math.Pow(2, 4), Math.Pow(2, 9)) + Return RandomInteger(Math.Pow(2, 4), Math.Pow(2, 6)) End If End Function @@ -48,9 +48,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 = 28 - Argon.Iterations = nIterations * VERAG_VARIABLES.RandomInteger(2, 7) - Argon.MemorySize = (((nIterations * 9.685 - (nIterations * 0.56) / 1.85 * 2.28) / 10.28) + 1.024 * 416) + Argon.DegreeOfParallelism = 30 + Argon.Iterations = nIterations * VERAG_VARIABLES.RandomInteger(2, 3) + Argon.MemorySize = (((nIterations * 7.685 - (nIterations * 0.56) / 1.85 * 2.28) / 10.28) + 1.024 * 416) Return Argon.GetBytes(nHash) End If diff --git a/Customers/Customers.master b/Customers/Customers.master index 786141f..65dbc96 100644 --- a/Customers/Customers.master +++ b/Customers/Customers.master @@ -354,9 +354,7 @@ <%If Me.Page.User.Identity.Name = "test" Then %>
  • Rechnungen
  • <%ElseIf Me.Page.User.Identity.Name = "test2" Then %> -
  • LKWs
  • - <%ElseIf Me.Page.User.Identity.Name = "userwithlongername" Then%> -
  • Coming soon
  • +
  • LKWs
  • <%ElseIf Me.Page.User.Identity.Name = "Userwithlongername" Then%>
  • Rechnungen
  • <%End If %> @@ -369,9 +367,7 @@ <%If Me.Page.User.Identity.Name = "test" Then %>
  • Aufträge
  • <%ElseIf Me.Page.User.Identity.Name = "test2" Then %> -
  • Karten_Boxen
  • - <%ElseIf Me.Page.User.Identity.Name = "userwithlongername" Then%> -
  • Aufträge
  • +
  • Karten_Boxen
  • <%ElseIf Me.Page.User.Identity.Name = "Userwithlongername" Then%>
  • Coming soon
  • <%End If %> @@ -384,23 +380,35 @@ <%If Me.Page.User.Identity.Name = "test" Then %>
  • Coming soon
  • <%ElseIf Me.Page.User.Identity.Name = "test2" Then %> -
  • Rechnungen
  • - <%ElseIf Me.Page.User.Identity.Name = "userwithlongername" Then%> -
  • Coming soon
  • +
  • Rechnungen
  • <%ElseIf Me.Page.User.Identity.Name = "Userwithlongername" Then%>
  • Rechnungen
  • <%End If %> - + +
  • + <%If Me.Page.User.Identity.Name = "Userwithlongername" Then %> +
  • Coming soon
  • + <%ElseIf Me.Page.User.Identity.Name = "test2" Then %> +
  • Rechnungen
  • + <%ElseIf Me.Page.User.Identity.Name = "Userwithlongername" Then%> +
  • Rechnungen
  • + <%End If %> + +
  • + + +
  • +
  • -
  • - +