commoncrypto integration with configure & register

developernotes · developernotes · commit fe9cb1815407 · 2013-06-06T12:19:49.000-05:00
diff --git a/configure.ac b/configure.ac
@@ -264,11 +264,19 @@ if test "$crypto_lib" = "libtomcrypt"; then
   AC_CHECK_LIB([tomcrypt], [register_cipher], ,
                AC_MSG_ERROR([Library crypto not found. Install libtomcrypt!"]))
 else
-  CFLAGS+=" -DSQLCIPHER_CRYPTO_OPENSSL"
-  BUILD_CFLAGS+=" -DSQLCIPHER_CRYPTO_OPENSSL"
-	AC_MSG_RESULT([openssl])
-  AC_CHECK_LIB([crypto], [HMAC_Init_ex], ,
-               AC_MSG_ERROR([Library crypto not found. Install openssl!"]))
+  if test "$crypto_lib" = "commoncrypto"; then
+    CFLAGS+=" -DSQLCIPHER_CRYPTO_OPENSSL -DSQLCIPHER_CRYPTO_CC"
+    BUILD_CFLAGS+=" -DSQLCIPHER_CRYPTO_OPENSSL -DSQLCIPHER_CRYPTO_CC"
+	  AC_MSG_RESULT([commoncrypto])
+    AC_CHECK_LIB([crypto], [HMAC_Init_ex], ,
+                 AC_MSG_ERROR([Library crypto not found. Install openssl!"]))
+  else
+    CFLAGS+=" -DSQLCIPHER_CRYPTO_OPENSSL"
+    BUILD_CFLAGS+=" -DSQLCIPHER_CRYPTO_OPENSSL"
+	  AC_MSG_RESULT([openssl])
+    AC_CHECK_LIB([crypto], [HMAC_Init_ex], ,
+                 AC_MSG_ERROR([Library crypto not found. Install openssl!"]))
+  fi
 fi
 
 ##########
diff --git a/src/crypto_impl.c b/src/crypto_impl.c
@@ -94,7 +94,7 @@ void sqlcipher_activate() {
   sqlite3_mutex_enter(sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_MASTER));
   p = sqlcipher_malloc(sizeof(sqlcipher_provider));
   {
-#ifdef SQLCIPHER_CRYPTO_OPENSSL
+#if defined (SQLCIPHER_CRYPTO_OPENSSL) && !defined (SQLCIPHER_CRYPTO_CC)
   extern int sqlcipher_openssl_setup(sqlcipher_provider *p);
   sqlcipher_openssl_setup(p);
 #elif SQLCIPHER_CRYPTO_LIBTOMCRYPT

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ void sqlcipher_activate() {`
`94`	`94`	`sqlite3_mutex_enter(sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_MASTER));`
`95`	`95`	`p = sqlcipher_malloc(sizeof(sqlcipher_provider));`
`96`	`96`	`{`
`97`		`-#ifdef SQLCIPHER_CRYPTO_OPENSSL`
	`97`	`+#if defined (SQLCIPHER_CRYPTO_OPENSSL) && !defined (SQLCIPHER_CRYPTO_CC)`
`98`	`98`	`extern int sqlcipher_openssl_setup(sqlcipher_provider *p);`
`99`	`99`	`sqlcipher_openssl_setup(p);`
`100`	`100`	`#elif SQLCIPHER_CRYPTO_LIBTOMCRYPT`