Commit Graph

Select branches

Hide Pull Requests

1.1.x

Xcode5

attach

ditto

ditto-4000kdf

kdfiter

master

migrate

multi-lib

prerelease

rekey-hotfix

sqlite-release

update-config-guess

v2.0-stable

1.1.4

2.0.1

v1.1.0

v1.1.1

v1.1.10

v1.1.2

v1.1.3

v1.1.4

v1.1.5

v1.1.6

v1.1.7

v1.1.8

v1.1.9

v2.0.0

v2.0.2_RC2

v2.0.3

v2.0.4_RC1

v2.0.5

v2.0.5_RC1

v2.0.5_RC2

v2.0.6

v2.1.0

v2.1.1

v2.2.0

v2.2.1

v3.0.0

v3.0.1

v3.1.0

v3.2.0

v3.3.0

v3.3.1

v3.4.0

v3.4.1

v3.4.2

v4.0.0

v4.0.1

v4.1.0

v4.2.0

v4.3.0

v4.4.0

v4.4.1

v4.4.2

v4.4.3

v4.5.0

Mono Color

• b5ece46779 Remove ltc_ctx, adjust sqlcipher_ltc_add_random behavior Nick Parker 2013-11-25 17:39:26 -06:00
• 8348d8e1ed Fix compilation for Windows Nick Parker 2013-11-25 14:46:26 -06:00
• bc058122a8 Static ltc prng state, add partitioned data to prng Nick Parker 2013-11-25 11:52:30 -06:00
• 930b441e81 Add PRAGMA cipher_add_random to source external entropy Nick Parker 2013-11-25 10:34:09 -06:00
• 73b0558275 Merge branch 'master' into ditto Stephen Lombardo 2013-11-11 11:20:26 -05:00
• c7986f2905 Do not use VirtualLock/Unlock on WinRT or Windows Phone v3.0.0 Nick Parker 2013-11-04 16:42:32 -06:00
• 8338f32f04 Adjust title of cipher_migrate output Nick Parker 2013-10-16 10:24:06 -05:00
• 004badc305 Merge branch 'prerelease' into ditto Stephen Lombardo 2013-10-15 14:27:55 -04:00
• a77ab89179 fix issue in configure with bare comments Stephen Lombardo 2013-10-15 14:26:33 -04:00
• 0b08b57f61 Merge branch 'prerelease' into ditto Stephen Lombardo 2013-10-15 14:14:06 -04:00
• bdd8d0a5c6 Change pass field to unsigned char * in cipher_ctx Nick Parker 2013-10-15 10:06:27 -05:00
• 035ae3eb17 Fix compiler warnings Nick Parker 2013-10-15 09:43:07 -05:00
• d2a266e104 adjusts xcodeproj, resumes use of amalgation target as dependency, no longer needs manual/makefile build Billy Gray 2013-10-14 11:53:15 -04:00
• 894b8ac578 minor adjustments to .xcodeproj Billy Gray 2013-10-14 11:40:58 -04:00
• a96e48cdcf Update ditto submodule Nick Parker 2013-10-14 08:20:35 -05:00
• 43bb4369ca Merge branch 'prerelease' into ditto Billy Gray 2013-10-08 15:18:44 -04:00
• 95bb90e33c Merge sqlite-release(3.8.0.2) into prerelease-integration Nick Parker 2013-10-01 14:36:23 -05:00
• 0b3ee4466d Snapshot of upstream SQLite 3.8.0.2 Nick Parker 2013-10-01 14:26:57 -05:00
• c640ee5037 Merge branch 'ditto' of https://github.com/sqlcipher/sqlcipher into ditto Billy Gray 2013-09-29 14:40:19 -04:00
• 423fd374db Merge branch 'prerelease' of github.com:sqlcipher/sqlcipher into ditto Billy Gray 2013-09-27 13:01:45 -04:00
• ccb36a07e2 Adjust file size of sqlcipher-3.0-testkey.db to 1 MB Nick Parker 2013-09-23 16:55:46 -05:00
• dac4536bad Bumping file size of sqlcipher-2.0-beta-testkey.db to 1 MB Nick Parker 2013-09-23 16:51:26 -05:00
• 85520469e2 Adjust sqlcipher-2.0-be-testkey.db to 1 MB in size Nick Parker 2013-09-23 16:46:34 -05:00
• 0add35073b Adjust file size of sqlcipher-2.0-le-testkey.db to over 1 MB Nick Parker 2013-09-23 16:41:34 -05:00
• 9ef4eec581 Adjust sqlite3_test_control_pending_byte to test larger files - Bump records in 1.1.8 db to increase file size to 1 MB. Nick Parker 2013-09-23 16:29:49 -05:00
• fc2fcff453 Ignore hmac read during Btree file copy Nick Parker 2013-09-23 11:00:48 -05:00
• 314f5735d9 Merge branch 'Xcode5' of github.com:sqlcipher/sqlcipher into prerelease Xcode5 Billy Gray 2013-09-13 15:49:08 -04:00
• 0e21396eb1 Merge branch 'prerelease' of github.com:sqlcipher/sqlcipher into prerelease Billy Gray 2013-09-13 15:49:01 -04:00
• cf42f10c5d sets iOS 4.3 as base deployment target, overrides to 6.0 as required for arm64 arch Billy Gray 2013-09-13 12:35:32 -04:00
• 94abbd2595 specifies all valid archs for xcode-build compatibility with other platforms Billy Gray 2013-09-12 17:51:47 -04:00
• d91db799e9 Merge branch 'ditto' of github.com:sqlcipher/sqlcipher into ditto Billy Gray 2013-09-12 16:44:49 -04:00
• 9c6e9aa9dd Merge branch 'prerelease' of github.com:sqlcipher/sqlcipher into ditto Billy Gray 2013-09-12 16:44:44 -04:00
• 58c95b38b2 adds archs settings branch for Any iOS Simulator SDK which defaults to i386 instead of standard archs+64, overrident to standard+64 Billy Gray 2013-09-12 16:04:47 -04:00
• 3019c79930 Merge branch 'prerelease' of https://github.com/sqlcipher/sqlcipher into Xcode5 Billy Gray 2013-09-12 15:57:01 -04:00
• 4093d93e68 adjusts sqlcipher.xcodeproj, attempting to switch to new standard archs including 64bit, but simulator still building i386 Billy Gray 2013-09-12 15:56:03 -04:00
• a28129e3f6 Merge branch 'prerelease' of https://github.com/sqlcipher/sqlcipher into Xcode5 Billy Gray 2013-09-12 12:49:31 -04:00
• 9d84aca41d Proper format for key on attach, migrate user_version Nick Parker 2013-09-12 09:16:21 -05:00
• 5039249fbd Merge branch 'prerelease' into ditto Stephen Lombardo 2013-09-11 19:10:07 -04:00
• 94136efe55 Merge branch 'prerelease' of github.com:sqlcipher/sqlcipher into ditto Billy Gray 2013-09-11 16:47:14 -04:00
• 95cbe72894 Merge branch 'prerelease' of github.com:sqlcipher/sqlcipher into ditto Billy Gray 2013-09-11 14:25:10 -04:00
• 611e26060f Merge branch 'prerelease' into ditto Billy Gray 2013-09-10 13:34:43 -04:00
• 018c0fb979 remove unused variables Stephen Lombardo 2013-09-03 17:29:13 -04:00
• 16167e9855 restore use of ArraySize convenience function Stephen Lombardo 2013-09-03 16:54:23 -04:00
• f2912623bc fix regression itroduced in prior commit Stephen Lombardo 2013-09-03 16:47:11 -04:00
• f25510fb98 ANSI C and win c compiler fixes Stephen Lombardo 2013-09-11 16:27:27 -04:00
• 4872b2af20 Fix lib naming for pkg-config Nick Parker 2013-09-06 07:55:32 -05:00
• fd75108661 Merge sqlite-release(3.8.0.1) into prerelease-integration Nick Parker 2013-08-30 16:09:14 -05:00
• 679f2be40c Snapshot of upstream SQLite 3.8.0.1 Nick Parker 2013-08-30 16:04:26 -05:00
• 2cb820717e Add test to key multiple databases with pragma using different keys Nick Parker 2013-08-30 15:47:48 -05:00
• 7a6ce37e61 Merge branch 'sqlite-release' into prerelease Stephen Lombardo 2013-08-30 15:12:24 -04:00
• 7c0cc33aab remove files that aren't included upstream Stephen Lombardo 2013-08-30 15:08:24 -04:00
• 045844f0cc Adjust codec tracing, add rekey by name test. Nick Parker 2013-08-30 09:49:46 -05:00
• 4bc456d6e7 Remove files that were added that shouldn't have been. Nick Parker 2013-08-30 08:43:15 -05:00
• 480250aa82 Adding test for pragma key on attach Nick Parker 2013-08-30 08:26:18 -05:00
• 1ba0e0e418 Adjust db_index search count and rename codec_pragma Nick Parker 2013-08-30 08:24:57 -05:00
• 20a92abadb Using the _v2 version of key and rekey. Nick Parker 2013-08-29 14:49:37 -05:00
• 1f17e15851 Implement sqlite3_key_v2 & sqlite3_rekey_v2. Nick Parker 2013-08-29 11:57:03 -05:00
• 432585f0f8 Adjustments due to upstream merging Nick Parker 2013-08-29 09:04:14 -05:00
• 897f402696 Merge sqlite-release(3.8.0) into prerelease-integration Nick Parker 2013-08-29 08:22:50 -05:00
• 45915dda5d Snapshot of upstream SQLite 3.8.0 Nick Parker 2013-08-29 08:11:18 -05:00
• dffb49da90 Merge branch 'prerelease' into ditto Billy Gray 2013-08-28 18:33:10 -04:00
• 3343aaf77e corrects use of openssl api to commoncrypto, links Security.framework, re-links libsqlcipher.a to fix archive errors, removes use of openssl Billy Gray 2013-08-27 16:05:48 -04:00
• f1069eeefe Unlinks amalgamation target as dependency, run make to execute amalgamation by Makefile before building in Xcode Billy Gray 2013-08-27 12:05:26 -04:00
• 167aab2da6 Merge branch 'prerelease' into Xcode5 Billy Gray 2013-08-27 12:04:40 -04:00
• 4534af9072 updates amalgamation script, but we'll probably have to drop it for Makefile Billy Gray 2013-08-27 11:48:48 -04:00
• 7d3f1c0476 Migrate user_version during cipher_migrate migrate Nick Parker 2013-08-26 15:23:24 -05:00
• eeaf77af36 Add tests around rekey using WAL mode rekey-hotfix Nick Parker 2013-08-23 16:15:21 -05:00
• cd7d635b23 move kdf_salt, et al. from codec_ctx to cipher_ctx Stephen Lombardo 2013-08-20 18:23:18 -04:00
• 82344f20d2 Merge branch 'prerelease' of github.com:sqlcipher/sqlcipher into ditto Billy Gray 2013-08-14 15:25:25 -04:00
• f4eb3b33c6 Bump cipher_version to 3.0.0 Nick Parker 2013-08-14 08:20:32 -05:00
• df823dd13e Merge branch 'prerelease' into ditto Billy Gray 2013-08-13 23:23:06 -04:00
• cfee6c249c Merge branch 'attach' into kdfiter kdfiter Nick Parker 2013-08-13 15:27:51 -05:00
• 6f4a0f2d8d Adjustments to cipher_migrate attach Nick Parker 2013-08-13 14:53:08 -05:00
• c3f6cf1e02 null termination of key value Stephen Lombardo 2013-08-13 12:54:16 -04:00
• dce806aae5 Add tests for cipher_migrate Nick Parker 2013-08-12 15:09:11 -05:00
• f844a5dfc3 Attach new codec before btree copy Nick Parker 2013-07-29 11:04:29 -05:00
• 835a446d28 improve test for rekey using same password Stephen Lombardo 2013-07-27 00:06:12 -04:00
• 185253725c use sqlcipher_malloc and sqlcipher_free Stephen Lombardo 2013-07-26 23:59:20 -04:00
• bcbbfce020 Generate new salt on rekey Nick Parker 2013-08-16 11:09:18 -05:00
• 9b415f6401 Work to configure the proper env. for the migration Nick Parker 2013-07-26 16:50:36 -05:00
• b507d1b180 Clean up compiler warnings Nick Parker 2013-07-26 09:29:36 -05:00
• fb14d957ca Swap btree for write, reset password on codec - working. Nick Parker 2013-07-26 09:20:18 -05:00
• b92ddfc1ef More work on cipher_migrate, still unusable Nick Parker 2013-07-25 16:22:58 -05:00
• 4bc6ba08f8 Initial work on a PRAGMA cipher_migrate Nick Parker 2013-07-24 17:07:42 -05:00
• 2a64a92297 Merge branch 'master' into ditto Billy Gray 2013-07-23 17:17:40 -04:00
• 6cd1fdf60b finalize new attach behavior Stephen Lombardo 2013-07-19 12:50:14 -04:00
• 81e487afb7 Merge remote-tracking branch 'origin/prerelease' into kdfiter Nick Parker 2013-07-11 16:21:00 -05:00
• 1d3fc78431 Merge branch 'prerelease' into kdfiter Nick Parker 2013-07-11 14:51:09 -05:00
• c61663d780 Merge branch 'prerelease' v2.2.1 Stephen Lombardo 2013-07-10 10:52:24 -04:00
• 3ef19cf3d5 Merge branch 'prerelease' of github.com:sqlcipher/sqlcipher into prerelease Stephen Lombardo 2013-07-10 10:46:05 -04:00
• 337eac9fd9 bump cipher_version to 2.2.1 Stephen Lombardo 2013-07-10 10:45:44 -04:00
• 15c09c04c7 Update README Nick Parker 2013-07-09 11:56:01 -05:00
• 8866a9f6cf allow -DSQLCIPHER_OPENSSL_NO_MUTEX_RAND to disable openssl rand mutex Stephen Lombardo 2013-07-09 11:57:02 -04:00
• f3389d23a2 mutex around RAND_bytes() Stephen Lombardo 2013-07-09 11:30:19 -04:00
• 573d7b209d improve initialization and thread safety for default crypto provider Stephen Lombardo 2013-07-09 11:26:40 -04:00
• 5827b3d3db Merge branch 'prerelease' into attach Stephen Lombardo 2013-06-27 19:09:42 -04:00
• a2bb641e48 64k iterations plus pragma cipher_default_kdf_iter function Stephen Lombardo 2013-06-27 19:07:58 -04:00
• a1fb0d2316 Merge branch 'prerelease' v2.2.0 Nick Parker 2013-06-27 10:13:06 -05:00
• 581876802e fix build warnings under VS Stephen Lombardo 2013-06-27 11:01:59 -04:00
• b13e77f669 Merge branch 'prerelease' Nick Parker 2013-06-27 09:24:30 -05:00