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 0000000..51b1817 Binary files /dev/null and b/Berechnung Memorysize argon2.xlsx differ 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