Bläddra i källkod

Increase default EncryptionKDFIterations by 10% to 220000.

Martijn Laan 2 månader sedan
förälder
incheckning
302bdac71c
2 ändrade filer med 3 tillägg och 3 borttagningar
  1. 2 2
      ISHelp/isetup.xml
  2. 1 1
      Projects/Src/Compiler.SetupCompiler.pas

+ 2 - 2
ISHelp/isetup.xml

@@ -5844,10 +5844,10 @@ DiskSliceSize=1457664
 <keyword value="pbkdf2" />
 <keyword value="pbkdf2" />
 <setupvalid><tt>pbkdf2</tt><br/>
 <setupvalid><tt>pbkdf2</tt><br/>
 <tt>pbkdf2/1</tt> through <tt>pbkdf2/2147483647</tt></setupvalid>
 <tt>pbkdf2/1</tt> through <tt>pbkdf2/2147483647</tt></setupvalid>
-<setupdefault><tt>pbkdf2/200000</tt></setupdefault>
+<setupdefault><tt>pbkdf2/220000</tt></setupdefault>
 <body>
 <body>
 <p>This specifies the key derivation function to use to derive the encryption key from the value of <link topic="setup_password">Password</link>, and optionally its parameters.</p>
 <p>This specifies the key derivation function to use to derive the encryption key from the value of <link topic="setup_password">Password</link>, and optionally its parameters.</p>
-<p><tt>pbkdf2</tt> is the PBKDF2-HMAC-SHA256 function with a 128-bit random salt, and optionally allows to increase its number of iterations for extra security. If the number of iterations isn't specified, it defaults to 200000.</p>
+<p><tt>pbkdf2</tt> is the PBKDF2-HMAC-SHA256 function with a 128-bit random salt, and optionally allows to increase its number of iterations for extra security. If the number of iterations isn't specified, it defaults to 220000.</p>
 <p><b>See also:</b><br/>
 <p><b>See also:</b><br/>
 <link topic="setup_encryption">Encryption</link>
 <link topic="setup_encryption">Encryption</link>
 </p>
 </p>

+ 1 - 1
Projects/Src/Compiler.SetupCompiler.pas

@@ -7715,7 +7715,7 @@ begin
     NotRecognizedMessagesWarning := True;
     NotRecognizedMessagesWarning := True;
     UsedUserAreasWarning := True;
     UsedUserAreasWarning := True;
     SetupHeader.WizardStyle := wsClassic;
     SetupHeader.WizardStyle := wsClassic;
-    SetupHeader.EncryptionKDFIterations := 200000;
+    SetupHeader.EncryptionKDFIterations := 220000;
 
 
     { Read [Setup] section }
     { Read [Setup] section }
     EnumIniSection(EnumSetupProc, 'Setup', 0, True, True, '', False, False);
     EnumIniSection(EnumSetupProc, 'Setup', 0, True, True, '', False, False);