8000 Merge branch 'cnoon-feature/xcode_frameworks' into prerelease · g-coder/sqlcipher@4216a5f · GitHub
[go: up one dir, main page]
Skip to content

Commit 4216a5f

Browse files
sjlombardosjlombardo
committed
Merge branch 'cnoon-feature/xcode_frameworks' into prerelease
2 parents d1e1e72 + f4595d3 commit 4216a5f

File tree

9 files changed

+1351
-9
lines changed

9 files changed

+1351
-9
lines changed

‎CHANGELOG.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,13 @@ All notable changes to this project will be documented in this file.
33

44
## [Unreleased][unreleased]
55

6+
## [3.3.1] - 2015-07-13
7+
### Changed
8+
- Merge upstream SQLite 3.8.10.2
9+
- Fixed segfault when provided an invalid cipher name
10+
- Check for codec context when performing `PRAGMA cipher_store_pass`
11+
- Remove extraneous null check in `PRAGMA cipher_migrate`
12+
613
## [3.3.0] - 2015-03-25
714
### Added
815
- Added FIPS API calls within the OpenSSL crypto provider
@@ -49,7 +56,8 @@ All notable changes to this project will be documented in this file.
4956
### Security
5057
- Change KDF iteration length from 4,000 to 64,000
5158

52-
[unreleased]: https://github.com/sqlcipher/sqlcipher/compare/v3.3.0...prerelease
59+
[unreleased]: https://github.com/sqlcipher/sqlcipher/compare/v3.3.1...prerelease
60+
[3.3.1]: https://github.com/sqlcipher/sqlcipher/compare/v3.3.0...v3.3.1
5361
[3.3.0]: https://github.com/sqlcipher/sqlcipher/compare/v3.2.0...v3.3.0
5462
[3.2.0]: https://github.com/sqlcipher/sqlcipher/compare/v3.1.0...v3.2.0
5563
[3.1.0]: https://github.com/sqlcipher/sqlcipher/compare/v3.0.1...v3.1.0

‎macosx/Info-tvOS.plist

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>CFBundleDevelopmentRegion</key>
6+
<string>en</string>
7+
<key>CFBundleExecutable</key>
8+
<string>$(EXECUTABLE_NAME)</string>
9+
<key>CFBundleIdentifier</key>
10+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
11+
<key>CFBundleInfoDictionaryVersion</key>
12+
<string>6.0</string>
13+
<key>CFBundleName</key>
14+
<string>$(PRODUCT_NAME)</string>
15+
<key>CFBundlePackageType</key>
16+
<string>FMWK</string>
17+
<key>CFBundleShortVersionString</key>
18+
<string>3.3.1</string>
19+
<key>CFBundleSignature</key>
20+
<string>????</string>
21+
<key>CFBundleVersion</key>
22+
<string>$(CURRENT_PROJECT_VERSION)</string>
23+
<key>NSPrincipalClass</key>
24+
<string></string>
25+
<key>UIRequiredDeviceCapabilities</key>
26+
<array>
27+
<string>arm64</string>
28+
</array>
29+
</dict>
30+
</plist>

‎macosx/Info.plist

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>CFBundleDevelopmentRegion</key>
6+
<string>en</string>
7+
<key>CFBundleExecutable</key>
8+
<string>$(EXECUTABLE_NAME)</string>
9+
<key>CFBundleIdentifier</key>
10+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
11+
<key>CFBundleInfoDictionaryVersion</key>
12+
<string>6.0</string>
13+
<key>CFBundleName</key>
14+
<string>$(PRODUCT_NAME)</string>
15+
<key>CFBundlePackageType</key>
16+
<string>FMWK</string>
17+
<key>CFBundleShortVersionString</key>
18+
<string>3.3.1</string>
19+
<key>CFBundleSignature</key>
20+
<string>????</string>
21+
<key>CFBundleVersion</key>
22+
<string>$(CURRENT_PROJECT_VERSION)</string>
23+
<key>NSPrincipalClass</key>
24+
<string></string>
25+
</dict>
26+
</plist>

‎macosx/SQLCipher.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
2+
@import Foundation;
3+
4+
FOUNDATION_EXPORT double SQLCipherVersionNumber;
5+
FOUNDATION_EXPORT const unsigned char SQLCipherVersionString[];
6+
7+
#import "sqlite3.h"

0 commit comments

Comments
 (0)
0