Skip to content

Commit 0330944

Browse files
sjlombardosjlombardo
committed
resolv warnings under -DCODEC_DEBUG
1 parent 885ffa9 commit 0330944

2 files changed

Lines changed: 18 additions & 18 deletions

File tree

‎src/crypto.c‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040

4141
int codec_set_kdf_iter(sqlite3* db, int nDb, int kdf_iter, int for_ctx) {
4242
struct Db *pDb = &db->aDb[nDb];
43-
CODEC_TRACE(("codec_set_kdf_iter: entered db=%d nDb=%d kdf_iter=%d for_ctx=%d\n", db, nDb, kdf_iter, for_ctx));
43+
CODEC_TRACE(("codec_set_kdf_iter: entered db=%p nDb=%d kdf_iter=%d for_ctx=%d\n", db, nDb, kdf_iter, for_ctx));
4444

4545
if(pDb->pBt) {
4646
codec_ctx *ctx;
@@ -52,7 +52,7 @@ int codec_set_kdf_iter(sqlite3* db, int nDb, int kdf_iter, int for_ctx) {
5252

5353
int codec_set_fast_kdf_iter(sqlite3* db, int nDb, int kdf_iter, int for_ctx) {
5454
struct Db *pDb = &db->aDb[nDb];
55-
CODEC_TRACE(("codec_set_kdf_iter: entered db=%d nDb=%d kdf_iter=%d for_ctx=%d\n", db, nDb, kdf_iter, for_ctx));
55+
CODEC_TRACE(("codec_set_kdf_iter: entered db=%p nDb=%d kdf_iter=%d for_ctx=%d\n", db, nDb, kdf_iter, for_ctx));
5656

5757
if(pDb->pBt) {
5858
codec_ctx *ctx;
@@ -87,7 +87,7 @@ void codec_set_default_use_hmac(int use) {
8787
int codec_set_use_hmac(sqlite3* db, int nDb, int use) {
8888
struct Db *pDb = &db->aDb[nDb];
8989

90-
CODEC_TRACE(("codec_set_use_hmac: entered db=%d nDb=%d use=%d\n", db, nDb, use));
90+
CODEC_TRACE(("codec_set_use_hmac: entered db=%p nDb=%d use=%d\n", db, nDb, use));
9191

9292
if(pDb->pBt) {
9393
int rc;
@@ -105,7 +105,7 @@ int codec_set_use_hmac(sqlite3* db, int nDb, int use) {
105105

106106
int codec_set_page_size(sqlite3* db, int nDb, int size) {
107107
struct Db *pDb = &db->aDb[nDb];
108-
CODEC_TRACE(("codec_set_page_size: entered db=%d nDb=%d size=%d\n", db, nDb, size));
108+
CODEC_TRACE(("codec_set_page_size: entered db=%p nDb=%d size=%d\n", db, nDb, size));
109109

110110
if(pDb->pBt) {
111111
int rc;
@@ -129,7 +129,7 @@ int codec_set_page_size(sqlite3* db, int nDb, int size) {
129129
*/
130130
int codec_set_cipher_name(sqlite3* db, int nDb, const char *cipher_name, int for_ctx) {
131131
struct Db *pDb = &db->aDb[nDb];
132-
CODEC_TRACE(("codec_set_cipher_name: entered db=%d nDb=%d cipher_name=%s for_ctx=%d\n", db, nDb, cipher_name, for_ctx));
132+
CODEC_TRACE(("codec_set_cipher_name: entered db=%p nDb=%d cipher_name=%s for_ctx=%d\n", db, nDb, cipher_name, for_ctx));
133133

134134
if(pDb->pBt) {
135135
codec_ctx *ctx;
@@ -141,7 +141,7 @@ int codec_set_cipher_name(sqlite3* db, int nDb, const char *cipher_name, int for
141141

142142
int codec_set_pass_key(sqlite3* db, int nDb, const void *zKey, int nKey, int for_ctx) {
143143
struct Db *pDb = &db->aDb[nDb];
144-
CODEC_TRACE(("codec_set_pass_key: entered db=%d nDb=%d cipher_name=%s nKey=%d for_ctx=%d\n", db, nDb, zKey, nKey, for_ctx));
144+
CODEC_TRACE(("codec_set_pass_key: entered db=%p nDb=%d zKey=%s nKey=%d for_ctx=%d\n", db, nDb, (char *)zKey, nKey, for_ctx));
145145
if(pDb->pBt) {
146146
codec_ctx *ctx;
147147
sqlite3pager_get_codec(pDb->pBt->pBt->pPager, (void **) &ctx);
@@ -212,7 +212,7 @@ void sqlite3FreeCodecArg(void *pCodecArg) {
212212
int sqlite3CodecAttach(sqlite3* db, int nDb, const void *zKey, int nKey) {
213213
struct Db *pDb = &db->aDb[nDb];
214214

215-
CODEC_TRACE(("sqlite3CodecAttach: entered nDb=%d zKey=%s, nKey=%d\n", nDb, zKey, nKey));
215+
CODEC_TRACE(("sqlite3CodecAttach: entered nDb=%d zKey=%s, nKey=%d\n", nDb, (char *)zKey, nKey));
216216

217217
sqlcipher_activate();
218218

@@ -246,7 +246,7 @@ void sqlite3_activate_see(const char* in) {
246246
}
247247

248248
int sqlite3_key(sqlite3 *db, const void *pKey, int nKey) {
249-
CODEC_TRACE(("sqlite3_key: entered db=%d pKey=%s nKey=%d\n", db, pKey, nKey));
249+
CODEC_TRACE(("sqlite3_key: entered db=%p pKey=%s nKey=%d\n", db, (char *)pKey, nKey));
250250
/* attach key if db and pKey are not null and nKey is > 0 */
251251
if(db && pKey && nKey) {
252252
sqlite3CodecAttach(db, 0, pKey, nKey); // operate only on the main db
@@ -266,11 +266,11 @@ int sqlite3_key(sqlite3 *db, const void *pKey, int nKey) {
266266
** 3. If there is a key present, re-encrypt the database with the new key
267267
*/
268268
int sqlite3_rekey(sqlite3 *db, const void *pKey, int nKey) {
269-
CODEC_TRACE(("sqlite3_rekey: entered db=%d pKey=%s, nKey=%d\n", db, pKey, nKey));
269+
CODEC_TRACE(("sqlite3_rekey: entered db=%p pKey=%s, nKey=%d\n", db, (char *)pKey, nKey));
270270
sqlcipher_activate();
271271
if(db && pKey && nKey) {
272272
struct Db *pDb = &db->aDb[0];
273-
CODEC_TRACE(("sqlite3_rekey: database pDb=%d\n", pDb));
273+
CODEC_TRACE(("sqlite3_rekey: database pDb=%p\n", pDb));
274274
if(pDb->pBt) {
275275
codec_ctx *ctx;
276276
int rc, page_count;
@@ -330,7 +330,7 @@ int sqlite3_rekey(sqlite3 *db, const void *pKey, int nKey) {
330330

331331
void sqlite3CodecGetKey(sqlite3* db, int nDb, void **zKey, int *nKey) {
332332
struct Db *pDb = &db->aDb[nDb];
333-
CODEC_TRACE(("sqlite3CodecGetKey: entered db=%d, nDb=%d\n", db, nDb));
333+
CODEC_TRACE(("sqlite3CodecGetKey: entered db=%p, nDb=%d\n", db, nDb));
334334

335335
if( pDb->pBt ) {
336336
codec_ctx *ctx;

‎src/crypto_impl.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ int sqlcipher_cipher_ctx_init(cipher_ctx **iCtx) {
185185
*/
186186
void sqlcipher_cipher_ctx_free(cipher_ctx **iCtx) {
187187
cipher_ctx *ctx = *iCtx;
188-
CODEC_TRACE(("cipher_ctx_free: entered iCtx=%d\n", iCtx));
188+
CODEC_TRACE(("cipher_ctx_free: entered iCtx=%p\n", iCtx));
189189
sqlcipher_free(ctx->key, ctx->key_sz);
190190
sqlcipher_free(ctx->hmac_key, ctx->key_sz);
191191
sqlcipher_free(ctx->pass, ctx->pass_sz);
@@ -199,7 +199,7 @@ void sqlcipher_cipher_ctx_free(cipher_ctx **iCtx) {
199199
* returns 1 otherwise
200200
*/
201201
int sqlcipher_cipher_ctx_cmp(cipher_ctx *c1, cipher_ctx *c2) {
202-
CODEC_TRACE(("sqlcipher_cipher_ctx_cmp: entered c1=%d c2=%d\n", c1, c2));
202+
CODEC_TRACE(("sqlcipher_cipher_ctx_cmp: entered c1=%p c2=%p\n", c1, c2));
203203

204204
if(
205205
c1->evp_cipher == c2->evp_cipher
@@ -230,7 +230,7 @@ int sqlcipher_cipher_ctx_copy(cipher_ctx *target, cipher_ctx *source) {
230230
void *key = target->key;
231231
void *hmac_key = target->hmac_key;
232232

233-
CODEC_TRACE(("sqlcipher_cipher_ctx_copy: entered target=%d, source=%d\n", target, source));
233+
CODEC_TRACE(("sqlcipher_cipher_ctx_copy: entered target=%p, source=%p\n", target, source));
234234
sqlcipher_free(target->pass, target->pass_sz);
235235
memcpy(target, source, sizeof(cipher_ctx));
236236

@@ -452,7 +452,7 @@ int sqlcipher_codec_ctx_init(codec_ctx **iCtx, Db *pDb, Pager *pPager, sqlite3_f
452452
*/
453453
void sqlcipher_codec_ctx_free(codec_ctx **iCtx) {
454454
codec_ctx *ctx = *iCtx;
455-
CODEC_TRACE(("codec_ctx_free: entered iCtx=%d\n", iCtx));
455+
CODEC_TRACE(("codec_ctx_free: entered iCtx=%p\n", iCtx));
456456
sqlcipher_free(ctx->kdf_salt, ctx->kdf_salt_sz);
457457
sqlcipher_free(ctx->hmac_kdf_salt, ctx->kdf_salt_sz);
458458
sqlcipher_free(ctx->buffer, 0);
@@ -523,7 +523,7 @@ int sqlcipher_page_cipher(codec_ctx *ctx, int for_ctx, Pgno pgno, int mode, int
523523
return SQLITE_ERROR;
524524
}
525525

526-
CODEC_TRACE(("codec_cipher: comparing hmac on in=%d out=%d hmac_sz=%d\n", hmac_in, hmac_out, c_ctx->hmac_sz));
526+
CODEC_TRACE(("codec_cipher: comparing hmac on in=%p out=%p hmac_sz=%d\n", hmac_in, hmac_out, c_ctx->hmac_sz));
527527
if(sqlcipher_memcmp(hmac_in, hmac_out, c_ctx->hmac_sz) != 0) {
528528
/* the hmac check failed, which means the data was tampered with or
529529
corrupted in some way. we will return an error, and zero out the page data
@@ -565,8 +565,8 @@ int sqlcipher_page_cipher(codec_ctx *ctx, int for_ctx, Pgno pgno, int mode, int
565565
*/
566566
int sqlcipher_cipher_ctx_key_derive(codec_ctx *ctx, cipher_ctx *c_ctx) {
567567
CODEC_TRACE(("codec_key_derive: entered c_ctx->pass=%s, c_ctx->pass_sz=%d \
568-
ctx->kdf_salt=%d ctx->kdf_salt_sz=%d c_ctx->kdf_iter=%d \
569-
ctx->hmac_kdf_salt=%d, c_ctx->fast_kdf_iter=%d c_ctx->key_sz=%d\n",
568+
ctx->kdf_salt=%p ctx->kdf_salt_sz=%d c_ctx->kdf_iter=%d \
569+
ctx->hmac_kdf_salt=%p, c_ctx->fast_kdf_iter=%d c_ctx->key_sz=%d\n",
570570
c_ctx->pass, c_ctx->pass_sz, ctx->kdf_salt, ctx->kdf_salt_sz, c_ctx->kdf_iter,
571571
ctx->hmac_kdf_salt, c_ctx->fast_kdf_iter, c_ctx->key_sz));
572572

0 commit comments

Comments
 (0)