From: drh <>
Date: Tue, 16 Aug 2022 16:57:33 +0000 (+0000)
Subject: Fix obsolete comments.  Add new comments.  Fix non-standard spacing.
X-Git-Tag: version-3.40.0~236^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fheads%2Fchacha20-prng;p=thirdparty%2Fsqlite.git

Fix obsolete comments.  Add new comments.  Fix non-standard spacing.

FossilOrigin-Name: a0d224c6a69941dad1f2b35edcc7ddee343b99eae2aeed74043461f3e97ef5b4
---

diff --git a/manifest b/manifest
index 33c8ab32a3..db5ad92d5f 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\san\soff-by-one\serror\sin\sthe\sChaCha20\sinitialization\scode.
-D 2022-08-16T16:40:54.599
+C Fix\sobsolete\scomments.\s\sAdd\snew\scomments.\s\sFix\snon-standard\sspacing.
+D 2022-08-16T16:57:33.367
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -585,7 +585,7 @@ F src/pragma.c 6637d624c37a8909d3edfa9d7cf694d79b49d2a0827d8c52ef15dceb641783fa
 F src/pragma.h e690a356c18e98414d2e870ea791c1be1545a714ba623719deb63f7f226d8bb7
 F src/prepare.c c62820c15dcb63013519c8e41d9f928d7478672cc902cfd0581c733c271dbf45
 F src/printf.c e99ee9741e79ae3873458146f59644276657340385ade4e76a5f5d1c25793764
-F src/random.c af089dd588a3cbf85df14f9711c347f70050fcb73bc003376c8491065f6c317b
+F src/random.c 546d6feb15ec69c1aafe9bb351a277cbb498fd5410e646add673acb805714960
 F src/resolve.c efea4e5fbecfd6d0a9071b0be0d952620991673391b6ffaaf4c277b0bb674633
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c 4750fbe9d8ecb7236baf7a9bea4299bb87126e08c209645666a0ae8f0efbe0fc
@@ -1999,8 +1999,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P d9e8c65ed25c4f6222c737f4244d5362dbe433d357f7d133765157446cf4e925
-R 6547827ce11f2be716204766ff5dff1b
+P 72e220eed446ea9a02a6ef03e09a01bcb8bbca1f3b32d2e0bf52a17d9722e2f0
+R cdb53b59d0af11c8f66b0b5bb02ede98
 U drh
-Z 947a70a0b2c6f8310490779060824f95
+Z 1158c2a25804bd20ee35e9fb8e722661
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index a9411d2af9..54413fbc1b 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-72e220eed446ea9a02a6ef03e09a01bcb8bbca1f3b32d2e0bf52a17d9722e2f0
\ No newline at end of file
+a0d224c6a69941dad1f2b35edcc7ddee343b99eae2aeed74043461f3e97ef5b4
\ No newline at end of file
diff --git a/src/random.c b/src/random.c
index 8bf75156aa..9335fc49da 100644
--- a/src/random.c
+++ b/src/random.c
@@ -27,12 +27,15 @@ static SQLITE_WSD struct sqlite3PrngType {
   u8 n;                      /* Output bytes remaining */
 } sqlite3Prng;
 
+
+/* The RFC-7539 ChaCha20 block function
+*/
 #define ROTL(a,b) (((a) << (b)) | ((a) >> (32 - (b))))
-#define QR(a, b, c, d) (			\
-	a += b,  d ^= a,  d = ROTL(d,16),	\
-	c += d,  b ^= c,  b = ROTL(b,12),	\
-	a += b,  d ^= a,  d = ROTL(d, 8),	\
-	c += d,  b ^= c,  b = ROTL(b, 7))
+#define QR(a, b, c, d) (	\
+    a += b, d ^= a, d = ROTL(d,16),	\
+    c += d, b ^= c, b = ROTL(b,12),	\
+    a += b, d ^= a, d = ROTL(d, 8),	\
+    c += d, b ^= c, b = ROTL(b, 7))
 static void chacha_block(u32 *out, const u32 *in){
   int i;
   u32 x[16];
@@ -89,13 +92,7 @@ void sqlite3_randomness(int N, void *pBuf){
   }
 
   /* Initialize the state of the random number generator once,
-  ** the first time this routine is called.  The seed value does
-  ** not need to contain a lot of randomness since we are not
-  ** trying to do secure encryption or anything like that...
-  **
-  ** Nothing in this file or anywhere else in SQLite does any kind of
-  ** encryption.  The RC4 algorithm is being used as a PRNG (pseudo-random
-  ** number generator) not as an encryption device.
+  ** the first time this routine is called.
   */
   if( wsdPrng.s[0]==0 ){
     sqlite3_vfs *pVfs = sqlite3_vfs_find(0);