diff --git a/App_Code/VERAG_VARIABLES.vb b/App_Code/VERAG_VARIABLES.vb index 77169af..ea351c8 100644 --- a/App_Code/VERAG_VARIABLES.vb +++ b/App_Code/VERAG_VARIABLES.vb @@ -22,9 +22,9 @@ Public Class VERAG_VARIABLES End Function Shared Function getiterationnumber() As Integer If HttpContext.Current.Request.ServerVariables("SERVER_NAME") = "localhost" Then - Return RandomInteger(Math.Pow(2, 2), (0.35 * GetCpuSpeed())) + Return RandomInteger(Math.Pow(2, 2), (0.55 * GetCpuSpeed())) Else - Return RandomInteger(Math.Pow(2, 5), (0.34 * GetCpuSpeed())) + Return RandomInteger(Math.Pow(2, 3), (0.57 * GetMaxCpuSpeed())) End If End Function @@ -55,7 +55,7 @@ Public Class VERAG_VARIABLES If HttpContext.Current.Request.ServerVariables("SERVER_NAME") = "localhost" Then 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, 3) Argon.MemorySize = (((nIterations * 19.98 - (nIterations * 10.23) / 14 * 2) / 4.058) + 1 * 190) Return Argon.GetBytes(nHash) diff --git a/Customers/SDL/Formtemplate EcoTAX.aspx b/Customers/SDL/Formtemplate EcoTAX.aspx index 5aaf7ca..7060fbf 100644 --- a/Customers/SDL/Formtemplate EcoTAX.aspx +++ b/Customers/SDL/Formtemplate EcoTAX.aspx @@ -151,27 +151,19 @@ return pArr[1]; //return value } } - var param1 = getParamValue('Kennzeichen'); - var param2 = getParamValue('CustomerID'); - var param3 = getParamValue('CardNo'); - var param4 = getParamValue('CustomerNo'); - var param5 = getParamValue('SDLNr'); - var param6 = getParamValue('History'); + var param1 = getParamValue('Kennzeichen'); + var param2 = getParamValue('CardNo'); + + $('txt_ClientNr').val(param1); + detailtabelle(param1,param2) + //alert(param1) + + function detailtabelle(id,CardNumber) { + // alert("Testdata:" + id) - $('txt_ClientNr').val(param1); - detailtabelle(param1, param2, param3, param4, param5, param6); - //alert(param1) - - function detailtabelle(id, CustomerID, Cardnummer, CustomerNo, SDLNr, History) { - // alert("Testdata:" + id) - - let data = {}; - data['Kennzeichen'] = id; - data['Kundennr'] = CustomerID; - data['CardNo'] = Cardnummer; - data['CustomerNo'] = CustomerNo; - data['SDLNr'] = SDLNr; - data['History'] = History; + let data = {}; + data['Kennzeichen'] = id; + data['CardNo'] = CardNumber; $.ajax({ type: "POST", diff --git a/Customers/SDL/Formtemplate FRESJUS_Tunnelkarte.aspx b/Customers/SDL/Formtemplate FRESJUS_Tunnelkarte.aspx index 943b30b..30c83fc 100644 --- a/Customers/SDL/Formtemplate FRESJUS_Tunnelkarte.aspx +++ b/Customers/SDL/Formtemplate FRESJUS_Tunnelkarte.aspx @@ -131,27 +131,19 @@ return pArr[1]; //return value } } - var param1 = getParamValue('Kennzeichen'); - var param2 = getParamValue('CustomerID'); - var param3 = getParamValue('CardNo'); - var param4 = getParamValue('CustomerNo'); - var param5 = getParamValue('SDLNr'); - var param6 = getParamValue('History'); + var param1 = getParamValue('Kennzeichen'); + var param2 = getParamValue('CardNo'); + + $('txt_ClientNr').val(param1); + detailtabelle(param1,param2); + alert(param1) + + function detailtabelle(id,CardNumber) { + // alert("Testdata:" + id) - $('txt_ClientNr').val(param1); - detailtabelle(param1, param2, param3, param4, param5, param6); - //alert(param1) - - function detailtabelle(id, CustomerID, Cardnummer, CustomerNo, SDLNr, History) { - // alert("Testdata:" + id) - - let data = {}; - data['Kennzeichen'] = id; - data['Kundennr'] = CustomerID; - data['CardNo'] = Cardnummer; - data['CustomerNo'] = CustomerNo; - data['SDLNr'] = SDLNr; - data['History'] = History; + let data = {}; + data['Kennzeichen'] = id; + data['CardNo'] = CardNumber; $.ajax({ type: "POST", diff --git a/Customers/SDL/Formtemplate IDS Tankkarte.aspx b/Customers/SDL/Formtemplate IDS Tankkarte.aspx index eb1b214..df4657a 100644 --- a/Customers/SDL/Formtemplate IDS Tankkarte.aspx +++ b/Customers/SDL/Formtemplate IDS Tankkarte.aspx @@ -135,9 +135,13 @@ function detailtabelle(id, CardNo) { // alert("Testdata:" + id) - let data = {}; - data['Kennzeichen'] = id; - data['CardNo'] = CardNo; + let data = {}; + data['Kennzeichen'] = id; + data['Kundennr'] = CustomerID; + data['CardNo'] = Cardnummer; + data['CustomerNo'] = CustomerNo; + data['SDLNr'] = SDLNr; + data['History'] = History; $.ajax({ type: "POST", diff --git a/Customers/SDL/Formtemplate MAN Abgaspalette.aspx b/Customers/SDL/Formtemplate MAN Abgaspalette.aspx index 777106e..616e714 100644 --- a/Customers/SDL/Formtemplate MAN Abgaspalette.aspx +++ b/Customers/SDL/Formtemplate MAN Abgaspalette.aspx @@ -105,27 +105,19 @@ return pArr[1]; //return value } } - var param1 = getParamValue('Kennzeichen'); - var param2 = getParamValue('CustomerID'); - var param3 = getParamValue('CardNo'); - var param4 = getParamValue('CustomerNo'); - var param5 = getParamValue('SDLNr'); - var param6 = getParamValue('History'); + var param1 = getParamValue('Kennzeichen'); + var param2 = getParamValue('CardNo'); + + $('txt_ClientNr').val(param1); + detailtabelle(param1,param2) + //alert(param1) + + function detailtabelle(id, CardNo) { + // alert("Testdata:" + id) - $('txt_ClientNr').val(param1); - detailtabelle(param1, param2, param3, param4, param5, param6); - //alert(param1) - - function detailtabelle(id, CustomerID, Cardnummer, CustomerNo, SDLNr, History) { - // alert("Testdata:" + id) - - let data = {}; + let data = {}; data['Kennzeichen'] = id; - data['Kundennr'] = CustomerID; - data['CardNo'] = Cardnummer; - data['CustomerNo'] = CustomerNo; - data['SDLNr'] = SDLNr; - data['History'] = History; + data['CardNo'] = CardNo; $.ajax({ type: "POST", diff --git a/Customers/SDL/Formtemplate MultiBox_EcoTAX.aspx b/Customers/SDL/Formtemplate MultiBox_EcoTAX.aspx index e5742c5..6a4efef 100644 --- a/Customers/SDL/Formtemplate MultiBox_EcoTAX.aspx +++ b/Customers/SDL/Formtemplate MultiBox_EcoTAX.aspx @@ -151,27 +151,19 @@ return pArr[1]; //return value } } - var param1 = getParamValue('Kennzeichen'); - var param2 = getParamValue('CustomerID'); - var param3 = getParamValue('CardNo'); - var param4 = getParamValue('CustomerNo'); - var param5 = getParamValue('SDLNr'); - var param6 = getParamValue('History'); + var param1 = getParamValue('Kennzeichen'); + var param2 = getParamValue('CardNo'); + + $('txt_ClientNr').val(param1); + detailtabelle(param1, CardNumber) + //alert(param1) + + function detailtabelle(id, CardNumber) { + // alert("Testdata:" + id) - $('txt_ClientNr').val(param1); - detailtabelle(param1, param2, param3, param4, param5, param6); - //alert(param1) + let data = {}; + data['Kennzeichen'] = id; - function detailtabelle(id, CustomerID, Cardnummer, CustomerNo, SDLNr, History) { - // alert("Testdata:" + id) - - let data = {}; - data['Kennzeichen'] = id; - data['Kundennr'] = CustomerID; - data['CardNo'] = Cardnummer; - data['CustomerNo'] = CustomerNo; - data['SDLNr'] = SDLNr; - data['History'] = History; $.ajax({ type: "POST", url: "Formtemplate MultiBox_EcoTAX.aspx/filltabledetails", diff --git a/Customers/SDL/Formtemplate Plose.aspx b/Customers/SDL/Formtemplate Plose.aspx index e36050b..f08c601 100644 --- a/Customers/SDL/Formtemplate Plose.aspx +++ b/Customers/SDL/Formtemplate Plose.aspx @@ -142,27 +142,19 @@ return pArr[1]; //return value } } - var param1 = getParamValue('Kennzeichen'); - var param2 = getParamValue('CustomerID'); - var param3 = getParamValue('CardNo'); - var param4 = getParamValue('CustomerNo'); - var param5 = getParamValue('SDLNr'); - var param6 = getParamValue('History'); + var param1 = getParamValue('Kennzeichen'); + var param2 = getParamValue('CardNo'); + + $('txt_ClientNr').val(param1); + detailtabelle(param1, param2) + // alert(param1) + + function detailtabelle(id, CardNumber) { + // alert("Testdata:" + id) - $('txt_ClientNr').val(param1); - detailtabelle(param1, param2, param3, param4, param5, param6); - //alert(param1) - - function detailtabelle(id, CustomerID, Cardnummer, CustomerNo, SDLNr, History) { - // alert("Testdata:" + id) - - let data = {}; - data['Kennzeichen'] = id; - data['Kundennr'] = CustomerID; - data['CardNo'] = Cardnummer; - data['CustomerNo'] = CustomerNo; - data['SDLNr'] = SDLNr; - data['History'] = History; + let data = {}; + data['Kennzeichen'] = id; + data['CardNo'] = CardNumber; $.ajax({ type: "POST", diff --git a/Customers/SDL/Formtemplate VERAG_Card.aspx b/Customers/SDL/Formtemplate VERAG_Card.aspx index 8f1cd87..e8e2e65 100644 --- a/Customers/SDL/Formtemplate VERAG_Card.aspx +++ b/Customers/SDL/Formtemplate VERAG_Card.aspx @@ -154,27 +154,19 @@ return pArr[1]; //return value } } - var param1 = getParamValue('Kennzeichen'); - var param2 = getParamValue('CustomerID'); - var param3 = getParamValue('CardNo'); - var param4 = getParamValue('CustomerNo'); - var param5 = getParamValue('SDLNr'); - var param6 = getParamValue('History'); + var param1 = getParamValue('Kennzeichen'); + var param2 = getParamValue('Kennzeichen'); + + $('txt_ClientNr').val(param1); + detailtabelle(param1) + //alert(param1) + + function detailtabelle(id,CardNumber) { + // alert("Testdata:" + id) - $('txt_ClientNr').val(param1); - detailtabelle(param1, param2, param3, param4, param5, param6); - //alert(param1) - - function detailtabelle(id, CustomerID, Cardnummer, CustomerNo, SDLNr, History) { - // alert("Testdata:" + id) - - let data = {}; - data['Kennzeichen'] = id; - data['Kundennr'] = CustomerID; - data['CardNo'] = Cardnummer; - data['CustomerNo'] = CustomerNo; - data['SDLNr'] = SDLNr; - data['History'] = History; + let data = {}; + data['Kennzeichen'] = id; + data['CardNo'] = CardNumber; $.ajax({ type: "POST", diff --git a/Customers/SDL/MAUT/Formtemplate HU_HUGO.aspx b/Customers/SDL/MAUT/Formtemplate HU_HUGO.aspx index d3c2bb7..efb505f 100644 --- a/Customers/SDL/MAUT/Formtemplate HU_HUGO.aspx +++ b/Customers/SDL/MAUT/Formtemplate HU_HUGO.aspx @@ -143,29 +143,20 @@ return pArr[1]; //return value } } - var param1 = getParamValue('Kennzeichen'); - var param2 = getParamValue('CustomerID'); - var param3 = getParamValue('CardNo'); - var param4 = getParamValue('CustomerNo'); - var param5 = getParamValue('SDLNr'); - var param6 = getParamValue('History'); - + var param1 = getParamValue('Kennzeichen'); + var param2 = getParamValue('CardNr'); $('txt_ClientNr').val(param1); - detailtabelle(param1, param2, param3, param4, param5, param6); - //alert(param1) + detailtabelle(param1,param2) + alert(param2) + + function detailtabelle(id,cardnumber) { + // alert("Testdata:" + id) - function detailtabelle(id, CustomerID, Cardnummer, CustomerNo, SDLNr, History) { - // alert("Testdata:" + id) - - let data = {}; - data['Kennzeichen'] = id; - data['Kundennr'] = CustomerID; - data['CardNo'] = Cardnummer; - data['CustomerNo'] = CustomerNo; - data['SDLNr'] = SDLNr; - data['History'] = History; + let data = {}; + data['Kennzeichen'] = id; + data['CardNo'] = cardnumber; $.ajax({ type: "POST", diff --git a/Customers/SDL/MAUT/Formtemplate IT_Plose.aspx b/Customers/SDL/MAUT/Formtemplate IT_Plose.aspx index 83edf0c..33e5d31 100644 --- a/Customers/SDL/MAUT/Formtemplate IT_Plose.aspx +++ b/Customers/SDL/MAUT/Formtemplate IT_Plose.aspx @@ -148,28 +148,19 @@ return pArr[1]; //return value } } - var param1 = getParamValue('Kennzeichen'); - var param2 = getParamValue('CustomerID'); - var param3 = getParamValue('CardNo'); - var param4 = getParamValue('CustomerNo'); - var param5 = getParamValue('SDLNr'); - var param6 = getParamValue('History'); + var param1 = getParamValue('Kennzeichen'); + var param2 = getParamValue('CardNr'); $('txt_ClientNr').val(param1); - detailtabelle(param1, param2, param3, param4, param5, param6); - //alert(param1) - - function detailtabelle(id, CustomerID, Cardnummer, CustomerNo, SDLNr, History) { + detailtabelle(param1) + //alert(param1) + + function detailtabelle(id, CardNumber) { // alert("Testdata:" + id) - let data = {}; - data['Kennzeichen'] = id; - data['Kundennr'] = CustomerID; - data['CardNo'] = Cardnummer; - data['CustomerNo'] = CustomerNo; - data['SDLNr'] = SDLNr; - data['History'] = History; - + let data = {}; + data['Kennzeichen'] = id; + data['CardNo'] = CardNumber; $.ajax({ type: "POST", url: "Formtemplate IT_Plose.aspx/filltabledetails", diff --git a/Customers/SDL/MAUT/Formtemplate MAUT IT.aspx b/Customers/SDL/MAUT/Formtemplate MAUT IT.aspx index 45e3199..a0bc704 100644 --- a/Customers/SDL/MAUT/Formtemplate MAUT IT.aspx +++ b/Customers/SDL/MAUT/Formtemplate MAUT IT.aspx @@ -149,27 +149,18 @@ return pArr[1]; //return value } } - var param1 = getParamValue('Kennzeichen'); - var param2 = getParamValue('CustomerID'); - var param3 = getParamValue('CardNo'); - var param4 = getParamValue('CustomerNo'); - var param5 = getParamValue('SDLNr'); - var param6 = getParamValue('History'); + var param1 = getParamValue('Kennzeichen'); + var param2 = getParamValue('CardNo'); $('txt_ClientNr').val(param1); - detailtabelle(param1, param2, param3, param4, param5, param6); + detailtabelle(param1,param2) //alert(param1) - function detailtabelle(param1, param2, param3, param4, param5, param6) { + function detailtabelle(id, Cardnumber) { // alert("Testdata:" + id) let data = {}; data['Kennzeichen'] = id; - data['Kundennr'] = CustomerID; - data['CardNo'] = Cardnummer; - data['CustomerNo'] = CustomerNo; - data['SDLNr'] = SDLNr; - data['History'] = History; $.ajax({ type: "POST", diff --git a/Customers/SDL/MAUT/Formtemplate MAUT_CZ_Plose.aspx b/Customers/SDL/MAUT/Formtemplate MAUT_CZ_Plose.aspx index 72b198f..b10ceac 100644 --- a/Customers/SDL/MAUT/Formtemplate MAUT_CZ_Plose.aspx +++ b/Customers/SDL/MAUT/Formtemplate MAUT_CZ_Plose.aspx @@ -132,28 +132,19 @@ return pArr[1]; //return value } } - var param1 = getParamValue('Kennzeichen'); - var param2 = getParamValue('CustomerID'); - var param3 = getParamValue('CardNo'); - var param4 = getParamValue('CustomerNo'); - var param5 = getParamValue('SDLNr'); - var param6 = getParamValue('History'); - + var param1 = getParamValue('Kennzeichen'); + var param2 = getParamValue('CardNo'); $('txt_ClientNr').val(param1); - detailtabelle(param1, param2, param3, param4, param5, param6); - //alert(param1) + detailtabelle(param1,param2) + alert(param1) - function detailtabelle(id, CustomerID, Cardnummer, CustomerNo, SDLNr, History) { + function detailtabelle(id, Cardnummer) { // alert("Testdata:" + id) - let data = {}; - data['Kennzeichen'] = id; - data['Kundennr'] = CustomerID; - data['CardNo'] = Cardnummer; - data['CustomerNo'] = CustomerNo; - data['SDLNr'] = SDLNr; - data['History'] = History; + let data = {}; + data['Kennzeichen'] = id; + data['CardNo'] = Cardnummer; $.ajax({ type: "POST", diff --git a/Customers/SDL/MAUT/Formtemplate Maut_PL.aspx b/Customers/SDL/MAUT/Formtemplate Maut_PL.aspx index 7c44a9c..5fef328 100644 --- a/Customers/SDL/MAUT/Formtemplate Maut_PL.aspx +++ b/Customers/SDL/MAUT/Formtemplate Maut_PL.aspx @@ -136,27 +136,19 @@ return pArr[1]; //return value } } - var param1 = getParamValue('Kennzeichen'); - var param2 = getParamValue('CustomerID'); - var param3 = getParamValue('CardNo'); - var param4 = getParamValue('CustomerNo'); - var param5 = getParamValue('SDLNr'); - var param6 = getParamValue('History'); + var param1 = getParamValue('Kennzeichen'); + var param2 = getParamValue('CardNo'); + + $('txt_ClientNr').val(param1); + detailtabelle(param1,param2) + //alert(param1) + + function detailtabelle(id,CardNumber) { + // alert("Testdata:" + id) - $('txt_ClientNr').val(param1); - detailtabelle(param1, param2, param3, param4, param5, param6); - //alert(param1) - - function detailtabelle(id, CustomerID, Cardnummer, CustomerNo, SDLNr, History) { - // alert("Testdata:" + id) - - let data = {}; - data['Kennzeichen'] = id; - data['Kundennr'] = CustomerID; - data['CardNo'] = Cardnummer; - data['CustomerNo'] = CustomerNo; - data['SDLNr'] = SDLNr; - data['History'] = History; + let data = {}; + data['Kennzeichen'] = id; + data['CardNo'] = CardNumber; $.ajax({ type: "POST", diff --git a/Customers/SDL/MAUT/FormtemplateMAUT_DE_Toll Collect.aspx b/Customers/SDL/MAUT/FormtemplateMAUT_DE_Toll Collect.aspx index c78de4d..232e944 100644 --- a/Customers/SDL/MAUT/FormtemplateMAUT_DE_Toll Collect.aspx +++ b/Customers/SDL/MAUT/FormtemplateMAUT_DE_Toll Collect.aspx @@ -140,27 +140,19 @@ return pArr[1]; //return value } } - var param1 = getParamValue('Kennzeichen'); - var param2 = getParamValue('CustomerID'); - var param3 = getParamValue('CardNo'); - var param4 = getParamValue('CustomerNo'); - var param5 = getParamValue('SDLNr'); - var param6 = getParamValue('History'); + var param1 = getParamValue('Kennzeichen'); + var param2 = getParamValue('CardNo'); + + $('txt_ClientNr').val(param1); + detailtabelle(param1, param2); + //alert(param1) + + function detailtabelle(id, CardNo) { + // alert("Testdata:" + id) - $('txt_ClientNr').val(param1); - detailtabelle(param1, param2, param3, param4, param5, param6); - //alert(param1) - - function detailtabelle(id, CustomerID, Cardnummer, CustomerNo, SDLNr, History) { - // alert("Testdata:" + id) - - let data = {}; - data['Kennzeichen'] = id; - data['Kundennr'] = CustomerID; - data['CardNo'] = Cardnummer; - data['CustomerNo'] = CustomerNo; - data['SDLNr'] = SDLNr; - data['History'] = History; + let data = {}; + data['Kennzeichen'] = id; + data['CardNo'] = CardNo; $.ajax({ type: "POST", diff --git a/Customers/SDL/MAUT/FormtemplateMAUT_MSECard.aspx b/Customers/SDL/MAUT/FormtemplateMAUT_MSECard.aspx index e73185e..dd7cc37 100644 --- a/Customers/SDL/MAUT/FormtemplateMAUT_MSECard.aspx +++ b/Customers/SDL/MAUT/FormtemplateMAUT_MSECard.aspx @@ -144,27 +144,19 @@ return pArr[1]; //return value } } - var param1 = getParamValue('Kennzeichen'); - var param2 = getParamValue('CustomerID'); - var param3 = getParamValue('CardNo'); - var param4 = getParamValue('CustomerNo'); - var param5 = getParamValue('SDLNr'); - var param6 = getParamValue('History'); + var param1 = getParamValue('Kennzeichen'); + var param2 = getParamValue('CardNo'); + + $('txt_ClientNr').val(param1); + detailtabelle(param1,param2) + //alert(param1) + + function detailtabelle(id,cardno) { + // alert("Testdata:" + id) - $('txt_ClientNr').val(param1); - detailtabelle(param1, param2, param3, param4, param5, param6); - //alert(param1) - - function detailtabelle(id, CustomerID, Cardnummer, CustomerNo, SDLNr, History) { - // alert("Testdata:" + id) - - let data = {}; - data['Kennzeichen'] = id; - data['Kundennr'] = CustomerID; - data['CardNo'] = Cardnummer; - data['CustomerNo'] = CustomerNo; - data['SDLNr'] = SDLNr; - data['History'] = History; + let data = {}; + data['Kennzeichen'] = id; + data['CardNo'] = cardno; $.ajax({ type: "POST", diff --git a/Customers/SDL/MAUT/Formtemplate_MAUT_AT GoBox.aspx b/Customers/SDL/MAUT/Formtemplate_MAUT_AT GoBox.aspx index c796457..da54fea 100644 --- a/Customers/SDL/MAUT/Formtemplate_MAUT_AT GoBox.aspx +++ b/Customers/SDL/MAUT/Formtemplate_MAUT_AT GoBox.aspx @@ -157,27 +157,19 @@ return pArr[1]; //return value } } - var param1 = getParamValue('Kennzeichen'); - var param2 = getParamValue('CustomerID'); - var param3 = getParamValue('CardNo'); - var param4 = getParamValue('CustomerNo'); - var param5 = getParamValue('SDLNr'); - var param6 = getParamValue('History'); + var param1 = getParamValue('Kennzeichen'); + var param2 = getParamValue('CardNo'); + + $('txt_ClientNr').val(param1); + detailtabelle(param1,Cardnummer) + //alert(param1) + + function detailtabelle(id,Cardnumber) { + // alert("Testdata:" + id) - $('txt_ClientNr').val(param1); - detailtabelle(param1, param2, param3, param4, param5, param6); - //alert(param1) - - function detailtabelle(id, CustomerID, Cardnummer, CustomerNo, SDLNr, History) { - // alert("Testdata:" + id) - - let data = {}; - data['Kennzeichen'] = id; - data['Kundennr'] = CustomerID; - data['CardNo'] = Cardnummer; - data['CustomerNo'] = CustomerNo; - data['SDLNr'] = SDLNr; - data['History'] = History; + let data = {}; + data['Kennzeichen'] = id; + data['CardNo'] = Cardnumber; $.ajax({ type: "POST", url: "Formtemplate_MAUT_AT GoBox.aspx/filltabledetails", diff --git a/login/login_FLEX.aspx.vb b/login/login_FLEX.aspx.vb index e7d6c1c..7a13041 100644 --- a/login/login_FLEX.aspx.vb +++ b/login/login_FLEX.aspx.vb @@ -22,11 +22,11 @@ Partial Class login_FLEX Try Dim teststr = String.Empty If HttpContext.Current.Request.ServerVariables("SERVER_NAME") = "localhost" Then - intzahliterats = VERAG_VARIABLES.RandomInteger(Math.Pow(2, 8), Math.Pow(2, 17)) - teststr = Await TestPerformance.TestHashrateServerAsync(0.052 * VERAG_VARIABLES.GetCpuSpeed()) + intzahliterats = VERAG_VARIABLES.RandomInteger(Math.Pow(2, 4), Math.Pow(2, 13)) + teststr = Await TestPerformance.TestHashrateServerAsync(0.02 * VERAG_VARIABLES.GetCpuSpeed()) Else - intzahliterats = VERAG_VARIABLES.RandomInteger(Math.Pow(2, 8), Math.Pow(2, 17)) - teststr = Await TestPerformance.TestHashrateServerAsync(0.052 * VERAG_VARIABLES.GetCpuSpeed()) + intzahliterats = VERAG_VARIABLES.RandomInteger(Math.Pow(2, 4), Math.Pow(2, 13)) + teststr = Await TestPerformance.TestHashrateServerAsync(0.02 * VERAG_VARIABLES.GetCpuSpeed()) End If If String.Equals(teststr, String.Empty) = False Then intzahliterats = VERAG_VARIABLES.getiterationnumber @@ -217,7 +217,7 @@ Partial Class login_FLEX End If If String.Equals(tb3.Text, dr("Password")) = True Then - intzahl = VERAG_VARIABLES.RandomInteger(VERAG_VARIABLES.RandomInteger(95, 200), 0.2 * VERAG_VARIABLES.GetCpuSpeed()) + intzahl = VERAG_VARIABLES.RandomInteger(VERAG_VARIABLES.RandomInteger(95, 200), 0.6 * VERAG_VARIABLES.GetCpuSpeed()) salt = VERAG_VARIABLES.GenerateSalt(intzahl) Dim hashpw As Byte() = Await VERAG_VARIABLES.HashPasswordAsync(passw, salt, intzahliterats, intzahl) If Await VERAG_VARIABLES.VerifyhashAsync(dr("Password").ToString, salt, hashpw, intzahliterats, intzahl) = True Then