status-im
/
sqlcipher
mirror of https://github.com/status-im/sqlcipher.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
131 Commits 14 Branches 44 Tags 45 MiB
Commit Graph

131 Commits

Author SHA1 Message Date
Billy Gray 53328715a8 again with the archs setting, turn it back on, 32 bit, things build now 2011-05-20 12:44:33 -04:00
Billy Gray 542e64b231 drop arch setting in project file 2011-05-12 10:03:04 -04:00
Stephen Lombardo e28cda5cfe Merge branch 'master' into ditto 2011-03-14 16:20:13 -04:00
Stephen Lombardo 3f834ff2d3 exclude xc4 project files from version control 2011-03-14 16:19:46 -04:00
Stephen Lombardo 3bebc079a4 Merge branch 'master' into ditto 2011-03-14 12:14:09 -04:00
Stephen Lombardo df4dc37c34 set SKIP_INSTALL for XC4 compat 2011-03-14 12:13:30 -04:00
Stephen Lombardo f13ba3d21e set architecture and products at project level, including armv7 2011-03-12 23:58:13 -05:00
Stephen Lombardo e0b6d87c2d Merge branch 'master' of github.com:sjlombardo/sqlcipher 2011-03-12 22:40:07 -05:00
Stephen Lombardo 54fb0db816 Add explicit list of supported platforms and architectures to project build settings for compatibility with XCode 4 2011-03-12 22:39:18 -05:00
Stephen Lombardo d6d64068d9 clarify build with temp store options 2010-10-12 15:31:27 -07:00
Stephen Lombardo 0266ddf6be Merge branch 'master' into ditto 2010-10-03 08:56:49 -04:00
Stephen Lombardo c45622d14d mutexes in rekey 2010-10-03 08:56:16 -04:00
Stephen Lombardo a24078d7d6 Merge branch 'master' into ditto 2010-10-03 01:15:21 -04:00
Stephen Lombardo 658cb02be9 update other areas relying on GetPageSize to use default; Enter db->mutex before forcing page size 2010-10-03 01:14:16 -04:00
Stephen Lombardo 12aedf2fac Merge branch 'master' into ditto 2010-10-01 13:08:42 -04:00
Stephen Lombardo a1439c8d71 resolve bug where page size is improperly set 2010-10-01 13:07:37 -04:00
Stephen Lombardo 470960072c Merge branch 'master' into ditto 2010-09-03 07:46:08 -04:00
Stephen Lombardo 680e30f229 rename utf.o to utf.lo in Makefile.in to resolve upstream make dependency issue on some platforms 2010-09-03 07:45:52 -04:00
Stephen Lombardo 3496247069 Merge branch 'master' into ditto 2010-08-28 08:55:02 -04:00
Stephen Lombardo 201197adbb minor tweaks to configure / build defines 2010-08-28 08:52:39 -04:00
Stephen Lombardo 90f8b72c2d Merge branch 'master' into ditto 2010-08-28 08:50:38 -04:00
Stephen Lombardo ebecc71a89 accommodate new void return from sqlite3PagerPagecount 2010-08-28 08:44:25 -04:00
Stephen Lombardo 8a76b73193 Merge branch 'sqlite-release' into integration 2010-08-28 08:38:03 -04:00
Stephen Lombardo 92bc32215d track 3.7.2 2010-08-28 08:35:57 -04:00
Stephen Lombardo 59e8fd2113 change if to ifdef to placate VS 2010-08-28 08:31:38 -04:00
Stephen Lombardo 977edf436e Merge branch 'master' into ditto 2010-08-22 16:01:06 -04:00
Stephen Lombardo fe11a8cb66 Merge branch 'sqlite-release' 2010-08-06 23:08:05 -04:00
Stephen Lombardo 953ca18eb6 track 3.7.0.1 2010-08-06 23:07:48 -04:00
Stephen Lombardo 89b4284cf5 Merge branch 'master' into ditto 2010-07-22 09:44:53 -04:00
Stephen Lombardo 29b781102a Merge branch 'sqlite-release' into integration 
Conflicts:
	Makefile.in
	test/quick.test
 2010-07-22 09:23:51 -04:00
Stephen Lombardo 7b63a4edde track 3.7.0 2010-07-22 09:16:22 -04:00
Stephen Lombardo 7c6ac4010e Merge branch 'master' into ditto 2010-06-14 14:22:48 -04:00
Stephen Lombardo 4f320b6336 thread safe eutex in activate_openssl 2010-06-09 14:39:25 -04:00
Stephen Lombardo 900429e356 Merge branch 'master' into ditto 2010-05-18 22:03:01 -04:00
Stephen Lombardo c0cf162583 explicitly use /usr/bin/gcc to avoid conifgure issues under armv6 builds 2010-05-18 22:00:28 -04:00
Stephen Lombardo c2e4ece7e3 Merge branch 'master' into ditto 2010-05-18 12:30:45 -04:00
Stephen Lombardo 11a0e2bb8f Merge branch 'sqlite-release' into release-integration 2010-05-18 12:24:16 -04:00
Stephen Lombardo 4bb256127b update 3.6.23.1 2010-05-18 12:22:17 -04:00
Stephen Lombardo 74e43bd423 Merge branch 'master' into ditto 2010-02-25 12:06:43 -05:00
Stephen Lombardo 43fc841d6a minor fix to readme compile instructions for shared linking 2010-02-25 11:59:23 -05:00
Stephen Lombardo c10960834f fix issue where it wasn't possible to ATTACH an unencrypted database 2010-02-25 11:58:56 -05:00
Stephen Lombardo 445b6d3442 Merge branch 'master' into ditto 2009-12-30 14:52:42 -05:00
Stephen Lombardo 433a2a6641 force allocation of IV space at end of database pages, even if current cipher doesn't require it (i.e. ECB mode) 2009-12-30 14:52:03 -05:00
Stephen Lombardo b38a9d20a2 fix initialization of OpenSSL so an encrypted database can be attached to a non-encrypted main database; add test for the same 2009-12-23 21:45:51 -05:00
Stephen Lombardo b80464125c Merge branch 'master' into ditto 2009-12-20 23:04:56 -05:00
Stephen Lombardo 982f416442 add missing sqlite3PageFree and sqlite3PcacheClose to sqlite3PagerClose missed in previous merge 2009-12-20 00:05:44 -05:00
Stephen Lombardo 0e55063b10 remove rekey-plaintext test, not supported on master 2009-12-19 16:10:53 -05:00
Stephen Lombardo 2b97c700e9 Merge branch 'sqlite-release' into integration 
Conflicts:
	Makefile.in
 2009-12-19 15:58:56 -05:00
Stephen Lombardo 090d3d3b9b update to 3.6.21 2009-12-19 15:56:40 -05:00
Stephen Lombardo c6042bb75f add ditto include directory based on $(DITTO_SRC) to project c flags 2009-12-09 13:02:35 -05:00