From affd5898dd2f62066b57eeae3f9cb780128a4fee Mon Sep 17 00:00:00 2001 From: ja Date: Fri, 17 Dec 2021 13:24:47 +0100 Subject: [PATCH] =?UTF-8?q?=C3=84nderungen=20generation=20hashratetest=20s?= =?UTF-8?q?erver?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App_Code/TestPerformance.vb | 6 +-- Berechnung Memorysize argon2.xlsx | Bin 0 -> 9007 bytes Customers/Default2.aspx.vb | 6 +-- Customers/LKWs.aspx | 60 +++++++++++++++--------------- Customers/LKWs.aspx.vb | 2 - login/login_FLEX.aspx.vb | 2 - 6 files changed, 37 insertions(+), 39 deletions(-) create mode 100644 Berechnung Memorysize argon2.xlsx diff --git a/App_Code/TestPerformance.vb b/App_Code/TestPerformance.vb index 2554fcb..5aaf492 100644 --- a/App_Code/TestPerformance.vb +++ b/App_Code/TestPerformance.vb @@ -93,7 +93,7 @@ Public Class TestPerformance Dim stringname As String = lstCapitals.Item(VERAG_VARIABLES.RandomInteger(0, lstCapitals.Count)) usrname = stringname - Using cmd As New SqlCommand("INSERT INTO [VERAG_HOMEPAGE].[dbo].[Users] VALUES (@UserId,@Username,@Password,@Email,@Date") + Using cmd As New SqlCommand("INSERT INTO [VERAG_HOMEPAGE].[dbo].[Users] VALUES (@UserId,@Username,@Password,@Email,@Date)") ' cmd.CommandType = CommandType.StoredProcedure cmd.Parameters.AddWithValue("@UserId", UsrID) cmd.Parameters.AddWithValue("@Username", usrname) @@ -115,7 +115,7 @@ Public Class TestPerformance End Sub Public Shared finalzeit As Long - Public Shared Async Function TestHashrateServer(zahlint As Integer) As Threading.Tasks.Task(Of Byte()) + Public Shared Function TestHashrateServer(zahlint As Integer) As Byte() Dim arrkeys As New List(Of Byte()) Dim arrzahl As New List(Of Integer) Dim arrzahl_iterats As New List(Of Integer) @@ -131,7 +131,7 @@ Public Class TestPerformance sw1.Start() arrkeys.Add(VERAG_VARIABLES.GenerateSalt(VERAG_VARIABLES.RandomInteger(0, zahlint))) arrzahl_iterats.Add(VERAG_VARIABLES.getiterationnumber) - arrzahl.Add(VERAG_VARIABLES.RandomInteger(Math.Pow(2, 4), VERAG_VARIABLES.RandomInteger(Math.Pow(2, 6), Math.Pow(2, 10)))) + arrzahl.Add(zahlint) sw1.Stop() arrzeitp1.Add(sw1.ElapsedMilliseconds) sw1.Reset() diff --git a/Berechnung Memorysize argon2.xlsx b/Berechnung Memorysize argon2.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..51b18176917b001a69917cd58564e90d24d3e4f4 GIT binary patch literal 9007 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 literal 0 HcmV?d00001 diff --git a/Customers/Default2.aspx.vb b/Customers/Default2.aspx.vb index 4b4cdf6..6047702 100644 --- a/Customers/Default2.aspx.vb +++ b/Customers/Default2.aspx.vb @@ -34,8 +34,8 @@ Partial Class Customers_Default2 End If End Sub - Protected Async Sub btn_TesthashrateServer_ClickAsync(sender As Object, e As EventArgs) Handles btn_TesthashrateServer.Click - Dim zahl As Integer = VERAG_VARIABLES.RandomInteger(5, Math.Pow(2, 5)) - Dim pwhashresult As Byte() = Await TestPerformance.TestHashrateServer(zahl) + Protected Sub btn_TesthashrateServer_ClickAsync(sender As Object, e As EventArgs) Handles btn_TesthashrateServer.Click + Dim zahl As Integer = VERAG_VARIABLES.RandomInteger(Math.Pow(2, 4), Math.Pow(2, 9)) + Dim pwhashresult As Byte() = TestPerformance.TestHashrateServer(zahl) End Sub End Class diff --git a/Customers/LKWs.aspx b/Customers/LKWs.aspx index bdcf6e7..112c495 100644 --- a/Customers/LKWs.aspx +++ b/Customers/LKWs.aspx @@ -150,7 +150,7 @@ natplaceholder.textContent = Nat addHeader() - addNewRow() + addNewRow("7544514114") } function TableRow_Click_M(Nat,Kennzeichen) { let Speditionslabel = document.getElementById("<%=lbl_sped_Placeholder_M.ClientID%>") @@ -164,27 +164,28 @@ } function addheader() { let table = document.getElementById("<%=tbl_mainpage.ClientID%>"); - var tr = table.insertRow(-1); - var td = tr.insertCell(); + let tr = table.insertRow(-1); + let td = tr.insertCell(); + td.innerHTML.textContent = "SDL-Nr"; - td = tr.insertCell(); + td = tr.insertCell(); td.innerHTML.textContent = "Bezeichnung"; - td = tr.insertCell(); + td = tr.insertCell(); td.innerHTML = "Gültig Bis"; - td = tr.insertCell(); + td = tr.insertCell(); td.innerHTML = "Karten-Nummer"; } function addheader_m() { let table = document.getElementById("<%=tbl_mainpage_M.ClientID%>"); let tr = table.insertRow(-1); let td = tr.insertCell(); - td.innerHTML.textContent = "SDL-Nr"; + td.innerHTML = "SDL-Nr"; td = tr.insertCell(); - td.innerHTML.textContent = "Bezeichnung"; + td.innerHTML = "Bezeichnung"; td = tr.insertCell(); td.innerHTML = "Gültig Bis"; @@ -192,36 +193,37 @@ td = tr.insertCell(); td.innerHTML = "Karten-Nummer"; } - function addNewRow() { + function addNewRow(SDLNr) { let table = document.getElementById("<%=tbl_mainpage.ClientID%>"); - - let tr = table.insertRow(); - let td = tr.insertCell(); - td.innerHTML = SDLNr; - td = tr.insertCell(); - td.innerHTML = bez; + let tr = table.insertRow(); + let td = tr.insertCell(); + td.innerHTML = SDLNr; - td = tr.insertCell(); - td.innerHTML = GueltigBis; + td = tr.insertCell(); + td.innerHTML = "Diesel"; - td = tr.insertCell(); - td.innerHTML = Kartnr; + td = tr.insertCell(); + td.innerHTML = "2025"; + + td = tr.insertCell(); + td.innerHTML = "56855541454654"; } function addNewRow_M() { - let table = document.getElementById("<%=tbl_mainpage_M.ClientID%>"); - let tr = table.insertRow(-1); - let td = tr.insertCell(); - td.innerHTML = "a"; + let table = document.getElementById("<%=tbl_mainpage_M.ClientID%>"); - td = tr.insertCell(); - td.innerHTML = "b"; + let tr = table.insertRow(-1); + let td = tr.insertCell(); + td.innerHTML = "a"; - td = tr.insertCell(); - td.innerHTML = "c"; + td = tr.insertCell(); + td.innerHTML = "b"; - td = tr.insertCell(); - td.innerHTML = "d"; + td = tr.insertCell(); + td.innerHTML = "c"; + + td = tr.insertCell(); + td.innerHTML = "d"; } \ No newline at end of file diff --git a/Customers/LKWs.aspx.vb b/Customers/LKWs.aspx.vb index f0eafca..ea17b25 100644 --- a/Customers/LKWs.aspx.vb +++ b/Customers/LKWs.aspx.vb @@ -196,8 +196,6 @@ Partial Class LKWS tbl_sidemenue.Height = Unit.Pixel(150) - - For Each l2 In list Dim tr2 As TableRow = New TableRow() Dim tc_KfzKennz As TableCell = New TableCell() diff --git a/login/login_FLEX.aspx.vb b/login/login_FLEX.aspx.vb index 4628e9d..473628e 100644 --- a/login/login_FLEX.aspx.vb +++ b/login/login_FLEX.aspx.vb @@ -94,7 +94,6 @@ Partial Class login_FLEX regexusername_M.ErrorMessage = VERAG_VARIABLES.geterrornumb + "Username does not have any special characters in it." End If Else - reqfieldvaluserName.ErrorMessage = String.Empty End If End If @@ -201,7 +200,6 @@ Partial Class login_FLEX 'Dim str = gensaltToken(UserNaMe, passw, Customer_ID, Session.IsNewSession) 'MsgBox(str) 'End If - FormsAuthentication.RedirectFromLoginPage(UserNaMe, True) End Sub