Skip to content

Commit 4cbdafc

Browse files
borrrdenborrrden
committed
Merge branch 'feature/mbedtls'
2 parents 0f6b07c + 740a7e7 commit 4cbdafc

910 files changed

Lines changed: 178642 additions & 47596 deletions

File tree

Some content is hidden

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

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