remove internal calls to add random

sjlombardo · sjlombardo · commit 1862c0df6f18 · 2013-06-11T12:55:50.000-04:00
diff --git a/src/crypto_openssl.c b/src/crypto_openssl.c
@@ -37,9 +37,6 @@ static int sqlcipher_openssl_activate(void *ctx) {
   if(openssl_external_init == 0) {
     if(openssl_init_count == 0)  {
       OpenSSL_add_all_algorithms();
-      if(sqlcipher_openssl_add_random(ctx, &ctx, sizeof(openssl_ctx *)) != SQLITE_OK) {
-        return SQLITE_ERROR;
-      }
     }
     openssl_init_count++; 
   } 
@@ -92,8 +89,6 @@ static int sqlcipher_openssl_kdf(void *ctx, const unsigned char *pass, int pass_
   char random_buffer[random_buffer_sz];
   
   PKCS5_PBKDF2_HMAC_SHA1(pass, pass_sz, salt, salt_sz, workfactor, key_sz, key);
-  PKCS5_PBKDF2_HMAC_SHA1(key, key_sz, salt, salt_sz, 1, random_buffer_sz, random_buffer);
-  sqlcipher_openssl_add_random(ctx, random_buffer, random_buffer_sz);
   return SQLITE_OK; 
 }
 

Original file line number	Diff line number	Diff line change
`@@ -37,9 +37,6 @@ static int sqlcipher_openssl_activate(void *ctx) {`
`37`	`37`	`if(openssl_external_init == 0) {`
`38`	`38`	`if(openssl_init_count == 0) {`
`39`	`39`	`OpenSSL_add_all_algorithms();`
`40`		`- if(sqlcipher_openssl_add_random(ctx, &ctx, sizeof(openssl_ctx *)) != SQLITE_OK) {`
`41`		`- return SQLITE_ERROR;`
`42`		`- }`
`43`	`40`	`}`
`44`	`41`	`openssl_init_count++;`
`45`	`42`	`}`
`@@ -92,8 +89,6 @@ static int sqlcipher_openssl_kdf(void ctx, const unsigned char pass, int pass_`
`92`	`89`	`char random_buffer[random_buffer_sz];`
`93`	`90`
`94`	`91`	`PKCS5_PBKDF2_HMAC_SHA1(pass, pass_sz, salt, salt_sz, workfactor, key_sz, key);`
`95`		`- PKCS5_PBKDF2_HMAC_SHA1(key, key_sz, salt, salt_sz, 1, random_buffer_sz, random_buffer);`
`96`		`- sqlcipher_openssl_add_random(ctx, random_buffer, random_buffer_sz);`
`97`	`92`	`return SQLITE_OK;`
`98`	`93`	`}`
`99`	`94`