Weitere Daten werden für eine zukünftige Detailansicht mitgeschickt bzw zum Transport an die Weboberfläche vom Server vorbereitet(noch nicht geschickt!). Auch die Performance der Hash-Rate wird erneut angepasst (auch in Excel in der Formel).

App_Code/TestPerformance.vb

@@ -129,7 +129,7 @@ Public Class TestPerformance
 
         For zahl As Integer = 0 To zahlint
             sw1.Start()
-            hashsalts.Add(VERAG_VARIABLES.GenerateSalt(VERAG_VARIABLES.RandomInteger(Math.Pow(2, 4), Math.Pow(2, 6))))
+            hashsalts.Add(VERAG_VARIABLES.GenerateSalt(VERAG_VARIABLES.RandomInteger(95, Math.Pow(2, 10))))
             arrzahl_iterats.Add(VERAG_VARIABLES.getiterationnumber)
             arrzahl.Add(zahlint)
             sw1.Stop()
@@ -178,9 +178,9 @@ Public Class TestPerformance
         For zahl As Integer = 0 To zahlint
             sw1.Start()
             If HttpContext.Current.Request.ServerVariables("SERVER_NAME") = "localhost" Then
-                hashsalts.Add(VERAG_VARIABLES.GenerateSalt(VERAG_VARIABLES.RandomInteger(Math.Pow(2, 4), Math.Pow(2, 8))))
+                hashsalts.Add(VERAG_VARIABLES.GenerateSalt(VERAG_VARIABLES.RandomInteger(95, Math.Pow(2, 10))))
             Else
-                hashsalts.Add(VERAG_VARIABLES.GenerateSalt(VERAG_VARIABLES.RandomInteger(Math.Pow(2, 6), Math.Pow(2, 10))))
+                hashsalts.Add(VERAG_VARIABLES.GenerateSalt(VERAG_VARIABLES.RandomInteger(95, Math.Pow(2, 10))))
             End If
             arrzahl_iterats.Add(VERAG_VARIABLES.getiterationnumber)
             arrzahl.Add(zahlint)

App_Code/VERAG_VARIABLES.vb

@@ -9,7 +9,7 @@ Public Class VERAG_VARIABLES
         If HttpContext.Current.Request.ServerVariables("SERVER_NAME") = "localhost" Then
             Return RandomInteger(Math.Pow(2, 4), Math.Pow(2, 6))
         Else
-            Return RandomInteger(Math.Pow(2, 8), Math.Pow(2, 10))
+            Return RandomInteger(Math.Pow(2, 4), Math.Pow(2, 9))
         End If
     End Function
 
@@ -48,9 +48,9 @@ Public Class VERAG_VARIABLES
         Else
             Dim Argon As Argon2id = New Argon2id(Encoding.UTF8.GetBytes(VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(password)))
             Argon.Salt = salt
-            Argon.DegreeOfParallelism = 8
+            Argon.DegreeOfParallelism = 28
             Argon.Iterations = nIterations * VERAG_VARIABLES.RandomInteger(2, 7)
-            Argon.MemorySize = (((nIterations * 8.685 - (nIterations * 0.56) / 1.85 * 2.28) / 10.28) + 1.024 * 416)
+            Argon.MemorySize = (((nIterations * 19.685 - (nIterations * 0.56) / 1.85 * 2.28) / 10.28) + 1.024 * 416)
             Return Argon.GetBytes(nHash)
         End If
 
@@ -69,9 +69,9 @@ Public Class VERAG_VARIABLES
         Else
             Dim Argon As Argon2id = New Argon2id(Encoding.UTF8.GetBytes(VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(password)))
             Argon.Salt = salt
-            Argon.DegreeOfParallelism = 18
+            Argon.DegreeOfParallelism = 38
             Argon.Iterations = nIterations * VERAG_VARIABLES.RandomInteger(2, 7)
-            Argon.MemorySize = (((nIterations * 24.685 - (nIterations * 0.56) / 1.85 * 2.28) / 10.28) + 1.024 * 416)
+            Argon.MemorySize = (((nIterations * 19.685 - (nIterations * 0.56) / 1.85 * 2.28) / 10.28) + 1.024 * 416)
             Return Await Argon.GetBytesAsync(nHash)
         End If
     End Function

Customers/LKWs.aspx.vb

@@ -419,7 +419,6 @@ Partial Class LKWS
         Private GueltigBis As String
         Private Kartnr As String
 
-
         Public Sub New(ByVal SDL As String, Bez As String, ByVal GueltigBis As String, ByVal KartNr As String)
             Me.SDLNr = SDL
             Me.Bez = Bez
@@ -438,6 +437,8 @@ Partial Class LKWS
 
         For Each l2 In list2
             Dim strtempKat As String = String.Empty
+            Dim strtempKartenNr As String = String.Empty
+            Dim strtempGueltigBis As String = String.Empty
             Dim strtempKaut As String = String.Empty
             Dim strtempArchivt As String = String.Empty
             Dim strtempBelegNr As String = String.Empty
@@ -450,8 +451,33 @@ Partial Class LKWS
             Dim strtempFlottenPIN As String = String.Empty
             Dim strtempFREJUS_CARD_Nr As String = String.Empty
             Dim strtempGestohlenAm As String = String.Empty
-            Dim strtempKartenNr As String = String.Empty
-            Dim strtempGueltigBis As String = String.Empty
+            Dim strtempLKWAbgemeldet As String = String.Empty
+            Dim strtempLKWAbgemeldetAM As String = String.Empty
+            Dim strtempLieferdatum As String = String.Empty
+            Dim strtempMasterPIN As String = String.Empty
+            Dim strtempMOTORWAY_CARD_Nr As String = String.Empty
+            Dim strtempMSE_Kd_Nr As String = String.Empty
+            Dim strtempOBUID As String = String.Empty
+            Dim strtempPAN_Nr As String = String.Empty
+            Dim strtempPartner As String = String.Empty
+            Dim strtempPIN As String = String.Empty
+            Dim strtempRefKundenNr As String = String.Empty
+            Dim strtempRetourniert As String = String.Empty
+            Dim strtempRetourniertAm As String = String.Empty
+            Dim strtempSachbearbeiter As String = String.Empty
+            Dim strtempSERIE_Nr As String = String.Empty
+            Dim strtempStatus As String = String.Empty
+            Dim strtempTelepassErsatzkarte As String = String.Empty
+            Dim strtempTelepassErsatzkarteAm As String = String.Empty
+            Dim strtempTELEPASS_Kd_Nr As String = String.Empty
+            Dim strtempTELEPASS_Nr As String = String.Empty
+            Dim strtempUmstellungsdatum As String = String.Empty
+            Dim strtempVerloren As String = String.Empty
+            Dim strtempVermerk As String = String.Empty
+            Dim strtempVertragsabschlussdatum As String = String.Empty
+            Dim strtempVertragsNr As String = String.Empty
+            Dim strtempVIACARD As String = String.Empty
+            Dim strtempAenderungsdatum As String = String.Empty
 
             If IsNothing(l2.Kategorie) = False Then
                 strtempKat = l2.Kategorie.ToString
@@ -498,25 +524,87 @@ Partial Class LKWS
             If IsNothing(l2.KartenNr) = False Then
                 strtempKartenNr = l2.KartenNr.ToString
             End If
-            If IsNothing(l2.hasentry) = False Then
-                strtempHasEntry = l2.hasentry.ToString
+            If IsNothing(l2.LKWAbgemeldet) = False Then
+                strtempLKWAbgemeldet = l2.LKWAbgemeldet.ToString
             End If
-            If IsNothing(l2.hasentry) = False Then
-                strtempHasEntry = l2.hasentry.ToString
+            If IsNothing(l2.LKWAbgemeldetAM) = False Then
+                strtempLKWAbgemeldetAM = l2.LKWAbgemeldetAM.ToString
             End If
-            If IsNothing(l2.hasentry) = False Then
-                strtempHasEntry = l2.hasentry.ToString
+            If IsNothing(l2.Lieferdatum) = False Then
+                strtempLieferdatum = l2.Lieferdatum.ToString
             End If
-            If IsNothing(l2.hasentry) = False Then
-                strtempHasEntry = l2.hasentry.ToString
+            If IsNothing(l2.MasterPIN) = False Then
+                strtempMasterPIN = l2.MasterPIN.ToString
             End If
-            If IsNothing(l2.hasentry) = False Then
-                strtempHasEntry = l2.hasentry.ToString
+            If IsNothing(l2.MOTORWAY_CARD_Nr) = False Then
+                strtempMOTORWAY_CARD_Nr = l2.MOTORWAY_CARD_Nr.ToString
             End If
-            If IsNothing(l2.hasentry) = False Then
-                strtempHasEntry = l2.hasentry.ToString
+            If IsNothing(l2.MSE_Kd_Nr) = False Then
+                strtempMSE_Kd_Nr = l2.MSE_Kd_Nr.ToString
+            End If
+            If IsNothing(l2.OBUID) = False Then
+                strtempOBUID = l2.OBUID.ToString
+            End If
+            If IsNothing(l2.PAN_Nr) = False Then
+                strtempPAN_Nr = l2.PAN_Nr.ToString
+            End If
+            If IsNothing(l2.Partner) = False Then
+                strtempPartner = l2.Partner.ToString
+            End If
+            If IsNothing(l2.PIN) = False Then
+                strtempPIN = l2.PIN.ToString
+            End If
+            If IsNothing(l2.RefKundenNr) = False Then
+                strtempRefKundenNr = l2.RefKundenNr.ToString
+            End If
+            If IsNothing(l2.Retourniert) = False Then
+                strtempRetourniert = l2.Retourniert.ToString
+            End If
+            If IsNothing(l2.RetourniertAm) = False Then
+                strtempRetourniertAm = l2.RetourniertAm.ToString
+            End If
+            If IsNothing(l2.Sachbearbeiter) = False Then
+                strtempSachbearbeiter = l2.Sachbearbeiter.ToString
+            End If
+            If IsNothing(l2.SERIE_Nr) = False Then
+                strtempSERIE_Nr = l2.SERIE_Nr.ToString
+            End If
+            If IsNothing(l2.Status) = False Then
+                strtempStatus = l2.Status.ToString
+            End If
+            If IsNothing(l2.TelepassErsatzkarte) = False Then
+                strtempTelepassErsatzkarte = l2.TelepassErsatzkarte.ToString
+            End If
+            If IsNothing(l2.TelepassErsatzkarteAm) = False Then
+                strtempTelepassErsatzkarteAm = l2.TelepassErsatzkarteAm.ToString
+            End If
+            If IsNothing(l2.TELEPASS_Kd_Nr) = False Then
+                strtempTELEPASS_Kd_Nr = l2.TELEPASS_Kd_Nr.ToString
+            End If
+            If IsNothing(l2.TELEPASS_Nr) = False Then
+                strtempTELEPASS_Nr = l2.TELEPASS_Nr.ToString
+            End If
+            If IsNothing(l2.Umstellungsdatum) = False Then
+                strtempUmstellungsdatum = l2.Umstellungsdatum.ToString
+            End If
+            If IsNothing(l2.Verloren) = False Then
+                strtempVerloren = l2.Verloren.ToString
+            End If
+            If IsNothing(l2.Vermerk) = False Then
+                strtempVermerk = l2.Vermerk.ToString
+            End If
+            If IsNothing(l2.Vertragsabschlussdatum) = False Then
+                strtempVertragsabschlussdatum = l2.Vertragsabschlussdatum.ToString
+            End If
+            If IsNothing(l2.VertragsNr) = False Then
+                strtempVertragsNr = l2.VertragsNr.ToString
+            End If
+            If IsNothing(l2.VIACARD) = False Then
+                strtempVIACARD = l2.VIACARD.ToString
+            End If
+            If IsNothing(l2.Änderungsdatum) = False Then
+                strtempAenderungsdatum = l2.Änderungsdatum.ToString
             End If
-
             Dim Entrytemp As New Entry(l2.SDLNr.ToString, strtempKat, strtempGueltigBis, strtempKartenNr)
             list.Add(Entrytemp)
         Next