Skip to content

Commit 586515f

Browse files
Merge branch 'prerelease' for 3.4.0 release
2 parents 9096584 + 3cbf645 commit 586515f

File tree

771 files changed

+148148
-44065
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

771 files changed

+148148
-44065
lines changed

.github/CONTRIBUTING.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
We ask that you submit a contributor agreement in order for us to accept this request. More information about this agreement can be found [here](https://www.zetetic.net/contributions/). Pull requests are merged into the `prerelease` branch. Please let us know if you have any further questions. Thanks!

.github/ISSUE_TEMPLATE.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
### Expected Behavior
2+
3+
### Actual Behavior
4+
5+
### Steps to Reproduce
6+
7+
SQLCipher version:
8+
9+
*Note:* If you are not posting a specific issue for the SQLCipher library, please consider posting your question to the SQLCipher [discuss site](https://discuss.zetetic.net/c/sqlcipher). Thanks!

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Changes proposed in this pull request:
2+
-

CHANGELOG.md

Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
# SQLCipher Change Log
2+
All notable changes to this project will be documented in this file.
3+
4+
## [Unreleased][unreleased]
5+
6+
## [3.4.0] - 2016-02-??
7+
### Added
8+
- Added `PRAGMA cipher_provider_version`
9+
10+
### Changed
11+
- Merged upstream SQLite 3.11.0
12+
13+
### Deprecated
14+
- Deprecated `PRAGMA cipher` command
15+
16+
## [3.3.1] - 2015-07-13
17+
### Changed
18+
- Merge upstream SQLite 3.8.10.2
19+
- Fixed segfault when provided an invalid cipher name
20+
- Check for codec context when performing `PRAGMA cipher_store_pass`
21+
- Remove extraneous null check in `PRAGMA cipher_migrate`
22+
23+
## [3.3.0] - 2015-03-25
24+
### Added
25+
- Added FIPS API calls within the OpenSSL crypto provider
26+
- `PRAGMA cipher_default_page_size` - support for attaching non-default page sizes
27+
28+
### Changed
29+
- Merged upstream SQLite 3.8.8.3
30+
31+
## [3.2.0] - 2014-09-30
32+
### Added
33+
- Added `PRAGMA cipher_store_pass`
34+
35+
### Changed
36+
- Merged upstream SQLite 3.8.6
37+
- Renmed README to README.md
38+
39+
## [3.1.0] - 2014-04-23
40+
### Added
41+
- Added `PRAGMA cipher_profile`
42+
43+
### Changed
44+
- Merged upstream SQLite 3.8.4.3
45+
46+
## [3.0.1] - 2013-12-06
47+
### Added
48+
- Added `PRAGMA cipher_add_random` to source external entropy
49+
50+
### Changed
51+
- Fix `PRAGMA cipher_migrate` to handle passphrases longer than 64 characters & raw keys
52+
- Improvements to the libtomcrypt provider
53+
54+
## [3.0.0] - 2013-11-05
55+
### Added
56+
- Added `PRAGMA cipher_migrate` to migrate older database file formats
57+
58+
### Changed
59+
- Merged upstream SQLite 3.8.0.2
60+
- Remove usage of VirtualLock/Unlock on WinRT and Windows Phone
61+
- Ignore HMAC read during Btree file copy
62+
- Fix lib naming for pkg-config
63+
- Use _v2 version of `sqlite3_key` and `sqlite3_rekey`
64+
- Update xcodeproj file
65+
66+
### Security
67+
- Change KDF iteration length from 4,000 to 64,000
68+
69+
[unreleased]: https://github.com/sqlcipher/sqlcipher/compare/v3.4.0...prerelease
70+
[3.4.0]: https://github.com/sqlcipher/sqlcipher/compare/v3.3.1...v3.4.0
71+
[3.3.1]: https://github.com/sqlcipher/sqlcipher/compare/v3.3.0...v3.3.1
72+
[3.3.0]: https://github.com/sqlcipher/sqlcipher/compare/v3.2.0...v3.3.0
73+
[3.2.0]: https://github.com/sqlcipher/sqlcipher/compare/v3.1.0...v3.2.0
74+
[3.1.0]: https://github.com/sqlcipher/sqlcipher/compare/v3.0.1...v3.1.0
75+
[3.0.1]: https://github.com/sqlcipher/sqlcipher/compare/v3.0.0...v3.0.1
76+
[3.0.0]: https://github.com/sqlcipher/sqlcipher/compare/v2.2.0...v3.0.0
77+
[2.2.0]: https://github.com/sqlcipher/sqlcipher/compare/v2.1.1...v2.2.0
78+
[2.1.1]: https://github.com/sqlcipher/sqlcipher/compare/v2.1.0...v2.1.1
79+
[2.1.0]: https://github.com/sqlcipher/sqlcipher/compare/v2.0.6...v2.1.0
80+
[2.0.6]: https://github.com/sqlcipher/sqlcipher/compare/v2.0.5...v2.0.6
81+
[2.0.5]: https://github.com/sqlcipher/sqlcipher/compare/v2.0.3...v2.0.5
82+
[2.0.3]: https://github.com/sqlcipher/sqlcipher/compare/v2.0.0...v2.0.3
83+
[2.0.0]: https://github.com/sqlcipher/sqlcipher/compare/v1.1.10...v2.0.0
84+
[1.1.10]: https://github.com/sqlcipher/sqlcipher/compare/v1.1.9...v1.1.10
85+
[1.1.9]: https://github.com/sqlcipher/sqlcipher/compare/v1.1.8...v1.1.9
86+
[1.1.8]: https://github.com/sqlcipher/sqlcipher/compare/v1.1.7...v1.1.8
87+
[1.1.7]: https://github.com/sqlcipher/sqlcipher/compare/v1.1.6...v1.1.7
88+
[1.1.6]: https://github.com/sqlcipher/sqlcipher/compare/v1.1.5...v1.1.6
89+
[1.1.5]: https://github.com/sqlcipher/sqlcipher/compare/v1.1.4...v1.1.5
90+
[1.1.4]: https://github.com/sqlcipher/sqlcipher/compare/v1.1.3...v1.1.4
91+
[1.1.3]: https://github.com/sqlcipher/sqlcipher/compare/v1.1.2...v1.1.3
92+
[1.1.2]: https://github.com/sqlcipher/sqlcipher/compare/v1.1.1...v1.1.1
93+
[1.1.1]: https://github.com/sqlcipher/sqlcipher/compare/v1.1.0...v1.1.1
94+
[1.1.0]: https://github.com/sqlcipher/sqlcipher/compare/617ed01...v1.1.0

Makefile.arm-wince-mingw32ce-gcc

Lines changed: 0 additions & 138 deletions
This file was deleted.

0 commit comments

Comments
 (0)