From 9350bd5903483cc321a98d02de2afed96d4be9a3 Mon Sep 17 00:00:00 2001 From: ja Date: Mon, 7 Feb 2022 10:19:50 +0100 Subject: [PATCH] =?UTF-8?q?=C3=84nderungen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App_Code/VERAG_VARIABLES.vb | 14 ++- Web.config | 178 ++++++++++++++++++------------------ login/login_FLEX.aspx.vb | 2 +- 3 files changed, 96 insertions(+), 98 deletions(-) diff --git a/App_Code/VERAG_VARIABLES.vb b/App_Code/VERAG_VARIABLES.vb index 6dc1b2f..42c72e8 100644 --- a/App_Code/VERAG_VARIABLES.vb +++ b/App_Code/VERAG_VARIABLES.vb @@ -57,16 +57,16 @@ Public Class VERAG_VARIABLES Argon.Salt = salt Argon.DegreeOfParallelism = 8 Argon.Iterations = nIterations * VERAG_VARIABLES.RandomInteger(2, 3) - 'Argon.MemorySize = (((nIterations * 19.98 - (nIterations * 10.23) / 14 * 2) / 4.058) + 1 * 190) - Argon.MemorySize = Encoding.UTF8.GetBytes(VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(password)).Length + Argon.MemorySize = (((nIterations * 19.98 - (nIterations * 10.23) / 14 * 2) / 4.058) + 1 * 190) + 'Argon.MemorySize = Encoding.UTF8.GetBytes(VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(password)).Length Return Argon.GetBytes(nHash) Else Dim Argon As Argon2id = New Argon2id(Encoding.UTF8.GetBytes(VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(password))) Argon.Salt = salt Argon.DegreeOfParallelism = 10 Argon.Iterations = nIterations * VERAG_VARIABLES.RandomInteger(2, 3) - 'Argon.MemorySize = (((nIterations * 20.98 - (nIterations * 10.23) / 14 * 2) / 4.058) + 1 * 190) - Argon.MemorySize = Encoding.UTF8.GetBytes(VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(password)).Length + Argon.MemorySize = (((nIterations * 20.98 - (nIterations * 10.23) / 14 * 2) / 4.058) + 1 * 190) + 'Argon.MemorySize = Encoding.UTF8.GetBytes(VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(password)).Length Return Argon.GetBytes(nHash) End If End Function @@ -78,16 +78,14 @@ Public Class VERAG_VARIABLES Argon.Salt = salt Argon.DegreeOfParallelism = 8 Argon.Iterations = nIterations * VERAG_VARIABLES.RandomInteger(2, 3) - 'Argon.MemorySize = (((nIterations * 19.98 - (nIterations * 10.23) / 14 * 2) / 4.058) + 1 * 190) - Argon.MemorySize = Encoding.UTF8.GetBytes(VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(password)).Length + Argon.MemorySize = (((nIterations * 19.98 - (nIterations * 10.23) / 14 * 2) / 4.058) + 1 * 190) Return Await Argon.GetBytesAsync(nHash) Else Dim Argon As Argon2id = New Argon2id(Encoding.UTF8.GetBytes(VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(password))) Argon.Salt = salt Argon.DegreeOfParallelism = 10 Argon.Iterations = nIterations * VERAG_VARIABLES.RandomInteger(2, 3) - 'Argon.MemorySize = (((nIterations * 21.98 - (nIterations * 10.23) / 14 * 2) / 4.058) + 1 * 190) - Argon.MemorySize = Encoding.UTF8.GetBytes(VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(password)).Length + Argon.MemorySize = (((nIterations * 21.98 - (nIterations * 10.23) / 14 * 2) / 4.058) + 1 * 190) Return Await Argon.GetBytesAsync(nHash) End If End Function diff --git a/Web.config b/Web.config index 27bd92c..6f55020 100644 --- a/Web.config +++ b/Web.config @@ -1,4 +1,4 @@ - + - - + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - + - + - + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - + + + - + @@ -205,14 +205,14 @@ - + - - + + diff --git a/login/login_FLEX.aspx.vb b/login/login_FLEX.aspx.vb index e7d6c1c..e0f80f2 100644 --- a/login/login_FLEX.aspx.vb +++ b/login/login_FLEX.aspx.vb @@ -171,7 +171,7 @@ Partial Class login_FLEX reqfieldvalpassw_M.Enabled = False reqfieldvalpassw.Validate() If reqfieldvalpassw.IsValid = True Then - intzahl = VERAG_VARIABLES.RandomInteger(107, Math.Pow(2, 10)) + intzahl = VERAG_VARIABLES.RandomInteger(107, Math.Pow(2, 9)) Dim hashpw1 As Byte() = Await VERAG_VARIABLES.HashPasswordAsync(tb3_M.Text, salt, intzahliterats, intzahl) passw = tb3_M.Text End If