From: drh <>
Date: Thu, 10 Nov 2022 23:10:11 +0000 (+0000)
Subject: Remove unnecessary tabs in the ChaCha20 implementation.
X-Git-Tag: version-3.40.0~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a6303704a3a4ff9604f2ff19c9f99bf85df94f1a;p=thirdparty%2Fsqlite.git

Remove unnecessary tabs in the ChaCha20 implementation.
[forum:/forumpost/0cdce5db8c|Forum post 0cdce5db8c].

FossilOrigin-Name: b7179efbdb2bdc878acec0abfe272821f7e0d7d9e5ef06cd7fd796ef295e54ab
---

diff --git a/manifest b/manifest
index 4ca67cf05f..7d235dc5e0 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Automatically\srelinquish\simplicitly-acquired\sOPFS\sfile\slocks\sduring\sVFS\sidle\stime\sin\san\sattempt\sto\shelp\salleviate\scross-tab\slocking\scontention\slike\sthat\sdescribed\sin\s[forum:58a377083cd24a|forum\spost\s58a377083cd24a].
-D 2022-11-10T13:22:35.705
+C Remove\sunnecessary\stabs\sin\sthe\sChaCha20\simplementation.\n[forum:/forumpost/0cdce5db8c|Forum\spost\s0cdce5db8c].
+D 2022-11-10T23:10:11.615
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -634,7 +634,7 @@ F src/pragma.c 41430ca04735cc8e5d003bfd9315eadede3ec326e50805cc81bcf34e46601292
 F src/pragma.h e690a356c18e98414d2e870ea791c1be1545a714ba623719deb63f7f226d8bb7
 F src/prepare.c 1b02be0441eda4579471fea097f678effcbb77ef0c39ab3f703c837822bcd674
 F src/printf.c e99ee9741e79ae3873458146f59644276657340385ade4e76a5f5d1c25793764
-F src/random.c 546d6feb15ec69c1aafe9bb351a277cbb498fd5410e646add673acb805714960
+F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c efea4e5fbecfd6d0a9071b0be0d952620991673391b6ffaaf4c277b0bb674633
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c 9886d6669f5787471aab6ae52af76fad90b53edb1c218fc9ed9d953363bc5184
@@ -2055,9 +2055,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 ae43e97087a3207a5ca3ffae75fbe7a33c01f4a38ce0d1d7eed8591ae3083617 a7fe91afca473fe55c983bc81d214df4ef3699863c7423fa4b6b9cde23d6a3b4
-R 4034304670d7219ca07133486e9bbed5
-T +closed a7fe91afca473fe55c983bc81d214df4ef3699863c7423fa4b6b9cde23d6a3b4 Closed\sby\sintegrate-merge.
-U stephan
-Z 9ded40c19ad046a311beff933b79ea4d
+P 8daf24ff73dd9928057412e0e4c2e2b2e47e1dca66acfb6b07c846e8d97582cc
+R 04ffbe7f24cddf4f03c02f462fa8206c
+U drh
+Z fb89e7a00a9caa7fe7a2edc92e6dface
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 7762727bb4..28d8c15093 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8daf24ff73dd9928057412e0e4c2e2b2e47e1dca66acfb6b07c846e8d97582cc
\ No newline at end of file
+b7179efbdb2bdc878acec0abfe272821f7e0d7d9e5ef06cd7fd796ef295e54ab
\ No newline at end of file
diff --git a/src/random.c b/src/random.c
index 9335fc49da..ea8431ba94 100644
--- a/src/random.c
+++ b/src/random.c
@@ -31,10 +31,10 @@ static SQLITE_WSD struct sqlite3PrngType {
 /* 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),	\
+#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;