8000 ANSI C and win c compiler fixes · magic-coder/sqlcipher@f25510f · GitHub
[go: up one dir, main page]
Skip to content

Commit f25510f

Browse files
sjlombardosjlombardo
committed
ANSI C and win c compiler fixes
1 parent 4872b2a commit f25510f

File tree

3 files changed

+59
-56
lines changed

3 files changed

+59
-56
lines changed

‎src/crypto.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -342,10 +342,10 @@ void sqlite3_activate_see(const char* in) {
342342
}
343343

344344
static int sqlcipher_find_db_index(sqlite3 *db, const char *zDb) {
345+
int db_index;
345346
if(zDb == NULL){
346347
return 0;
347348
}
348-
int db_index;
349349
for(db_index = 0; db_index < db->nDb; db_index++) {
350350
struct Db *pDb = &db->aDb[db_index];
351351
if(strcmp(pDb->zName, zDb) == 0) {
@@ -418,7 +418,7 @@ int sqlite3_rekey_v2(sqlite3 *db, const char *zDb, const void *pKey, int nKey) {
418418
*/
419419
rc = sqlite3BtreeBeginTrans(pDb->pBt, 1); /* begin write transaction */
420420
sqlite3PagerPagecount(pPager, &page_count);
421-
for(pgno = 1; rc == SQLITE_OK && pgno <= page_count; pgno++) { /* pgno's start at 1 see pager.c:pagerAcquire */
421+
for(pgno = 1; rc == SQLITE_OK && pgno <= (unsigned int)page_count; pgno++) { /* pgno's start at 1 see pager.c:pagerAcquir 8000 e */
422422
if(!sqlite3pager_is_mj_pgno(pPager, pgno)) { /* skip this page (see pager.c:pagerAcquire for reasoning) */
423423
rc = sqlite3PagerGet(pPager, pgno, &page);
424424
if(rc == SQLITE_OK) { /* write page see pager_incr_changecounter for example */

‎src/crypto.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ static void cipher_hex2bin(const char *hex, int sz, unsigned char *out){
152152
static void cipher_bin2hex(const unsigned char* in, int sz, char *out) {
153153
int i;
154154
for(i=0; i < sz; i++) {
155-
sprintf(out + (i*2), "%02x ", in[i]);
155+
sqlite3_snprintf(2, out + (i*2), "%02x ", in[i]);
156156
}
157157
}
158158

‎src/crypto_impl.c‎

Lines changed: 56 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -906,6 +906,43 @@ const char* sqlcipher_codec_get_cipher_provider(codec_ctx *ctx) {
906906
return ctx->read_ctx->provider->get_provider_name(ctx->read_ctx);
907907
}
908908

909+
910+
static int sqlcipher_check_connection(const char *filename, char *key, int key_sz, char *sql) {
911+
int rc;
912+
sqlite3 *db = NULL;
913+
sqlite3_stmt *statement = NULL;
914+
char *query_sqlite_master = "SELECT count(*) FROM sqlite_master;";
915+
916+
rc = sqlite3_open(filename, &db);
917+
if(rc != SQLITE_OK){
918+
goto cleanup;
919+
}
920+
rc = sqlite3_key(db, key, key_sz);
921+
if(rc != SQLITE_OK){
922+
goto cleanup;
923+
}
924+
rc = sqlite3_exec(db, sql, NULL, NULL, NULL);
925+
if(rc != SQLITE_OK){
926+
goto cleanup;
927+
}
928+
rc = sqlite3_prepare(db, query_sqlite_master, -1, &statement, NULL);
929+
if(rc != SQLITE_OK){
930+
goto cleanup;
931+
}
932+
if(sqlite3_step(statement) == SQLITE_ROW){
933+
rc = SQLITE_OK;
934+
}
935+
936+
cleanup:
937+
if(statement){
938+
sqlite3_finalize(statement);
939+
}
940+
if(db){
941+
sqlite3_close(db);
942+
}
943+
return rc;
944+
}
945+
909946
int sqlcipher_codec_ctx_migrate(codec_ctx *ctx) {
910947
u32 meta;
911948
int rc = 0;
@@ -922,11 +959,11 @@ int sqlcipher_codec_ctx_migrate(codec_ctx *ctx) {
922959
char *query_sqlite_master = "SELECT count(*) from sqlite_master;";
923960
char *pragma_hmac_off = "PRAGMA cipher_use_hmac = OFF;";
924961
char *pragma_4k_kdf_iter = "PRAGMA kdf_iter = 4000;";
962+
char *pragma_1x_and_4k;
925963
char *key;
926964
int key_sz;
927965
int upgrade_1x_format = 0;
928966
int upgrade_4k_format = 0;
929-
sqlite3 *test;
930967
char *err = 0;
931968
static const unsigned char aCopy[] = {
932969
BTREE_SCHEMA_VERSION, 1, /* Add one to the old schema cookie */
@@ -935,6 +972,8 @@ int sqlcipher_codec_ctx_migrate(codec_ctx *ctx) {
935972
BTREE_USER_VERSION, 0, /* Preserve the user version */
936973
BTREE_APPLICATION_ID, 0, /* Preserve the application id */
937974
};
975+
976+
938977
key_sz = ctx->read_ctx->pass_sz + 1;
939978
key = sqlcipher_malloc(key_sz);
940979
memset(key, 0, key_sz);
@@ -944,6 +983,12 @@ int sqlcipher_codec_ctx_migrate(codec_ctx *ctx) {
944983

945984
char *attach_command = sqlite3_mprintf("ATTACH DATABASE '%s-migrated' as migrate KEY '%s';",
946985
db_filename, key);
986+
const char* commands[] = {
987+
upgrade_4k_format == 1 ? pragma_4k_kdf_iter : "",
988+
upgrade_1x_format == 1 ? pragma_hmac_off : "",
989+
attach_command,
990+
"SELECT sqlcipher_export('migrate');",
991+
};
947992

948993
int rc = sqlcipher_check_connection(db_filename, key, key_sz, "");
949994
if(rc == SQLITE_OK){
@@ -959,7 +1004,7 @@ int sqlcipher_codec_ctx_migrate(codec_ctx *ctx) {
9591004
}
9601005

9611006
// Version 1 - check both no hmac and 4k together
962-
char *pragma_1x_and_4k = sqlite3_mprintf("%s%s", pragma_hmac_off,
1007+
pragma_1x_and_4k = sqlite3_mprintf("%s%s", pragma_hmac_off,
9631008
pragma_4k_kdf_iter);
9641009
rc = sqlcipher_check_connection(db_filename, key, key_sz, pragma_1x_and_4k);
9651010
sqlite3_free(pragma_1x_and_4k);
@@ -974,13 +1019,8 @@ int sqlcipher_codec_ctx_migrate(codec_ctx *ctx) {
9741019
goto handle_error;
9751020
}
9761021

977-
const char *commands[] = {
978-
upgrade_4k_format == 1 ? pragma_4k_kdf_iter : "",
979-
upgrade_1x_format == 1 ? pragma_hmac_off : "",
980-
attach_command,
981-
"SELECT sqlcipher_export('migrate');",
982-
};
983-
for(command_idx = 0; command_idx < ArraySize(commands); command_idx++){
1022+
1023+
for(command_idx = 0; command_idx < (sizeof(commands)/sizeof(commands[0])); command_idx++){
9841024
const char *command = commands[command_idx];
9851025
if(strcmp(command, "") == 0){
9861026
continue;
@@ -994,6 +1034,10 @@ int sqlcipher_codec_ctx_migrate(codec_ctx *ctx) {
9941034
sqlcipher_free(key, key_sz);
9951035

9961036
if(rc == SQLITE_OK){
1037+
Btree *pDest;
1038+
Btree *pSrc;
1039+
int i = 0;
1040+
9971041
if( !db->autoCommit ){
9981042
CODEC_TRACE(("cannot migrate from within a transaction"));
9991043
goto handle_error;
@@ -1014,9 +1058,9 @@ int sqlcipher_codec_ctx_migrate(codec_ctx *ctx) {
10141058
db->flags &= ~(SQLITE_ForeignKeys | SQLITE_ReverseOrder);
10151059
db->xTrace = 0;
10161060

1017-
Btree *pDest = db->aDb[0].pBt;
1061+
pDest = db->aDb[0].pBt;
10181062
pDb = &(db->aDb[db->nDb-1]);
1019-
Btree *pSrc = pDb->pBt;
1063+
pSrc = pDb->pBt;
10201064

10211065
rc = sqlite3_exec(db, "BEGIN;", NULL, NULL, NULL);
10221066
rc = sqlite3BtreeBeginTrans(pSrc, 2);
@@ -1029,8 +1073,7 @@ int sqlcipher_codec_ctx_migrate(codec_ctx *ctx) {
10291073
sqlite3CodecGetKey(db, db->nDb - 1, (void**)&key, &password_sz);
10301074
sqlite3CodecAttach(db, 0, key, password_sz);
10311075

1032-
int i = 0;
1033-
for(i=0; i<ArraySize(aCopy); i+=2){
1076+
for(i=0; i<(sizeof(aCopy)/sizeof(aCopy[0])); i+=2){
10341077
sqlite3BtreeGetMeta(pSrc, aCopy[i], &meta);
10351078
rc = sqlite3BtreeUpdateMeta(pDest, aCopy[i], meta+aCopy[i+1]);
10361079
if( NEVER(rc!=SQLITE_OK) ) goto handle_error;
@@ -1068,46 +1111,6 @@ int sqlcipher_codec_ctx_migrate(codec_ctx *ctx) {
10681111
return rc;
10691112
}
10701113

1071-
int sqlcipher_check_connection(char *filename, char *key, int key_sz, char *sql) {
1072-
int rc;
1073-
sqlite3 *db;
1074-
char *errMsg;
1075-
sqlite3_stmt *statement;
1076-
char *query_sqlite_master = "SELECT count(*) FROM sqlite_master;";
1077-
1078-
rc = sqlite3_open(filename, &db);
1079-
if(rc != SQLITE_OK){
1080-
goto cleanup;
1081-
}
1082-
rc = sqlite3_key(db, key, key_sz);
1083-
if(rc != SQLITE_OK){
1084-
goto cleanup;
1085-
}
1086-
rc = sqlite3_exec(db, sql, NULL, NULL, NULL);
1087-
if(rc != SQLITE_OK){
1088-
goto cleanup;
1089-
}
1090-
rc = sqlite3_prepare(db, query_sqlite_master, -1, &statement, NULL);
1091-
if(rc != SQLITE_OK){
1092-
goto cleanup;
1093-
}
1094-
if(sqlite3_step(statement) == SQLITE_ROW){
1095-
rc = SQLITE_OK;
1096-
}
1097-
goto cleanup;
1098-
1099-
cleanup:
1100-
if(statement){
1101-
sqlite3_finalize(statement);
1102-
}
1103-
if(db){
1104-
sqlite3_close(db);
1105-
}
1106-
1107-
exit:
1108-
return rc;
1109-
1110-
}
11111114

11121115
#endif
11131116
/* END SQLCIPHER */

0 commit comments

Comments
 (0)
0