diff options
author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2017-07-09 10:46:01 +0200 |
---|---|---|
committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2017-07-09 10:49:32 +0200 |
commit | 6358b00b69a355aecbd1fcfcedbd1a175009a3a4 (patch) | |
tree | d99a403b43b8f378c45e731f1f9bd9f49dc4233d /doc | |
parent | 3f36836a3b27b6d591de148269557eb518acb193 (diff) | |
download | VeraCrypt-6358b00b69a355aecbd1fcfcedbd1a175009a3a4.tar.gz VeraCrypt-6358b00b69a355aecbd1fcfcedbd1a175009a3a4.zip |
Windows: continue fix documentation about iteration calculation formula for key derivation
Diffstat (limited to 'doc')
-rw-r--r-- | doc/chm/VeraCrypt User Guide.chm | bin | 1890543 -> 1890569 bytes | |||
-rw-r--r-- | doc/html/Header Key Derivation.html | 4 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/chm/VeraCrypt User Guide.chm b/doc/chm/VeraCrypt User Guide.chm Binary files differindex a6d59563..c64942f5 100644 --- a/doc/chm/VeraCrypt User Guide.chm +++ b/doc/chm/VeraCrypt User Guide.chm diff --git a/doc/html/Header Key Derivation.html b/doc/html/Header Key Derivation.html index 1a6a9c72..b9454cd0 100644 --- a/doc/html/Header Key Derivation.html +++ b/doc/html/Header Key Derivation.html @@ -70,8 +70,8 @@ PIM </a>value is not specified or if it is equal to zero, VeraCrypt uses the def <p>When a <a href="Personal%20Iterations%20Multiplier%20%28PIM%29.html"> PIM </a>value is given by the user, the number of iterations of the key derivation function is calculated as follows:</p> <ul> -<li>For system partition encryption (boot encryption): Iterations = <strong>PIM x 2048</strong> -</li><li>For standard containers and other partitions: Iterations = <strong>15000 + (PIM x 1000)</strong> +<li>For system encryption that doesn't use SHA-512 or Whirlpool: Iterations = <strong>PIM x 2048</strong> +</li><li>For system encryption that uses SHA-512 or Whirlpool, non-system encryption and file containers: Iterations = <strong>15000 + (PIM x 1000)</strong> </li></ul> </div> <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px"> |