From feda8a7db8d1d7c5439aa8f8feef7cc0dd2b59a0 Mon Sep 17 00:00:00 2001
From: Unit 193 <unit193@ubuntu.com>
Date: Fri, 27 Jul 2018 23:51:12 -0400
Subject: New upstream version 3.2.1+dfsg1

---
 Plugins/DbSqliteSystemData/systemdata_crypt.c | 28 ++++++++++-----------------
 1 file changed, 10 insertions(+), 18 deletions(-)

(limited to 'Plugins/DbSqliteSystemData/systemdata_crypt.c')

diff --git a/Plugins/DbSqliteSystemData/systemdata_crypt.c b/Plugins/DbSqliteSystemData/systemdata_crypt.c
index 7268aba..67ec475 100644
--- a/Plugins/DbSqliteSystemData/systemdata_crypt.c
+++ b/Plugins/DbSqliteSystemData/systemdata_crypt.c
@@ -10,7 +10,6 @@
 
 #include <windows.h>
 #include <wincrypt.h>
-#include "systemdata_sqlite3.h"
 
 /* Extra padding before and after the cryptographic buffer */
 #define CRYPT_OFFSET 8
@@ -35,10 +34,6 @@ static void * systemdata_sqlite3pager_get_codecarg(Pager *pPager)
   return (pPager->xCodec) ? pPager->pCodec: NULL;
 }
 
-void systemdata_sqlite3_activate_see(const char *info)
-{
-}
-
 /* Create a cryptographic context.  Use the enhanced provider because it is available on
 ** most platforms
 */
@@ -153,7 +148,7 @@ void systemdata_sqlite3CodecSizeChange(void *pArg, int pageSize, int reservedSiz
 }
 
 /* Encrypt/Decrypt functionality, called by pager.c */
-void * systemdata_sqlite3Codec(void *pArg, void *data, Pgno nPageNum, int nMode)
+static void *systemdata_sqlite3Codec(void *pArg, void *data, Pgno nPageNum, int nMode)
 {
   LPCRYPTBLOCK pBlock = (LPCRYPTBLOCK)pArg;
   DWORD dwPageSize;
@@ -327,6 +322,10 @@ void systemdata_sqlite3CodecGetKey(systemdata_sqlite3 *db, int nDb, void **ppKey
   if (pnKeyLen) *pnKeyLen = pBlock ? 1: 0;
 }
 
+SQLITE_API void systemdata_sqlite3_activate_see(const char *info)
+{
+}
+
 /* We do not attach this key to the temp store, only the main database. */
 SQLITE_API int systemdata_sqlite3_key_v2(systemdata_sqlite3 *db, const char *zDbName, const void *pKey, int nKey)
 {
@@ -338,6 +337,11 @@ SQLITE_API int systemdata_sqlite3_key(systemdata_sqlite3 *db, const void *pKey,
   return systemdata_sqlite3_key_v2(db, 0, pKey, nKey);
 }
 
+SQLITE_API int systemdata_sqlite3_rekey(systemdata_sqlite3 *db, const void *pKey, int nKey)
+{
+  return systemdata_sqlite3_rekey_v2(db, 0, pKey, nKey);
+}
+
 /* Changes the encryption key for an existing database. */
 SQLITE_API int systemdata_sqlite3_rekey_v2(systemdata_sqlite3 *db, const char *zDbName, const void *pKey, int nKey)
 {
@@ -457,18 +461,6 @@ SQLITE_API int systemdata_sqlite3_rekey_v2(systemdata_sqlite3 *db, const char *z
   return rc;
 }
 
-SQLITE_API int systemdata_sqlite3_rekey(systemdata_sqlite3 *db, const void *pKey, int nKey)
-{
-  return systemdata_sqlite3_rekey_v2(db, 0, pKey, nKey);
-}
-
 #endif /* SQLITE_HAS_CODEC */
 #endif /* SQLITE_OMIT_DISKIO */
 
-
-
-
-
-
-
-
-- 
cgit v1.2.3