Skip to content

Commit

Permalink
Script updating gh-pages from 901777b. [ci skip]
Browse files Browse the repository at this point in the history
  • Loading branch information
ID Bot committed Nov 3, 2024
1 parent 2060f63 commit 367f52b
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 21 deletions.
37 changes: 20 additions & 17 deletions draft-lucas-bkdf.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1292,49 +1292,52 @@ <h2 id="name-conventions-and-definitions">
<p id="section-2-4.1.1"><code>x++</code>: incrementing the integer <code>x</code> by 1 after it has been used in a function.<a href="#section-2-4.1.1" class="pilcrow"></a></p>
</li>
<li class="normal" id="section-2-4.2">
<p id="section-2-4.2.1"><code>a ^ b</code>: the bitwise XOR of <code>a</code> and <code>b</code>.<a href="#section-2-4.2.1" class="pilcrow"></a></p>
<p id="section-2-4.2.1"><code>x ** y</code>: integer <code>x</code> to the power of <code>y</code>.<a href="#section-2-4.2.1" class="pilcrow"></a></p>
</li>
<li class="normal" id="section-2-4.3">
<p id="section-2-4.3.1"><code>a % b</code>: the remainder when dividing <code>a</code> by <code>b</code>.<a href="#section-2-4.3.1" class="pilcrow"></a></p>
<p id="section-2-4.3.1"><code>x % y</code>: the remainder when dividing <code>x</code> by <code>y</code>.<a href="#section-2-4.3.1" class="pilcrow"></a></p>
</li>
<li class="normal" id="section-2-4.4">
<p id="section-2-4.4.1"><code>a || b</code>: the concatenation of <code>a</code> and <code>b</code>.<a href="#section-2-4.4.1" class="pilcrow"></a></p>
<p id="section-2-4.4.1"><code>a ^ b</code>: the bitwise XOR of <code>a</code> and <code>b</code>.<a href="#section-2-4.4.1" class="pilcrow"></a></p>
</li>
<li class="normal" id="section-2-4.5">
<p id="section-2-4.5.1"><code>a[i]</code>: index <code>i</code> of array <code>a</code>.<a href="#section-2-4.5.1" class="pilcrow"></a></p>
<p id="section-2-4.5.1"><code>a || b</code>: the concatenation of <code>a</code> and <code>b</code>.<a href="#section-2-4.5.1" class="pilcrow"></a></p>
</li>
<li class="normal" id="section-2-4.6">
<p id="section-2-4.6.1"><code>a.Length</code>: the length of <code>a</code> in bytes.<a href="#section-2-4.6.1" class="pilcrow"></a></p>
<p id="section-2-4.6.1"><code>a[i]</code>: index <code>i</code> of array <code>a</code>.<a href="#section-2-4.6.1" class="pilcrow"></a></p>
</li>
<li class="normal" id="section-2-4.7">
<p id="section-2-4.7.1"><code>a.Slice(i, l)</code>: the copy of <code>l</code> bytes from byte array <code>a</code>, starting at index <code>i</code>.<a href="#section-2-4.7.1" class="pilcrow"></a></p>
<p id="section-2-4.7.1"><code>a.Length</code>: the length of <code>a</code> in bytes.<a href="#section-2-4.7.1" class="pilcrow"></a></p>
</li>
<li class="normal" id="section-2-4.8">
<p id="section-2-4.8.1"><code>ByteArray(l)</code>: the creation of a new byte array with length <code>l</code>.<a href="#section-2-4.8.1" class="pilcrow"></a></p>
<p id="section-2-4.8.1"><code>a.Slice(i, l)</code>: the copy of <code>l</code> bytes from byte array <code>a</code>, starting at index <code>i</code>.<a href="#section-2-4.8.1" class="pilcrow"></a></p>
</li>
<li class="normal" id="section-2-4.9">
<p id="section-2-4.9.1"><code>BlockArray(n, l)</code>: the creation of a new array of arrays containing <code>n</code> byte arrays, each with length <code>l</code>.<a href="#section-2-4.9.1" class="pilcrow"></a></p>
<p id="section-2-4.9.1"><code>ByteArray(l)</code>: the creation of a new byte array with length <code>l</code>.<a href="#section-2-4.9.1" class="pilcrow"></a></p>
</li>
<li class="normal" id="section-2-4.10">
<p id="section-2-4.10.1"><code>PRF(k, m)</code>: the output of a collision-resistant PRF (e.g. HMAC-SHA512 <span>[<a href="#RFC2104" class="cite xref">RFC2104</a>]</span>) with key <code>k</code> and message <code>m</code>, both byte arrays. If the collision-resistant hash function supports a key parameter (e.g. BLAKE2b <span>[<a href="#RFC7693" class="cite xref">RFC7693</a>]</span>), that parameter <span class="bcp14">MUST</span> be used. Otherwise, if there is no key parameter (e.g. SHA-512 <span>[<a href="#RFC6234" class="cite xref">RFC6234</a>]</span>), you <span class="bcp14">MUST</span> perform prefix MAC and pad the key with zeros to the block size (1024 bits for SHA-512).<a href="#section-2-4.10.1" class="pilcrow"></a></p>
<p id="section-2-4.10.1"><code>BlockArray(n, l)</code>: the creation of a new array of arrays containing <code>n</code> byte arrays, each with length <code>l</code>.<a href="#section-2-4.10.1" class="pilcrow"></a></p>
</li>
<li class="normal" id="section-2-4.11">
<p id="section-2-4.11.1"><code>LE32(x)</code>: the little-endian encoding of unsigned 32-bit integer <code>x</code>.<a href="#section-2-4.11.1" class="pilcrow"></a></p>
<p id="section-2-4.11.1"><code>PRF(k, m)</code>: the output of a collision-resistant PRF (e.g. HMAC-SHA512 <span>[<a href="#RFC2104" class="cite xref">RFC2104</a>]</span>) with key <code>k</code> and message <code>m</code>, both byte arrays. If the collision-resistant hash function supports a key parameter (e.g. BLAKE2b <span>[<a href="#RFC7693" class="cite xref">RFC7693</a>]</span>), that parameter <span class="bcp14">MUST</span> be used. Otherwise, if there is no key parameter (e.g. SHA-512 <span>[<a href="#RFC6234" class="cite xref">RFC6234</a>]</span>), you <span class="bcp14">MUST</span> perform prefix MAC and pad the key with zeros to the block size (1024 bits for SHA-512).<a href="#section-2-4.11.1" class="pilcrow"></a></p>
</li>
<li class="normal" id="section-2-4.12">
<p id="section-2-4.12.1"><code>LE64(x)</code>: the little-endian encoding of unsigned 64-bit integer <code>x</code>.<a href="#section-2-4.12.1" class="pilcrow"></a></p>
<p id="section-2-4.12.1"><code>LE32(x)</code>: the little-endian encoding of unsigned 32-bit integer <code>x</code>.<a href="#section-2-4.12.1" class="pilcrow"></a></p>
</li>
<li class="normal" id="section-2-4.13">
<p id="section-2-4.13.1"><code>ReadLE32(a)</code>: the little-endian conversion of byte array <code>a</code> into an unsigned 32-bit integer.<a href="#section-2-4.13.1" class="pilcrow"></a></p>
<p id="section-2-4.13.1"><code>LE64(x)</code>: the little-endian encoding of unsigned 64-bit integer <code>x</code>.<a href="#section-2-4.13.1" class="pilcrow"></a></p>
</li>
<li class="normal" id="section-2-4.14">
<p id="section-2-4.14.1"><code>ZeroPad(a, n)</code>: byte array <code>a</code> padded with zeros until it is <code>n</code> bytes long. If <code>a</code> is already <code>n</code> bytes long, no padding is performed.<a href="#section-2-4.14.1" class="pilcrow"></a></p>
<p id="section-2-4.14.1"><code>ReadLE32(a)</code>: the little-endian conversion of byte array <code>a</code> into an unsigned 32-bit integer.<a href="#section-2-4.14.1" class="pilcrow"></a></p>
</li>
<li class="normal" id="section-2-4.15">
<p id="section-2-4.15.1"><code>Ceiling(x)</code>: the floating-point number <code>x</code> rounded up to the nearest whole number.<a href="#section-2-4.15.1" class="pilcrow"></a></p>
<p id="section-2-4.15.1"><code>ZeroPad(a, n)</code>: byte array <code>a</code> padded with zeros until it is <code>n</code> bytes long. If <code>a</code> is already <code>n</code> bytes long, no padding is performed.<a href="#section-2-4.15.1" class="pilcrow"></a></p>
</li>
<li class="normal" id="section-2-4.16">
<p id="section-2-4.16.1"><code>UTF8(s)</code>: the UTF-8 <span>[<a href="#RFC3629" class="cite xref">RFC3629</a>]</span> encoding of string <code>s</code>.<a href="#section-2-4.16.1" class="pilcrow"></a></p>
<p id="section-2-4.16.1"><code>Ceiling(x)</code>: the floating-point number <code>x</code> rounded up to the nearest whole number.<a href="#section-2-4.16.1" class="pilcrow"></a></p>
</li>
<li class="normal" id="section-2-4.17">
<p id="section-2-4.17.1"><code>UTF8(s)</code>: the UTF-8 <span>[<a href="#RFC3629" class="cite xref">RFC3629</a>]</span> encoding of string <code>s</code>.<a href="#section-2-4.17.1" class="pilcrow"></a></p>
</li>
</ul>
<p id="section-2-5">Constants:<a href="#section-2-5" class="pilcrow"></a></p>
Expand Down Expand Up @@ -1422,7 +1425,7 @@ <h2 id="name-the-bkdf-algorithm">
<p id="section-3-6.3.1"><code>personalization</code>: the hardcoded, globally unique, and application-specific personalization string for the entire database/application, which <span class="bcp14">MUST</span> be between <code>MIN_PERSONALIZATION</code> and <code>MAX_PERSONALIZATION</code> bytes long.<a href="#section-3-6.3.1" class="pilcrow"></a></p>
</li>
<li class="normal" id="section-3-6.4">
<p id="section-3-6.4.1"><code>spaceCost</code>: the memory size in <code>2**spaceCost</code> blocks, where a block is <code>HASH_LEN</code> bytes long. It <span class="bcp14">MUST</span> be an integer between <code>MIN_SPACECOST</code> and <code>MAX_SPACECOST</code>.<a href="#section-3-6.4.1" class="pilcrow"></a></p>
<p id="section-3-6.4.1"><code>spaceCost</code>: the memory size in <code>2 ** spaceCost</code> blocks, where a block is <code>HASH_LEN</code> bytes long. It <span class="bcp14">MUST</span> be an integer between <code>MIN_SPACECOST</code> and <code>MAX_SPACECOST</code>.<a href="#section-3-6.4.1" class="pilcrow"></a></p>
</li>
<li class="normal" id="section-3-6.5">
<p id="section-3-6.5.1"><code>timeCost</code>: the number of rounds, which <span class="bcp14">MUST</span> be an integer between <code>MIN_TIMECOST</code> and <code>MAX_TIMECOST</code>.<a href="#section-3-6.5.1" class="pilcrow"></a></p>
Expand Down Expand Up @@ -1536,7 +1539,7 @@ <h2 id="name-the-ballooncore-function">
<p id="section-4-8">Steps:<a href="#section-4-8" class="pilcrow"></a></p>
<div class="alignLeft art-text artwork" id="section-4-9">
<pre>
spaceCost = 2**spaceCost
spaceCost = 2 ** spaceCost
buffer = BlockArray(spaceCost, HASH_LEN)

counter = 0
Expand Down
10 changes: 6 additions & 4 deletions draft-lucas-bkdf.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,9 +138,11 @@ Table of Contents
* x++: incrementing the integer x by 1 after it has been used in a
function.

* a ^ b: the bitwise XOR of a and b.
* x ** y: integer x to the power of y.

* x % y: the remainder when dividing x by y.

* a % b: the remainder when dividing a by b.
* a ^ b: the bitwise XOR of a and b.

* a || b: the concatenation of a and b.

Expand Down Expand Up @@ -265,7 +267,7 @@ BKDF(password, salt, personalization, spaceCost, timeCost, parallelism, length,
application, which MUST be between MIN_PERSONALIZATION and
MAX_PERSONALIZATION bytes long.

* spaceCost: the memory size in 2**spaceCost blocks, where a block
* spaceCost: the memory size in 2 ** spaceCost blocks, where a block
is HASH_LEN bytes long. It MUST be an integer between
MIN_SPACECOST and MAX_SPACECOST.

Expand Down Expand Up @@ -364,7 +366,7 @@ BalloonCore(key, personalization, spaceCost, timeCost, parallelism, iteration)

Steps:

spaceCost = 2**spaceCost
spaceCost = 2 ** spaceCost
buffer = BlockArray(spaceCost, HASH_LEN)

counter = 0
Expand Down

0 comments on commit 367f52b

Please sign in to comment.