fix regression itroduced in prior commit

sjlombardo · sjlombardo · commit f2912623bc60 · 2013-09-03T16:47:11.000-04:00
diff --git a/src/crypto.h b/src/crypto.h
@@ -152,7 +152,7 @@ static void cipher_hex2bin(const char *hex, int sz, unsigned char *out){
 static void cipher_bin2hex(const unsigned char* in, int sz, char *out) {
     int i;
     for(i=0; i < sz; i++) {
-      sqlite3_snprintf(2, out + (i*2), "%02x ", in[i]);
+      sqlite3_snprintf(3, out + (i*2), "%02x ", in[i]);
     } 
 }
 
diff --git a/src/crypto_impl.c b/src/crypto_impl.c
@@ -389,10 +389,9 @@ static int sqlcipher_cipher_ctx_set_keyspec(cipher_ctx *ctx, const unsigned char
 
   ctx->keyspec[0] = 'x';
   ctx->keyspec[1] = '\'';
-  ctx->keyspec[ctx->keyspec_sz - 1] = '\'';
   cipher_bin2hex(key, key_sz, ctx->keyspec + 2);
   cipher_bin2hex(salt, salt_sz, ctx->keyspec + (key_sz * 2) + 2);
-
+  ctx->keyspec[ctx->keyspec_sz - 1] = '\'';
   return SQLITE_OK;
 }
 
@@ -980,15 +979,9 @@ int sqlcipher_codec_ctx_migrate(codec_ctx *ctx) {
   memcpy(key, ctx->read_ctx->pass, ctx->read_ctx->pass_sz);
 
   if(db_filename){
-    
+    const char* commands[4];
     char *attach_command = sqlite3_mprintf("ATTACH DATABASE '%s-migrated' as migrate KEY '%s';",
                                             db_filename, key);
-    const char* commands[] = {
-      upgrade_4k_format == 1 ? pragma_4k_kdf_iter : "",
-      upgrade_1x_format == 1 ? pragma_hmac_off : "",
-      attach_command,
-      "SELECT sqlcipher_export('migrate');",
-    };
 
     int rc = sqlcipher_check_connection(db_filename, key, key_sz, "");
     if(rc == SQLITE_OK){
@@ -1019,7 +1012,11 @@ int sqlcipher_codec_ctx_migrate(codec_ctx *ctx) {
       goto handle_error;
     }
 
-    
+    commands[0] = upgrade_4k_format == 1 ? pragma_4k_kdf_iter : "";
+    commands[1] = upgrade_1x_format == 1 ? pragma_hmac_off : "";
+    commands[2] = attach_command;
+    commands[3] = "SELECT sqlcipher_export('migrate');";
+      
     for(command_idx = 0; command_idx < (sizeof(commands)/sizeof(commands[0])); command_idx++){
       const char *command = commands[command_idx];
       if(strcmp(command, "") == 0){

Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ static void cipher_hex2bin(const char hex, int sz, unsigned char out){`
`152`	`152`	`static void cipher_bin2hex(const unsigned char* in, int sz, char *out) {`
`153`	`153`	`int i;`
`154`	`154`	`for(i=0; i < sz; i++) {`
`155`		`- sqlite3_snprintf(2, out + (i*2), "%02x ", in[i]);`
	`155`	`+ sqlite3_snprintf(3, out + (i*2), "%02x ", in[i]);`
`156`	`156`	`}`
`157`	`157`	`}`
`158`	`158`