Merge branch 'master' into ditto

This commit is contained in:
Stephen Lombardo 2010-06-14 14:22:48 -04:00
commit 7c6ac4010e

View File

@ -71,9 +71,11 @@ typedef struct {
} codec_ctx;
static void activate_openssl() {
sqlite3_mutex_enter(sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_MASTER));
if(EVP_get_cipherbyname(CIPHER) == NULL) {
OpenSSL_add_all_algorithms();
}
sqlite3_mutex_leave(sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_MASTER));
}
/*