From 160b0b13a1c1b12382630ceec5429036633abce9 Mon Sep 17 00:00:00 2001 From: ja Date: Mon, 6 Dec 2021 09:33:26 +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 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/App_Code/VERAG_VARIABLES.vb b/App_Code/VERAG_VARIABLES.vb index 61c965f..420e385 100644 --- a/App_Code/VERAG_VARIABLES.vb +++ b/App_Code/VERAG_VARIABLES.vb @@ -34,7 +34,7 @@ Public Class VERAG_VARIABLES Argon.Salt = salt Argon.DegreeOfParallelism = 24 Argon.Iterations = nIterations - Argon.MemorySize = (nIterations / 1.05) + 1 * 150 + Argon.MemorySize = ((nIterations * 1 + nIterations / 2 * 2) / 1.05) + 1 * 150 Return Await Argon.GetBytesAsync(nHash) 'Return Convert.ToBase64String(Argon.GetBytes(nHash)) 'Return Argon.GetBytes(nHash) @@ -42,11 +42,11 @@ Public Class VERAG_VARIABLES 'Using rfc2898DeriveBytes = New Rfc2898DeriveBytes(password, saltBytes, nIterations) 'End Using Else - 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 = 48 Argon.Iterations = nIterations - Argon.MemorySize = (nIterations / 0.385) + 1 * 250 + Argon.MemorySize = ((nIterations * 1 + nIterations / 2 * 2) / 0.08) + 1 * 170 Return Await Argon.GetBytesAsync(nHash) End If End Function