Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Coding style and readability improvements. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
4029ce4a8a1233c109ac4172853f05f4 |
| User & Date: | mistachkin 2017-10-27 00:23:10 |
Context
|
2017-10-27
| ||
| 03:30 | Update SQLite core library to the 3.21.0 release. check-in: 24e3dd0f10 user: mistachkin tags: trunk | |
| 00:23 | Coding style and readability improvements. check-in: 4029ce4a8a user: mistachkin tags: trunk | |
|
2017-10-25
| ||
| 17:07 | Temporarily re-enable the legacy CryptoAPI codec. check-in: 9486553a2c user: mistachkin tags: trunk | |
Changes
Changes to SQLite.Interop/src/win/crypt.c.
30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 ... 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 ... 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 ... 452 453 454 455 456 457 458 459 460 461 462 463 464 465 |
/* Needed for re-keying */
static void * sqlite3pager_get_codecarg(Pager *pPager)
{
return (pPager->xCodec) ? pPager->pCodec: NULL;
}
void sqlite3_activate_see(const char *info)
{
}
/* Create a cryptographic context. Use the enhanced provider because it is available on
** most platforms
*/
static BOOL InitializeProvider()
{
MUTEX_LOGIC( sqlite3_mutex *pMaster = sqlite3_mutex_alloc(SQLITE_MUTEX_STATIC_MASTER); )
sqlite3_mutex_enter(pMaster);
................................................................................
{
CreateCryptBlock(pBlock->hReadKey, pBlock->pPager, pageSize, pBlock);
/* If this fails, pvCrypt will be NULL, and the next time sqlite3Codec() is called, it will result in an error */
}
}
/* Encrypt/Decrypt functionality, called by pager.c */
void * sqlite3Codec(void *pArg, void *data, Pgno nPageNum, int nMode)
{
LPCRYPTBLOCK pBlock = (LPCRYPTBLOCK)pArg;
DWORD dwPageSize;
LPVOID pvTemp = NULL;
if (!pBlock) return data;
if (pBlock->pvCrypt == NULL) return NULL; /* This only happens if CreateCryptBlock() failed to make scratch space */
................................................................................
Btree *pbt = db->aDb[0].pBt;
Pager *p = sqlite3BtreePager(pbt);
LPCRYPTBLOCK pBlock = (LPCRYPTBLOCK)sqlite3pager_get_codecarg(p);
if (ppKey) *ppKey = 0;
if (pnKeyLen) *pnKeyLen = pBlock ? 1: 0;
}
/* We do not attach this key to the temp store, only the main database. */
SQLITE_API int sqlite3_key_v2(sqlite3 *db, const char *zDbName, const void *pKey, int nKey)
{
return sqlite3CodecAttach(db, 0, pKey, nKey);
}
SQLITE_API int sqlite3_key(sqlite3 *db, const void *pKey, int nKey)
{
return sqlite3_key_v2(db, 0, pKey, nKey);
}
/* Changes the encryption key for an existing database. */
SQLITE_API int sqlite3_rekey_v2(sqlite3 *db, const char *zDbName, const void *pKey, int nKey)
{
Btree *pbt = db->aDb[0].pBt;
Pager *p = sqlite3BtreePager(pbt);
LPCRYPTBLOCK pBlock = (LPCRYPTBLOCK)sqlite3pager_get_codecarg(p);
................................................................................
}
sqlite3_mutex_leave(db->mutex);
return rc;
}
SQLITE_API int sqlite3_rekey(sqlite3 *db, const void *pKey, int nKey)
{
return sqlite3_rekey_v2(db, 0, pKey, nKey);
}
#endif /* SQLITE_HAS_CODEC */
#endif /* SQLITE_OMIT_DISKIO */
|
< < < < | > > > > > > > > > < < < < < |
30 31 32 33 34 35 36 37 38 39 40 41 42 43 ... 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 ... 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 ... 457 458 459 460 461 462 463 464 465 |
/* Needed for re-keying */
static void * sqlite3pager_get_codecarg(Pager *pPager)
{
return (pPager->xCodec) ? pPager->pCodec: NULL;
}
/* Create a cryptographic context. Use the enhanced provider because it is available on
** most platforms
*/
static BOOL InitializeProvider()
{
MUTEX_LOGIC( sqlite3_mutex *pMaster = sqlite3_mutex_alloc(SQLITE_MUTEX_STATIC_MASTER); )
sqlite3_mutex_enter(pMaster);
................................................................................
{
CreateCryptBlock(pBlock->hReadKey, pBlock->pPager, pageSize, pBlock);
/* If this fails, pvCrypt will be NULL, and the next time sqlite3Codec() is called, it will result in an error */
}
}
/* Encrypt/Decrypt functionality, called by pager.c */
static void *sqlite3Codec(void *pArg, void *data, Pgno nPageNum, int nMode)
{
LPCRYPTBLOCK pBlock = (LPCRYPTBLOCK)pArg;
DWORD dwPageSize;
LPVOID pvTemp = NULL;
if (!pBlock) return data;
if (pBlock->pvCrypt == NULL) return NULL; /* This only happens if CreateCryptBlock() failed to make scratch space */
................................................................................
Btree *pbt = db->aDb[0].pBt;
Pager *p = sqlite3BtreePager(pbt);
LPCRYPTBLOCK pBlock = (LPCRYPTBLOCK)sqlite3pager_get_codecarg(p);
if (ppKey) *ppKey = 0;
if (pnKeyLen) *pnKeyLen = pBlock ? 1: 0;
}
SQLITE_API void sqlite3_activate_see(const char *info)
{
}
/* We do not attach this key to the temp store, only the main database. */
SQLITE_API int sqlite3_key_v2(sqlite3 *db, const char *zDbName, const void *pKey, int nKey)
{
return sqlite3CodecAttach(db, 0, pKey, nKey);
}
SQLITE_API int sqlite3_key(sqlite3 *db, const void *pKey, int nKey)
{
return sqlite3_key_v2(db, 0, pKey, nKey);
}
SQLITE_API int sqlite3_rekey(sqlite3 *db, const void *pKey, int nKey)
{
return sqlite3_rekey_v2(db, 0, pKey, nKey);
}
/* Changes the encryption key for an existing database. */
SQLITE_API int sqlite3_rekey_v2(sqlite3 *db, const char *zDbName, const void *pKey, int nKey)
{
Btree *pbt = db->aDb[0].pBt;
Pager *p = sqlite3BtreePager(pbt);
LPCRYPTBLOCK pBlock = (LPCRYPTBLOCK)sqlite3pager_get_codecarg(p);
................................................................................
}
sqlite3_mutex_leave(db->mutex);
return rc;
}
#endif /* SQLITE_HAS_CODEC */
#endif /* SQLITE_OMIT_DISKIO */
|