diff --git a/sqlite/sqlite/sqlite3.c b/sqlite/sqlite/sqlite3.c index d1e48513f..b3efd6d62 100644 --- a/sqlite/sqlite/sqlite3.c +++ b/sqlite/sqlite/sqlite3.c @@ -20313,18 +20313,18 @@ typedef struct { } sqlcipher_provider; /* utility functions */ -void* sqlcipher_malloc(u64); -void sqlcipher_mlock(void *, u64); -void sqlcipher_munlock(void *, u64); -void* sqlcipher_memset(void *, unsigned char, u64); -int sqlcipher_ismemset(const void *, unsigned char, u64); -int sqlcipher_memcmp(const void *, const void *, int); -void sqlcipher_free(void *, u64); -char* sqlcipher_version(); +SQLITE_PRIVATE void* sqlcipher_malloc(u64); +SQLITE_PRIVATE void sqlcipher_mlock(void *, u64); +SQLITE_PRIVATE void sqlcipher_munlock(void *, u64); +SQLITE_PRIVATE void* sqlcipher_memset(void *, unsigned char, u64); +SQLITE_PRIVATE int sqlcipher_ismemset(const void *, unsigned char, u64); +SQLITE_PRIVATE int sqlcipher_memcmp(const void *, const void *, int); +SQLITE_PRIVATE void sqlcipher_free(void *, u64); +SQLITE_PRIVATE char* sqlcipher_version(); /* provider interfaces */ -int sqlcipher_register_provider(sqlcipher_provider *); -sqlcipher_provider* sqlcipher_get_provider(void); +SQLITE_PRIVATE int sqlcipher_register_provider(sqlcipher_provider *); +SQLITE_PRIVATE sqlcipher_provider* sqlcipher_get_provider(void); #define SQLCIPHER_MUTEX_PROVIDER 0 #define SQLCIPHER_MUTEX_PROVIDER_ACTIVATE 1 @@ -20334,7 +20334,7 @@ sqlcipher_provider* sqlcipher_get_provider(void); #define SQLCIPHER_MUTEX_RESERVED3 5 #define SQLCIPHER_MUTEX_COUNT 6 -tdsqlite3_mutex* sqlcipher_mutex(int); +SQLITE_PRIVATE tdsqlite3_mutex* sqlcipher_mutex(int); #endif #endif @@ -21298,100 +21298,100 @@ typedef struct { } codec_ctx ; /* crypto.c functions */ -int sqlcipher_codec_pragma(tdsqlite3*, int, Parse*, const char *, const char*); +SQLITE_PRIVATE int sqlcipher_codec_pragma(tdsqlite3*, int, Parse*, const char *, const char*); SQLITE_PRIVATE int tdsqlite3CodecAttach(tdsqlite3*, int, const void *, int); SQLITE_PRIVATE void tdsqlite3CodecGetKey(tdsqlite3*, int, void**, int*); -void sqlcipher_exportFunc(tdsqlite3_context *, int, tdsqlite3_value **); +SQLITE_PRIVATE void sqlcipher_exportFunc(tdsqlite3_context *, int, tdsqlite3_value **); /* crypto_impl.c functions */ -void sqlcipher_init_memmethods(void); +SQLITE_PRIVATE void sqlcipher_init_memmethods(void); /* activation and initialization */ -void sqlcipher_activate(void); -void sqlcipher_deactivate(void); +SQLITE_PRIVATE void sqlcipher_activate(void); +SQLITE_PRIVATE void sqlcipher_deactivate(void); -int sqlcipher_codec_ctx_init(codec_ctx **, Db *, Pager *, const void *, int); -void sqlcipher_codec_ctx_free(codec_ctx **); -int sqlcipher_codec_key_derive(codec_ctx *); -int sqlcipher_codec_key_copy(codec_ctx *, int); +SQLITE_PRIVATE int sqlcipher_codec_ctx_init(codec_ctx **, Db *, Pager *, const void *, int); +SQLITE_PRIVATE void sqlcipher_codec_ctx_free(codec_ctx **); +SQLITE_PRIVATE int sqlcipher_codec_key_derive(codec_ctx *); +SQLITE_PRIVATE int sqlcipher_codec_key_copy(codec_ctx *, int); /* page cipher implementation */ -int sqlcipher_page_cipher(codec_ctx *, int, Pgno, int, int, unsigned char *, unsigned char *); +SQLITE_PRIVATE int sqlcipher_page_cipher(codec_ctx *, int, Pgno, int, int, unsigned char *, unsigned char *); /* context setters & getters */ -void sqlcipher_codec_ctx_set_error(codec_ctx *, int); +SQLITE_PRIVATE void sqlcipher_codec_ctx_set_error(codec_ctx *, int); -void sqlcipher_codec_get_pass(codec_ctx *, void **, int *); -int sqlcipher_codec_ctx_set_pass(codec_ctx *, const void *, int, int); -void sqlcipher_codec_get_keyspec(codec_ctx *, void **zKey, int *nKey); +SQLITE_PRIVATE void sqlcipher_codec_get_pass(codec_ctx *, void **, int *); +SQLITE_PRIVATE int sqlcipher_codec_ctx_set_pass(codec_ctx *, const void *, int, int); +SQLITE_PRIVATE void sqlcipher_codec_get_keyspec(codec_ctx *, void **zKey, int *nKey); -int sqlcipher_codec_ctx_set_pagesize(codec_ctx *, int); -int sqlcipher_codec_ctx_get_pagesize(codec_ctx *); -int sqlcipher_codec_ctx_get_reservesize(codec_ctx *); +SQLITE_PRIVATE int sqlcipher_codec_ctx_set_pagesize(codec_ctx *, int); +SQLITE_PRIVATE int sqlcipher_codec_ctx_get_pagesize(codec_ctx *); +SQLITE_PRIVATE int sqlcipher_codec_ctx_get_reservesize(codec_ctx *); -void sqlcipher_set_default_pagesize(int page_size); -int sqlcipher_get_default_pagesize(void); +SQLITE_PRIVATE void sqlcipher_set_default_pagesize(int page_size); +SQLITE_PRIVATE int sqlcipher_get_default_pagesize(void); -void sqlcipher_set_default_kdf_iter(int iter); -int sqlcipher_get_default_kdf_iter(void); -int sqlcipher_codec_ctx_set_kdf_iter(codec_ctx *, int); -int sqlcipher_codec_ctx_get_kdf_iter(codec_ctx *ctx); +SQLITE_PRIVATE void sqlcipher_set_default_kdf_iter(int iter); +SQLITE_PRIVATE int sqlcipher_get_default_kdf_iter(void); +SQLITE_PRIVATE int sqlcipher_codec_ctx_set_kdf_iter(codec_ctx *, int); +SQLITE_PRIVATE int sqlcipher_codec_ctx_get_kdf_iter(codec_ctx *ctx); -int sqlcipher_codec_ctx_set_kdf_salt(codec_ctx *ctx, unsigned char *salt, int sz); -int sqlcipher_codec_ctx_get_kdf_salt(codec_ctx *ctx, void **salt); +SQLITE_PRIVATE int sqlcipher_codec_ctx_set_kdf_salt(codec_ctx *ctx, unsigned char *salt, int sz); +SQLITE_PRIVATE int sqlcipher_codec_ctx_get_kdf_salt(codec_ctx *ctx, void **salt); -int sqlcipher_codec_ctx_set_fast_kdf_iter(codec_ctx *, int); -int sqlcipher_codec_ctx_get_fast_kdf_iter(codec_ctx *); +SQLITE_PRIVATE int sqlcipher_codec_ctx_set_fast_kdf_iter(codec_ctx *, int); +SQLITE_PRIVATE int sqlcipher_codec_ctx_get_fast_kdf_iter(codec_ctx *); -const char* sqlcipher_codec_ctx_get_cipher(codec_ctx *ctx); +SQLITE_PRIVATE const char* sqlcipher_codec_ctx_get_cipher(codec_ctx *ctx); -void* sqlcipher_codec_ctx_get_data(codec_ctx *); +SQLITE_PRIVATE void* sqlcipher_codec_ctx_get_data(codec_ctx *); -void sqlcipher_set_default_use_hmac(int use); -int sqlcipher_get_default_use_hmac(void); +SQLITE_PRIVATE void sqlcipher_set_default_use_hmac(int use); +SQLITE_PRIVATE int sqlcipher_get_default_use_hmac(void); -void sqlcipher_set_hmac_salt_mask(unsigned char mask); -unsigned char sqlcipher_get_hmac_salt_mask(void); +SQLITE_PRIVATE void sqlcipher_set_hmac_salt_mask(unsigned char mask); +SQLITE_PRIVATE unsigned char sqlcipher_get_hmac_salt_mask(void); -int sqlcipher_codec_ctx_set_use_hmac(codec_ctx *ctx, int use); -int sqlcipher_codec_ctx_get_use_hmac(codec_ctx *ctx); +SQLITE_PRIVATE int sqlcipher_codec_ctx_set_use_hmac(codec_ctx *ctx, int use); +SQLITE_PRIVATE int sqlcipher_codec_ctx_get_use_hmac(codec_ctx *ctx); -int sqlcipher_codec_ctx_set_flag(codec_ctx *ctx, unsigned int flag); -int sqlcipher_codec_ctx_unset_flag(codec_ctx *ctx, unsigned int flag); -int sqlcipher_codec_ctx_get_flag(codec_ctx *ctx, unsigned int flag); +SQLITE_PRIVATE int sqlcipher_codec_ctx_set_flag(codec_ctx *ctx, unsigned int flag); +SQLITE_PRIVATE int sqlcipher_codec_ctx_unset_flag(codec_ctx *ctx, unsigned int flag); +SQLITE_PRIVATE int sqlcipher_codec_ctx_get_flag(codec_ctx *ctx, unsigned int flag); -const char* sqlcipher_codec_get_cipher_provider(codec_ctx *ctx); -int sqlcipher_codec_ctx_migrate(codec_ctx *ctx); -int sqlcipher_codec_add_random(codec_ctx *ctx, const char *data, int random_sz); -int sqlcipher_cipher_profile(tdsqlite3 *db, const char *destination); -int sqlcipher_codec_get_store_pass(codec_ctx *ctx); -void sqlcipher_codec_get_pass(codec_ctx *ctx, void **zKey, int *nKey); -void sqlcipher_codec_set_store_pass(codec_ctx *ctx, int value); -int sqlcipher_codec_fips_status(codec_ctx *ctx); -const char* sqlcipher_codec_get_provider_version(codec_ctx *ctx); +SQLITE_PRIVATE const char* sqlcipher_codec_get_cipher_provider(codec_ctx *ctx); +SQLITE_PRIVATE int sqlcipher_codec_ctx_migrate(codec_ctx *ctx); +SQLITE_PRIVATE int sqlcipher_codec_add_random(codec_ctx *ctx, const char *data, int random_sz); +SQLITE_PRIVATE int sqlcipher_cipher_profile(tdsqlite3 *db, const char *destination); +SQLITE_PRIVATE int sqlcipher_codec_get_store_pass(codec_ctx *ctx); +SQLITE_PRIVATE void sqlcipher_codec_get_pass(codec_ctx *ctx, void **zKey, int *nKey); +SQLITE_PRIVATE void sqlcipher_codec_set_store_pass(codec_ctx *ctx, int value); +SQLITE_PRIVATE int sqlcipher_codec_fips_status(codec_ctx *ctx); +SQLITE_PRIVATE const char* sqlcipher_codec_get_provider_version(codec_ctx *ctx); -int sqlcipher_set_default_plaintext_header_size(int size); -int sqlcipher_get_default_plaintext_header_size(void); -int sqlcipher_codec_ctx_set_plaintext_header_size(codec_ctx *ctx, int size); -int sqlcipher_codec_ctx_get_plaintext_header_size(codec_ctx *ctx); +SQLITE_PRIVATE int sqlcipher_set_default_plaintext_header_size(int size); +SQLITE_PRIVATE int sqlcipher_get_default_plaintext_header_size(void); +SQLITE_PRIVATE int sqlcipher_codec_ctx_set_plaintext_header_size(codec_ctx *ctx, int size); +SQLITE_PRIVATE int sqlcipher_codec_ctx_get_plaintext_header_size(codec_ctx *ctx); -int sqlcipher_set_default_hmac_algorithm(int algorithm); -int sqlcipher_get_default_hmac_algorithm(void); -int sqlcipher_codec_ctx_set_hmac_algorithm(codec_ctx *ctx, int algorithm); -int sqlcipher_codec_ctx_get_hmac_algorithm(codec_ctx *ctx); +SQLITE_PRIVATE int sqlcipher_set_default_hmac_algorithm(int algorithm); +SQLITE_PRIVATE int sqlcipher_get_default_hmac_algorithm(void); +SQLITE_PRIVATE int sqlcipher_codec_ctx_set_hmac_algorithm(codec_ctx *ctx, int algorithm); +SQLITE_PRIVATE int sqlcipher_codec_ctx_get_hmac_algorithm(codec_ctx *ctx); -int sqlcipher_set_default_kdf_algorithm(int algorithm); -int sqlcipher_get_default_kdf_algorithm(void); -int sqlcipher_codec_ctx_set_kdf_algorithm(codec_ctx *ctx, int algorithm); -int sqlcipher_codec_ctx_get_kdf_algorithm(codec_ctx *ctx); +SQLITE_PRIVATE int sqlcipher_set_default_kdf_algorithm(int algorithm); +SQLITE_PRIVATE int sqlcipher_get_default_kdf_algorithm(void); +SQLITE_PRIVATE int sqlcipher_codec_ctx_set_kdf_algorithm(codec_ctx *ctx, int algorithm); +SQLITE_PRIVATE int sqlcipher_codec_ctx_get_kdf_algorithm(codec_ctx *ctx); -void sqlcipher_set_mem_security(int); -int sqlcipher_get_mem_security(void); +SQLITE_PRIVATE void sqlcipher_set_mem_security(int); +SQLITE_PRIVATE int sqlcipher_get_mem_security(void); -int sqlcipher_find_db_index(tdsqlite3 *db, const char *zDb); +SQLITE_PRIVATE int sqlcipher_find_db_index(tdsqlite3 *db, const char *zDb); -int sqlcipher_codec_ctx_integrity_check(codec_ctx *, Parse *, char *); +SQLITE_PRIVATE int sqlcipher_codec_ctx_integrity_check(codec_ctx *, Parse *, char *); #endif #endif