Fix wrong cipher selection (issue #26)

utelle · utelle · commit 5b74cef3b30d · 2021-03-08T16:09:18.000+01:00
If cipher schemes 'aes128cbc' and/or 'aes256cbc' are excluded from the build, selecting the cipher via URI parameter leads to a crash, because a wrong (excluded) cipher is selected due to using the wrong cipher index.
diff --git a/src/cipher_config.c b/src/cipher_config.c
@@ -654,11 +654,11 @@ sqlite3mcConfigureFromUri(sqlite3* db, const char *zDbName, int configDefault)
         int hmacCheck = sqlite3_uri_boolean(dbFileName, "hmac_check", 1);
         if (configDefault)
         {
-          sqlite3mc_config(db, "default:cipher", j);
+          sqlite3mc_config(db, "default:cipher", globalCodecParameterTable[j].m_id);
         }
         else
         {
-          sqlite3mc_config(db, "cipher", j);
+          sqlite3mc_config(db, "cipher", globalCodecParameterTable[j].m_id);
         }
         if (!hmacCheck)
         {

Original file line number	Diff line number	Diff line change
`@@ -654,11 +654,11 @@ sqlite3mcConfigureFromUri(sqlite3* db, const char *zDbName, int configDefault)`
`654`	`654`	`int hmacCheck = sqlite3_uri_boolean(dbFileName, "hmac_check", 1);`
`655`	`655`	`if (configDefault)`
`656`	`656`	`{`
`657`		`- sqlite3mc_config(db, "default:cipher", j);`
	`657`	`+ sqlite3mc_config(db, "default:cipher", globalCodecParameterTable[j].m_id);`
`658`	`658`	`}`
`659`	`659`	`else`
`660`	`660`	`{`
`661`		`- sqlite3mc_config(db, "cipher", j);`
	`661`	`+ sqlite3mc_config(db, "cipher", globalCodecParameterTable[j].m_id);`
`662`	`662`	`}`
`663`	`663`	`if (!hmacCheck)`
`664`	`664`	`{`