carthage update --use-xcframeworks

Author: skywinder

Cartfile.resolved

@@ -1,5 +1,5 @@
 github "attaswift/BigInt" "v5.2.1"
 github "attaswift/SipHash" "v1.2.2"
 github "daltoniam/Starscream" "4.0.4"
-github "krzyzanowskim/CryptoSwift" "1.4.0"
+github "krzyzanowskim/CryptoSwift" "1.4.1"
 github "mxcl/PromiseKit" "6.15.3"

Carthage/Checkouts/CryptoSwift/.github/workflows/linux.yml

@@ -9,7 +9,7 @@ on:
 jobs:
   build:
 
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
 
     steps:
     - uses: actions/checkout@v2

Carthage/Checkouts/CryptoSwift/CHANGELOG

@@ -1,3 +1,8 @@
+1.4.1
+- Introduce ISO 10126 padding
+- fix various compiler warnings
+- Revert Xcode project deployment target
+
 1.4.0
 - Customize CFB segment size (cfb8, cfb128).
 - Adapt Swift @inlineable for better code optimization

Carthage/Checkouts/CryptoSwift/CONTRIBUTORS.txt

@@ -28,10 +28,12 @@ organizations who have contributed source code to CryptoSwift.
 - Chris Amanse <[email protected]>
 - Christian Steffens <[email protected]>
 - Cihat Gündüz <[email protected]>
+- Cosmin Baies <[email protected]>
 - Dave Wood <[email protected]>
 - Dima Kalachov <[email protected]>
 - Dusan Klinec <[email protected]>
 - Eneko Alonso <[email protected]>
+- Eugene Berdnikov <[email protected]>
 - Evan Maloney <[email protected]>
 - Evin Ugur <[email protected]>
 - Frank Langel <[email protected]>
@@ -47,6 +49,7 @@ organizations who have contributed source code to CryptoSwift.
 - Javier Soto <[email protected]>
 - Jeremy Greenwood <[email protected]>
 - John Hammerlund <[email protected]>
+- Jonas Obrist <[email protected]>
 - K.K. POON <[email protected]>
 - Keith Smiley <[email protected]>
 - Koray Koska <[email protected]>

Carthage/Checkouts/CryptoSwift/CryptoSwift.podspec

@@ -1,14 +1,14 @@
 Pod::Spec.new do |s|
   s.name         = "CryptoSwift"
-  s.version      = "1.4.0"
+  s.version      = "1.4.1"
   s.source       = { :git => "https://github.com/krzyzanowskim/CryptoSwift.git", :tag => "#{s.version}" }
   s.summary      = "Cryptography in Swift. SHA, MD5, CRC, PBKDF, Poly1305, HMAC, CMAC, HDKF, Scrypt, ChaCha20, Rabbit, Blowfish, AES."
   s.description  = "Cryptography functions and helpers for Swift implemented in Swift. SHA-1, SHA-2, SHA-3, MD5, PBKDF1, PBKDF2, Scrypt, CRC, Poly1305, HMAC, ChaCha20, Rabbit, Blowfish, AES"
   s.homepage     = "https://github.com/krzyzanowskim/CryptoSwift"
   s.license      = {:type => "Attribution", :file => "LICENSE"}
   s.authors      = {'Marcin Krzyżanowski' => '[email protected]'}
   s.social_media_url = "https://twitter.com/krzyzanowskim"
-  s.cocoapods_version = '>= 1.9.1'
+  s.cocoapods_version = '>= 1.10.0'
   s.swift_version = "5.3"
   s.ios.deployment_target = "9.0"
   s.osx.deployment_target = "10.12"

Carthage/Checkouts/CryptoSwift/CryptoSwift.xcodeproj/project.pbxproj

@@ -13,6 +13,7 @@
 		14156CE52011422400DDCFBC /* ChaCha20Poly1305Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 14156CE42011422400DDCFBC /* ChaCha20Poly1305Tests.swift */; };
 		1467460F2017BB3600DF04ED /* AEAD.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1467460E2017BB3600DF04ED /* AEAD.swift */; };
 		35F3E51C23BF9A6700A024A1 /* OCB.swift in Sources */ = {isa = PBXBuildFile; fileRef = 35F3E51B23BF9A6700A024A1 /* OCB.swift */; };
+		42012783267A6F1C00F82506 /* ISO10126Padding.swift in Sources */ = {isa = PBXBuildFile; fileRef = 42012782267A6F1C00F82506 /* ISO10126Padding.swift */; };
 		674A736F1BF5D85B00866C5B /* RabbitTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 674A736E1BF5D85B00866C5B /* RabbitTests.swift */; };
 		750509991F6BEF2A00394A1B /* PKCS7.swift in Sources */ = {isa = PBXBuildFile; fileRef = 750509981F6BEF2A00394A1B /* PKCS7.swift */; };
 		750CC3EB1DC0CACE0096BE6E /* BlowfishTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 750CC3EA1DC0CACE0096BE6E /* BlowfishTests.swift */; };
@@ -204,6 +205,7 @@
 		1467460E2017BB3600DF04ED /* AEAD.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AEAD.swift; sourceTree = "<group>"; };
 		35F3E51B23BF9A6700A024A1 /* OCB.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OCB.swift; sourceTree = "<group>"; };
 		35F3E51D23BF9AD300A024A1 /* AESOCBTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AESOCBTests.swift; sourceTree = "<group>"; };
+		42012782267A6F1C00F82506 /* ISO10126Padding.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ISO10126Padding.swift; sourceTree = "<group>"; };
 		674A736E1BF5D85B00866C5B /* RabbitTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RabbitTests.swift; sourceTree = "<group>"; };
 		750509981F6BEF2A00394A1B /* PKCS7.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PKCS7.swift; sourceTree = "<group>"; };
 		750CC3EA1DC0CACE0096BE6E /* BlowfishTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BlowfishTests.swift; sourceTree = "<group>"; };
@@ -509,6 +511,7 @@
 			isa = PBXGroup;
 			children = (
 				0AF023D4230F2B0F008E4E68 /* ISO78164Padding.swift */,
+				42012782267A6F1C00F82506 /* ISO10126Padding.swift */,
 				7529366820683DFC00195874 /* AEAD */,
 				75EC52381EE8B6CA0048EB3B /* AES.swift */,
 				751EE9771F93996100161FFC /* AES.Cryptors.swift */,
@@ -831,6 +834,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				42012783267A6F1C00F82506 /* ISO10126Padding.swift in Sources */,
 				0AF023D5230F2B0F008E4E68 /* ISO78164Padding.swift in Sources */,
 				75EC52861EE8B8170048EB3B /* CFB.swift in Sources */,
 				75EC52901EE8B81A0048EB3B /* Collection+Extension.swift in Sources */,

Carthage/Checkouts/CryptoSwift/README.md

@@ -36,10 +36,10 @@ Good mood
 #### Hash (Digest)
   [MD5](http://tools.ietf.org/html/rfc1321)
 | [SHA1](http://tools.ietf.org/html/rfc3174)
-| [SHA224](http://tools.ietf.org/html/rfc6234)
-| [SHA256](http://tools.ietf.org/html/rfc6234)
-| [SHA384](http://tools.ietf.org/html/rfc6234)
-| [SHA512](http://tools.ietf.org/html/rfc6234)
+| [SHA2-224](http://tools.ietf.org/html/rfc6234)
+| [SHA2-256](http://tools.ietf.org/html/rfc6234)
+| [SHA2-384](http://tools.ietf.org/html/rfc6234)
+| [SHA2-512](http://tools.ietf.org/html/rfc6234)
 | [SHA3](http://nvlpubs.nist.gov/nistpubs/FIPS/NIST.FIPS.202.pdf)
 
 #### Cyclic Redundancy Check (CRC)
@@ -81,6 +81,7 @@ Good mood
 | [PKCS#7](http://tools.ietf.org/html/rfc5652#section-6.3)
 | [Zero padding](https://en.wikipedia.org/wiki/Padding_(cryptography)#Zero_padding)
 | [ISO78164](http://www.embedx.com/pdfs/ISO_STD_7816/info_isoiec7816-4%7Bed21.0%7Den.pdf)
+| [ISO10126](https://en.wikipedia.org/wiki/Padding_(cryptography)#ISO_10126)
 | No padding
 
 #### Authenticated Encryption with Associated Data (AEAD)
@@ -121,7 +122,7 @@ It is recommended to enable [Whole-Module Optimization](https://swift.org/blog/w
 You can use [Swift Package Manager](https://swift.org/package-manager/) and specify dependency in `Package.swift` by adding this:
 
 ```swift
-.package(url: "https://github.com/krzyzanowskim/CryptoSwift.git", .upToNextMinor(from: "1.4.0"))
+.package(url: "https://github.com/krzyzanowskim/CryptoSwift.git", .upToNextMajor(from: "1.4.1"))
 ```
 
 See: [Package.swift - manual](http://blog.krzyzanowskim.com/2016/08/09/package-swift-manual/)
@@ -133,7 +134,7 @@ Notice: Swift Package Manager uses debug configuration for debug Xcode build, th
 You can use [CocoaPods](https://cocoapods.org/pods/CryptoSwift).
 
 ```ruby
-pod 'CryptoSwift', '~> 1.4.0'
+pod 'CryptoSwift', '~> 1.4.1'
 ```
 
 Bear in mind that CocoaPods will build CryptoSwift without [Whole-Module Optimization](https://swift.org/blog/whole-module-optimizations/) that may impact performance. You can change it manually after installation, or use [cocoapods-wholemodule](https://github.com/jedlewison/cocoapods-wholemodule) plugin.

Carthage/Checkouts/CryptoSwift/Sources/CryptoSwift/Foundation/Array+Foundation.swift

@@ -16,8 +16,8 @@
 import Foundation
 
 public extension Array where Element == UInt8 {
-  func toBase64() -> String? {
-    Data( self).base64EncodedString()
+  func toBase64() -> String {
+    Data(self).base64EncodedString()
   }
 
   init(base64: String) {

Carthage/Checkouts/CryptoSwift/Sources/CryptoSwift/ISO10126Padding.swift

@@ -0,0 +1,56 @@
+//
+//  CryptoSwift
+//
+//  Copyright (C) Marcin Krzyżanowski <[email protected]>
+//  This software is provided 'as-is', without any express or implied warranty.
+//
+//  In no event will the authors be held liable for any damages arising from the use of this software.
+//
+//  Permission is granted to anyone to use this software for any purpose,including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions:
+//
+//  - The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation is required.
+//  - Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+//  - This notice may not be removed or altered from any source or binary distribution.
+//
+
+import Foundation
+
+/// Padding with random bytes, ending with the number of added bytes.
+/// Read the [Wikipedia](https://en.wikipedia.org/wiki/Padding_(cryptography)#ISO_10126)
+/// and [Crypto-IT](http://www.crypto-it.net/eng/theory/padding.html) articles for more info.
+struct ISO10126Padding: PaddingProtocol {
+  init() {
+  }
+
+  @inlinable
+  func add(to bytes: Array<UInt8>, blockSize: Int) -> Array<UInt8> {
+    let padding = UInt8(blockSize - (bytes.count % blockSize))
+    var withPadding = bytes
+    if padding > 0 {
+      withPadding += (0..<(padding - 1)).map { _ in UInt8.random(in: 0...255) } + [padding]
+    }
+    return withPadding
+  }
+
+  @inlinable
+  func remove(from bytes: Array<UInt8>, blockSize: Int?) -> Array<UInt8> {
+    guard !bytes.isEmpty, let lastByte = bytes.last else {
+      return bytes
+    }
+
+    assert(!bytes.isEmpty, "Need bytes to remove padding")
+
+    let padding = Int(lastByte) // last byte
+    let finalLength = bytes.count - padding
+
+    if finalLength < 0 {
+      return bytes
+    }
+
+    if padding >= 1 {
+      return Array(bytes[0..<finalLength])
+    }
+
+    return bytes
+  }
+}

Carthage/Checkouts/CryptoSwift/Sources/CryptoSwift/Padding.swift

@@ -19,7 +19,7 @@ public protocol PaddingProtocol {
 }
 
 public enum Padding: PaddingProtocol {
-  case noPadding, zeroPadding, pkcs7, pkcs5, iso78164
+  case noPadding, zeroPadding, pkcs7, pkcs5, iso78164, iso10126
 
   public func add(to: Array<UInt8>, blockSize: Int) -> Array<UInt8> {
     switch self {
@@ -33,6 +33,8 @@ public enum Padding: PaddingProtocol {
         return PKCS5.Padding().add(to: to, blockSize: blockSize)
       case .iso78164:
         return ISO78164Padding().add(to: to, blockSize: blockSize)
+      case .iso10126:
+        return ISO10126Padding().add(to: to, blockSize: blockSize)
     }
   }
 
@@ -48,6 +50,8 @@ public enum Padding: PaddingProtocol {
         return PKCS5.Padding().remove(from: from, blockSize: blockSize)
       case .iso78164:
         return ISO78164Padding().remove(from: from, blockSize: blockSize)
+      case .iso10126:
+        return ISO10126Padding().remove(from: from, blockSize: blockSize)
     }
   }
 }