Skip to content

Commit 23b841b

Browse files
committed
Sets unknown cipher to UNKNOWN.
1 parent edf4ae9 commit 23b841b

2 files changed

Lines changed: 7 additions & 7 deletions

File tree

sqlitecipher/sqlitecipher.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -778,7 +778,7 @@ static int _cipherNameToValue(const QString &name) {
778778
} else if (lowerName == QStringLiteral("sqlcipher")) {
779779
return SQLCIPHER;
780780
} else {
781-
return AES_256_CBC;
781+
return UNKNOWN_CIPHER;
782782
}
783783
}
784784

testapp/main.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,13 @@ int main(int argc, char *argv[])
2323
QSqlDatabase dbconn = QSqlDatabase::addDatabase("SQLITECIPHER");
2424
dbconn.setDatabaseName(DB_FILE_PATH);
2525
dbconn.setPassword("test");
26-
// dbconn.setConnectOptions("QSQLITE_USE_CIPHER=sqlcipher; QSQLITE_CREATE_KEY");
27-
dbconn.setConnectOptions("QSQLITE_USE_CIPHER=sqlcipher; QSQLITE_SHOW_CIPHER");
26+
dbconn.setConnectOptions("QSQLITE_USE_CIPHER=sqlcipher; QSQLITE_ENABLE_REGEXP");
2827
if (!dbconn.open()) {
2928
qDebug() << "Can not open connection: " << dbconn.lastError().driverText();
3029
exit(CONNECTION_FAILED);
3130
}
3231

3332
QSqlQuery query;
34-
query.exec("SELECT wxsqlite3_config('cipher')");
35-
while (query.next()) {
36-
qDebug() << "Cipher: " << query.value(0).toString();
37-
}
3833
query.exec("create table mapping (id int, name varchar)");
3934
query.exec("insert into mapping values (1, 'AAA')");
4035
query.exec("insert into mapping values (2, 'BBB')");
@@ -43,6 +38,11 @@ int main(int argc, char *argv[])
4338
query.exec("insert into mapping values (5, 'EEE')");
4439
query.exec("insert into mapping values (6, 'FFF')");
4540
query.exec("insert into mapping values (7, 'GGG')");
41+
query.exec("select * from mapping where name regexp '(a|A)$'");
42+
while (query.next()) {
43+
qDebug() << "Regexp result: " << query.value(0).toInt() << ": " << query.value(1).toString();
44+
}
45+
qDebug() << "----------" << endl;
4646
query.exec("select id, name from mapping");
4747
while (query.next()) {
4848
qDebug() << query.value(0).toInt() << ": " << query.value(1).toString();

0 commit comments

Comments
 (0)