diff --git a/App_Code/TestPerformance.vb b/App_Code/TestPerformance.vb index addafaa..c6e79dd 100644 --- a/App_Code/TestPerformance.vb +++ b/App_Code/TestPerformance.vb @@ -1,6 +1,7 @@ Imports System.Data.SqlClient Imports System.Diagnostics Imports Microsoft.VisualBasic +Imports Konscious.Security.Cryptography Public Class TestPerformance @@ -130,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, 10), Math.Pow(2, 14)))) + arrzahl.Add(VERAG_VARIABLES.RandomInteger(Math.Pow(2, 4), VERAG_VARIABLES.RandomInteger(Math.Pow(2, 6), Math.Pow(2, 10)))) sw1.Stop() arrzeitp1.Add(sw1.ElapsedMilliseconds) sw1.Reset() diff --git a/App_Code/VERAG_VARIABLES.vb b/App_Code/VERAG_VARIABLES.vb index 2eee5b5..e3eed13 100644 --- a/App_Code/VERAG_VARIABLES.vb +++ b/App_Code/VERAG_VARIABLES.vb @@ -29,26 +29,29 @@ Public Class VERAG_VARIABLES End Function 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(VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(password))) Argon.Salt = salt Argon.DegreeOfParallelism = 24 Argon.Iterations = nIterations Argon.MemorySize = (((nIterations * 1 - nIterations / 4 * 2) / 1.05) + 1 * 150) - Return Await Argon.GetBytesAsync(nHash) + 'Return Convert.ToBase64String(Argon.GetBytes(nHash)) 'Return Argon.GetBytes(nHash) 'Dim saltBytes = Convert.FromBase64String(salt) 'Using rfc2898DeriveBytes = New Rfc2898DeriveBytes(password, saltBytes, nIterations) 'End Using + Return Await Argon.GetBytesAsync(nHash) Else Dim Argon As Argon2d = New Argon2d(Encoding.UTF8.GetBytes(VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(password))) Argon.Salt = salt - Argon.DegreeOfParallelism = 48 + Argon.DegreeOfParallelism = 36 Argon.Iterations = nIterations - Argon.MemorySize = ((((nIterations * 3 - nIterations / 1.95 * 2.28) / 0.08) + 1 * 256) / 2) + Argon.MemorySize = ((((nIterations * 4 - nIterations / 1.95 * 2.28) / 0.08) + 1 * 256) / 2) Return Await Argon.GetBytesAsync(nHash) End If + End Function Public Shared Async Function Verifyhash(ByVal passw As String, ByVal salt As Byte(), ByVal hash As Byte(), ByVal nIterations As Integer, ByVal nHash As Integer) As Threading.Tasks.Task(Of Boolean) diff --git a/App_Code/WebService.vb b/App_Code/WebService.vb index 5f3e8de..f7a4906 100644 --- a/App_Code/WebService.vb +++ b/App_Code/WebService.vb @@ -150,4 +150,21 @@ Public Class WebService myConn.Close() : Return lstCountries End Function + + Private Function buildtablerow(page As Page, tbl As Table) As Table + + Dim row As TableRow = New TableRow + Dim c1 As TableCell = New TableCell + Dim c2 As TableCell = New TableCell + Dim c3 As TableCell = New TableCell + + c1.Text = "ID" + c2.Text = "Stadt" + c3.Text = "Persona" + row.Cells.Add(c1) + row.Cells.Add(c2) + row.Cells.Add(c3) + tbl.Rows.Add(row) + Return tbl + End Function End Class \ No newline at end of file diff --git a/Customers/Default2.aspx b/Customers/Default2.aspx index d0de7aa..c1bdd1b 100644 --- a/Customers/Default2.aspx +++ b/Customers/Default2.aspx @@ -1,4 +1,4 @@ -<%@ Page Title="" Language="VB" MasterPageFile="~/Customers/Customers.master" AutoEventWireup="false" CodeFile="Default2.aspx.vb" Inherits="Customers_Default2" %> +<%@ Page Title="" Language="VB" MasterPageFile="~/Customers/Customers.master" AutoEventWireup="false" CodeFile="Default2.aspx.vb" Inherits="Customers_Default2" Async="true" %> <%If String.Equals(Page.User.Identity.Name, "Admin") = False Then FormsAuthentication.RedirectToLoginPage() @@ -78,7 +78,8 @@ - + + diff --git a/Customers/Default2.aspx.vb b/Customers/Default2.aspx.vb index 2b57095..4b4cdf6 100644 --- a/Customers/Default2.aspx.vb +++ b/Customers/Default2.aspx.vb @@ -1,4 +1,4 @@ - +Imports Konscious.Security.Cryptography Partial Class Customers_Default2 Inherits System.Web.UI.Page Protected Sub Page_Load(ByVal sender As Object, e As EventArgs) Handles Me.Load @@ -33,4 +33,9 @@ Partial Class Customers_Default2 txt_Fehlercodezuzahl.Text = finalstr 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) + End Sub End Class diff --git a/Customers/LKWs.aspx b/Customers/LKWs.aspx index 78ba2c2..25c249d 100644 --- a/Customers/LKWs.aspx +++ b/Customers/LKWs.aspx @@ -47,7 +47,7 @@ - +
@@ -137,79 +137,26 @@
- - - + } + \ No newline at end of file diff --git a/Customers/LKWs.aspx.vb b/Customers/LKWs.aspx.vb index 38a713b..d7f8e4c 100644 --- a/Customers/LKWs.aspx.vb +++ b/Customers/LKWs.aspx.vb @@ -9,6 +9,20 @@ Partial Class LKWS Dim Kdnrtext As String = String.Empty Dim list As Collections.Generic.List(Of VERAG_PROG_ALLGEMEIN.cSDL_LKW) = Nothing Dim list_M As Collections.Generic.List(Of VERAG_PROG_ALLGEMEIN.cSDL_LKW) = Nothing + Dim tbl2mainpagetemp As Table + Dim TableRows As List(Of TableRow) = New List(Of TableRow) + Dim TableRows_M As List(Of TableRow) = New List(Of TableRow) + Protected Sub Page_OnInit(sender As Object, e As EventArgs) + If TableRows.Count = 0 Then + For Each tr In TableRows + tbl_mainpage_M.Rows.Add(tr) + Next + Else + For Each tr In TableRows + tbl_mainpage.Rows.Add(tr) + Next + End If + End Sub Protected Sub Page_Load(sender As Object, ByVal e As System.EventArgs) Handles Me.Load VERAG_VARIABLES.initerrorcount() @@ -57,7 +71,6 @@ Partial Class LKWS Dim tc_KZ_Ab As TableCell = New TableCell() Dim tc_Vermerk As TableCell = New TableCell() Dim list2 As List(Of VERAG_PROG_ALLGEMEIN.cSDL) = VERAG_PROG_ALLGEMEIN.cSDL.GET_LIST_WEB_LKW(401940, l1.KfzKennzeichen) - Dim list3 As List(Of String) = New List(Of String) tc_KfzKennz.Text = l1.KfzKennzeichen tr1.Cells.Add(tc_KfzKennz) @@ -100,6 +113,7 @@ Partial Class LKWS Dim strtemparr As String = String.Empty Dim strtemp2 As String = String.Empty Dim strarrtemp = String.Empty + tbl2mainpagetemp = New Table For Each l2 In list2 Dim String2 As String = String.Empty @@ -108,8 +122,21 @@ Partial Class LKWS Else Stringtemp = String.Empty End If - - list3.Add(l2.SDLNr.ToString + ";" + Stringtemp + ";" + l2.GültigBis.ToString + ";" + l2.KartenNr.ToString) + Dim tr As TableRow = New TableRow + Dim tc_SDL As TableCell = New TableCell + Dim tc_Bez As TableCell = New TableCell + Dim tc_gueltigbis As TableCell = New TableCell + Dim tc_Karten_Nr As TableCell = New TableCell + tc_SDL.Text = l2.SDLNr.ToString + tc_Bez.Text = Stringtemp + tc_gueltigbis.Text = l2.GültigBis.ToString + tc_Karten_Nr.Text = l2.KartenNr.ToString + tr.Cells.Add(tc_SDL) + tr.Cells.Add(tc_Bez) + tr.Cells.Add(tc_gueltigbis) + tr.Cells.Add(tc_Karten_Nr) + TableRows.Add(tr) + 'MsgBox(TableRows.Count.ToString) Next If String.IsNullOrEmpty(l1.Nationalität) = True Then strtemp2 = "Keine Angabe" @@ -117,10 +144,7 @@ Partial Class LKWS strtemp2 = l1.Nationalität End If - For Each l4 In list3 - strarrtemp = String.Join("-", l4.ToString) - Next - tr1.Attributes.Add("OnClick", "Javascript:TableRowClick(""" & strarrtemp & """,""" & l1.KfzKennzeichen & """,""" & strtemp2 & """)") + tr1.Attributes.Add("onclick", "Javascript:TableRow_Click(""" & strtemp2 & """,""" & l1.KfzKennzeichen & """)") cnt += 1 tbl_sidemenue.Rows.Add(tr1) Next @@ -201,8 +225,7 @@ Partial Class LKWS Next End Sub - Protected Sub TableRowClick(ByVal sender As TableRow, e As EventArgs) - End Sub + Protected Sub btn_Suchen_M_Click(sender As Object, e As EventArgs) If HttpContext.Current.Request.ServerVariables("SERVER_NAME") = "localhost" Then @@ -261,9 +284,7 @@ Partial Class LKWS cnt += 1 Next End Sub - Protected Sub Button_hid_Click(sender As Object, e As EventArgs) - 'MsgBox("Test erfolgreich!") - End Sub + Protected Sub btn_alle_M_Click(sender As Object, e As EventArgs) If HttpContext.Current.Request.ServerVariables("SERVER_NAME") = "localhost" Then VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = True @@ -348,9 +369,10 @@ Partial Class LKWS For Each Ltenp In list2 str2temptemp = String.Join("-", Ltenp) Next - tr1_M.Attributes.Add("OnClick", "Javascript:TableRowClick_M(""" & str2temptemp & """,""" & l3.KfzKennzeichen & """,""" & strtemp2 & """)") + tr1_M.Attributes.Add("OnClick", "Javascript:TableRow_Click_M(""" & strtemp2 & """,""" & l3.KfzKennzeichen & """)") tbl_2.Rows.Add(tr1_M) cnt += 1 Next End Sub + End Class diff --git a/Web.config b/Web.config index 16c060b..5902e9f 100644 --- a/Web.config +++ b/Web.config @@ -1,4 +1,4 @@ - + - + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - + - + - + @@ -115,72 +119,76 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + + + + + - - - + + + - + @@ -188,14 +196,14 @@ - + - - + + diff --git a/packages.config b/packages.config index 0878b7c..b22e426 100644 --- a/packages.config +++ b/packages.config @@ -10,8 +10,8 @@ - - + + @@ -22,25 +22,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file