Merge "release/0.13" into stable (#728)

.github/workflows/test-objc.yaml

@@ -78,6 +78,9 @@ jobs:
         with:
           path: ~/.cocoapods
           key: ${{ runner.os }}-cocoapods-common
+      - name: Update CocoaPods repo
+        run: |
+          pod repo update
       - name: Install Themis via CocoaPods
         run: |
           cd $GITHUB_WORKSPACE/tests/objcthemis
@@ -121,7 +124,7 @@ jobs:
           rm -rf DerivedData
           xcodebuild \
             -derivedDataPath DerivedData  \
-            -project ObjCThemis.xcodeproj \
+            -project Themis.xcodeproj \
             -scheme "Test Themis (Swift 4, macOS)" \
             test
       - name: Run unit tests (Swift 5, macOS)
@@ -130,7 +133,7 @@ jobs:
           rm -rf DerivedData
           xcodebuild \
             -derivedDataPath DerivedData  \
-            -project ObjCThemis.xcodeproj \
+            -project Themis.xcodeproj \
             -scheme "Test Themis (Swift 5, macOS)" \
             test
       - name: Run unit tests (Swift 4, iOS Simulator)
@@ -139,7 +142,7 @@ jobs:
           rm -rf DerivedData
           xcodebuild \
             -derivedDataPath DerivedData  \
-            -project ObjCThemis.xcodeproj \
+            -project Themis.xcodeproj \
             -scheme "Test Themis (Swift 4, iOS)" \
             -sdk iphonesimulator \
             -destination "platform=iOS Simulator,name=${TEST_IPAD}" \
@@ -150,7 +153,7 @@ jobs:
           rm -rf DerivedData
           xcodebuild \
             -derivedDataPath DerivedData  \
-            -project ObjCThemis.xcodeproj \
+            -project Themis.xcodeproj \
             -scheme "Test Themis (Swift 5, iOS)" \
             -sdk iphonesimulator \
             -destination "platform=iOS Simulator,name=${TEST_IPHONE}" \
@@ -176,9 +179,9 @@ jobs:
       - name: Hack dependencies
         if: contains(env.HACK_DEPENDENCIES, 'true')
         run: |
-          # CocoaPods: podspec
+          # Use the current commit in CocoaPods podspec
           sed -E -i '' \
-              -e "s|^(\s*s\.source = ).*$|\1{ :git => \"https://github.com/${HACK_REPOSITORY}.git\", :commit => \"$HACK_SHA\" }|" \
+              -e "s|^([ ]*s\.source = ).*$|\1{ :git => \"https://github.com/${HACK_REPOSITORY}.git\", :commit => \"$HACK_SHA\" }|" \
               themis.podspec
           # Note that CocoaPods is *really* strict with versioning, does not
           # allow modified podspec to be published, and issues a warning
@@ -234,6 +237,9 @@ jobs:
         with:
           path: ~/.cocoapods
           key: ${{ runner.os }}-cocoapods-common
+      - name: Update CocoaPods repo
+        run: |
+          pod repo update
       # Try building Themis for all iOS device architectures. We do it here
       # because CocoaPods does not allow to check that directly but with
       # example projects it's more or less possible.
@@ -244,8 +250,8 @@ jobs:
           rm -rf DerivedData
           xcodebuild \
             -derivedDataPath DerivedData \
-            -project ObjCThemis.xcodeproj \
-            -scheme "ObjCThemis (iOS)" \
+            -project Themis.xcodeproj \
+            -scheme "Themis (iOS)" \
             -sdk iphoneos \
             -destination "generic/platform=iOS" \
             build

CHANGELOG.md

@@ -4,6 +4,85 @@
 
 Changes that are currently in development and have not been released yet.
 
+
+## [0.13.3](https://github.com/cossacklabs/themis/releases/tag/0.13.3), October 12th 2020
+
+**Hotfix for Themis CocoaPods and Xcode12:**
+
+- Default Themis podspec is using OpenSSL 1.0.2u again ("themis/themis-openssl"). OpenSSL 1.1.1g podspec ("themis/openssl") might be broken for Xcode12, fixing is in progress. BoringSSL podspec ("themis/themis-boringssl") is available too.
+
+_Code:_
+
+- **Objective-C / Swift**
+
+  - Themis CocoaPods podspec is updated with bitcode fixes and disabling arm64 simulator in order to support Xcode12 builds. This is a podspec change only, no changes in code, headers or whatsoever. Default podspec is set as "themis/themis-openssl", which uses OpenSSL 1.0.2u. Fixes for "themis/openssl" podspec (OpenSSL 1.1.1g) might arrive soon.
+
+
+
+## [0.13.2](https://github.com/cossacklabs/themis/releases/tag/0.13.2), August 14th 2020
+
+**Breaking changes and deprecations:**
+
+- ObjCThemis framework built by Carthage is now called `themis.framework` once again ([read more](#0.13.2-revert-objcthemis-rename)).
+
+_Code:_
+
+- **Objective-C**
+
+  - **Breaking changes**
+
+    - <a id="0.13.2-revert-objcthemis-rename">ObjCThemis framework built by Carthage is now called `themis.framework` once again</a> ([#704](https://github.com/cossacklabs/themis/pull/704)).
+
+      [ObjCThemis 0.13.0](#0.13.0-objcthemis-rename) has initiated renaming of the framework produced by Carthage into `objcthemis.framework` from its historical name `themis.framework`. This decision has been a mistake. More information is available in the pull request linked above.
+
+      `objcthemis.framework` is removed and should not be used.
+
+      Please continue linking your applications to `themis.framework`. Note as well that starting with ObjCThemis 0.13.1, you do not have to embed `openssl.framework` anymore when ObjCThemis is installed via Carthage.
+
+## [0.13.1](https://github.com/cossacklabs/themis/releases/tag/0.13.1), August 13th 2020
+
+**TL;DR:**
+
+- AndroidThemis is now available on JCenter
+- ObjCThemis and SwiftThemis get latest OpenSSL update
+- Minor security fixes in GoThemis, JsThemis, WasmThemis
+
+_Code:_
+
+- **Core**
+
+  - Improved compatibility with OpenSSL 1.1.1 ([#684](https://github.com/cossacklabs/themis/pull/684)).
+
+- **Android**
+
+  - AndroidThemis is now available on JCenter ([#679](https://github.com/cossacklabs/themis/pull/679)).
+
+- **Go**
+
+  - Fixed panics on 32-bit systems when processing corrupted data ([#677](https://github.com/cossacklabs/themis/pull/677)).
+  - Improved GoThemis package README and documentation ([#699](https://github.com/cossacklabs/themis/pull/699)).
+
+- **Node.js**
+
+  - Minor dependency updates making the world a better place ([#680](https://github.com/cossacklabs/themis/pull/680)).
+
+- **WebAssembly**
+
+  - Minor dependency updates making the world a better place ([#680](https://github.com/cossacklabs/themis/pull/680)).
+
+- **Swift**
+
+  - Updated OpenSSL to the latest 1.1.1g ([#692](https://github.com/cossacklabs/themis/pull/692)).
+
+- **Objective-C**
+
+  - Updated OpenSSL to the latest 1.1.1g ([#692](https://github.com/cossacklabs/themis/pull/692)).
+
+_Infrastructure:_
+
+- AndroidThemis is now available on JCenter ([#679](https://github.com/cossacklabs/themis/pull/679)).
+- ObjCThemis and SwiftThemis now require Xcode 11 ([#692](https://github.com/cossacklabs/themis/pull/692)).
+
 ## [0.13.0](https://github.com/cossacklabs/themis/releases/tag/0.13.0), July 8th 2020
 
 **TL;DR:**

Cartfile

@@ -1,9 +1,3 @@
-# temporary use our fork due to errors in krzyzanowskim/OpenSSL 1.0.2.18
-# https://github.com/krzyzanowskim/OpenSSL/issues/64
-# https://github.com/krzyzanowskim/OpenSSL/issues/63
-# hash of 1.0.2.17 tag
-github "krzyzanowskim/OpenSSL" "990bd88"
-
-# broken tag is 1.0.2.18
-# github "krzyzanowskim/OpenSSL" ~> 1.0.2
-
+# OpenSSL 1.1.1g
+binary "https://raw.githubusercontent.com/cossacklabs/openssl-apple/cossacklabs/carthage/openssl-static-iPhone.json" ~> 1.1.107
+binary "https://raw.githubusercontent.com/cossacklabs/openssl-apple/cossacklabs/carthage/openssl-static-MacOSX.json" ~> 1.1.107

Cartfile.resolved

@@ -1 +1,2 @@
-github "krzyzanowskim/OpenSSL" "990bd88219da80d7a77289aeae245b3eb400d834"
+binary "https://raw.githubusercontent.com/cossacklabs/openssl-apple/cossacklabs/carthage/openssl-static-MacOSX.json" "1.1.107"
+binary "https://raw.githubusercontent.com/cossacklabs/openssl-apple/cossacklabs/carthage/openssl-static-iPhone.json" "1.1.107"