diff --git a/App_Code/VERAG_VARIABLES.vb b/App_Code/VERAG_VARIABLES.vb index d8bb90b..61c965f 100644 --- a/App_Code/VERAG_VARIABLES.vb +++ b/App_Code/VERAG_VARIABLES.vb @@ -27,10 +27,10 @@ Public Class VERAG_VARIABLES Return saltBytes 'Convert.ToBase64String(saltBytes) End Function - Public Shared Async Function HashPassword(ByVal password As String, ByVal salt As Byte(), ByVal nIterations As Integer, ByVal nHash As Integer) As Threading.Tasks.Task(Of Byte()) + Public Shared Async Function HashPassword(password As String, salt As Byte(), nIterations As Integer, nHash As Integer) As Threading.Tasks.Task(Of Byte()) 'Dim Argon As Argon2id = New Argon2id(Encoding.UTF8.GetBytes(password)) If HttpContext.Current.Request.ServerVariables("SERVER_NAME") = "localhost" Then - Dim Argon As Argon2d = New Argon2d(Encoding.UTF8.GetBytes(password)) + Dim Argon As Argon2d = New Argon2d(Encoding.UTF8.GetBytes(VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(password))) Argon.Salt = salt Argon.DegreeOfParallelism = 24 Argon.Iterations = nIterations @@ -44,7 +44,7 @@ Public Class VERAG_VARIABLES Else Dim Argon As Argon2d = New Argon2d(Encoding.UTF8.GetBytes(password)) Argon.Salt = salt - Argon.DegreeOfParallelism = 36 + Argon.DegreeOfParallelism = 48 Argon.Iterations = nIterations Argon.MemorySize = (nIterations / 0.385) + 1 * 250 Return Await Argon.GetBytesAsync(nHash) diff --git a/css/Customers/Welcome.css b/css/Customers/Welcome.css index afe5b2d..1011849 100644 --- a/css/Customers/Welcome.css +++ b/css/Customers/Welcome.css @@ -99,7 +99,7 @@ h1 { height: 62px; } .modal-content{ - width:400px; + width:488px; } } @media (max-width: 322.98px) { diff --git a/login/Change_PW.aspx.vb b/login/Change_PW.aspx.vb index 45a4d58..e856740 100644 --- a/login/Change_PW.aspx.vb +++ b/login/Change_PW.aspx.vb @@ -562,25 +562,14 @@ Partial Class login_Change_PW Dim token As Byte() Dim salt As Byte() = VERAG_VARIABLES.GenerateSalt(intzahl) - Dim tok As String = STrings - token = Await VERAG_VARIABLES.HashPassword(tok, salt, intzahliterats, intzahl) - - Return Convert.ToBase64String(token) - - Return VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(Convert.ToBase64String(token)) - - Else - Dim token As Byte() - Dim intzahliterats = RandomInteger(Math.Pow(2, 10), Math.Pow(2, 12)) - Dim intzahl = RandomInteger(Math.Pow(2, 5), Math.Pow(2, 7)) - - Dim salt As Byte() = VERAG_VARIABLES.GenerateSalt(intzahl) - Dim tok As String = STrings + Dim tok As String = STrings token = Await VERAG_VARIABLES.HashPassword(tok, salt, intzahliterats, intzahl) Return Convert.ToBase64String(token) Return VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(Convert.ToBase64String(token)) + Else + Return String.Empty End If End Function Shared Function RandomInteger(ByVal min As Integer, ByVal _ diff --git a/login/login_FLEX.aspx.vb b/login/login_FLEX.aspx.vb index 22e34bb..9f5a28b 100644 --- a/login/login_FLEX.aspx.vb +++ b/login/login_FLEX.aspx.vb @@ -23,7 +23,6 @@ Partial Class login_FLEX End Sub Protected Async Sub ValidateUser(sender As Object, e As EventArgs) - ' cDBFunctions.GetNewOpenConnection() Dim ConnectionString = "" If HttpContext.Current.Request.ServerVariables("SERVER_NAME") = "localhost" Then @@ -179,7 +178,7 @@ Partial Class login_FLEX passw = String.Empty End If Else - VERAG_VARIABLES.seterrorcount(9) + VERAG_VARIABLES.seterrorcount(9) Login1.FailureText = VERAG_VARIABLES.geterrornumb + "Password is not in the database!" End If