Merge branch 'master' into feat/support-dynamic-spm-product

andrii-vysotskyi-cko · web-flow · commit bb20c9057566 · 2023-06-30T11:45:51.000+02:00
diff --git a/.swiftlint.yml b/.swiftlint.yml
@@ -18,6 +18,8 @@ disabled_rules:
   - todo
   - no_space_in_method_call
 
+large_tuple: 5
+
 opt_in_rules:
   - force_unwrapping
 
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,16 +1,15 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.5)
+    CFPropertyList (3.0.6)
       rexml
-    activesupport (6.1.7.2)
+    activesupport (7.0.4.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.3)
+      public_suffix (>= 2.0.2, < 6.0)
     algoliasearch (1.27.5)
       httpclient (~> 2.8, >= 2.8.3)
       json (>= 1.5.1)
@@ -38,26 +37,26 @@ GEM
       cork
       nap
       open4 (~> 1.3)
-    cocoapods (1.11.3)
+    cocoapods (1.12.0)
       addressable (~> 2.8)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.11.3)
+      cocoapods-core (= 1.12.0)
       cocoapods-deintegrate (>= 1.0.3, < 2.0)
-      cocoapods-downloader (>= 1.4.0, < 2.0)
+      cocoapods-downloader (>= 1.6.0, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
       cocoapods-search (>= 1.0.0, < 2.0)
-      cocoapods-trunk (>= 1.4.0, < 2.0)
+      cocoapods-trunk (>= 1.6.0, < 2.0)
       cocoapods-try (>= 1.1.0, < 2.0)
       colored2 (~> 3.1)
       escape (~> 0.0.4)
       fourflusher (>= 2.3.0, < 3.0)
       gh_inspector (~> 1.0)
       molinillo (~> 0.8.0)
       nap (~> 1.0)
-      ruby-macho (>= 1.0, < 3.0)
+      ruby-macho (>= 2.3.0, < 3.0)
       xcodeproj (>= 1.21.0, < 2.0)
-    cocoapods-core (1.11.3)
-      activesupport (>= 5.0, < 7)
+    cocoapods-core (1.12.0)
+      activesupport (>= 5.0, < 8)
       addressable (~> 2.8)
       algoliasearch (~> 1.0)
       concurrent-ruby (~> 1.1)
@@ -107,7 +106,7 @@ GEM
     dotenv (2.7.6)
     emoji_regex (3.2.3)
     escape (0.0.4)
-    ethon (0.15.0)
+    ethon (0.16.0)
       ffi (>= 1.15.0)
     excon (0.92.2)
     faraday (1.10.0)
@@ -232,7 +231,7 @@ GEM
     i18n (1.12.0)
       concurrent-ruby (~> 1.0)
     jmespath (1.6.1)
-    json (2.6.1)
+    json (2.6.3)
     jwt (2.3.0)
     kramdown (2.3.2)
       rexml
@@ -257,7 +256,7 @@ GEM
     optparse (0.1.1)
     os (1.1.4)
     plist (3.6.0)
-    public_suffix (4.0.6)
+    public_suffix (4.0.7)
     rake (13.0.6)
     rchardet (1.8.0)
     representable (3.1.1)
@@ -302,7 +301,7 @@ GEM
     unicode-display_width (1.8.0)
     webrick (1.7.0)
     word_wrap (1.0.0)
-    xcodeproj (1.21.0)
+    xcodeproj (1.22.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
@@ -313,7 +312,6 @@ GEM
       rouge (~> 2.0.7)
     xcpretty-travis-formatter (1.0.1)
       xcpretty (~> 0.2, >= 0.0.7)
-    zeitwerk (2.6.7)
 
 PLATFORMS
   ruby
@@ -326,4 +324,4 @@ DEPENDENCIES
   xcpretty
 
 BUNDLED WITH
-   2.2.20
+   2.1.4
diff --git a/JOSESwift/Sources/RSAKeys.swift b/JOSESwift/Sources/RSAKeys.swift
@@ -228,7 +228,7 @@ public struct RSAPrivateKey: JWK {
     ///              as specified in [RFC-7518, Section 2](https://tools.ietf.org/html/rfc7518#section-2).
     ///   - exponent: The exponent value for the RSA private key in `base64urlUInt` encoding
     ///               as specified in [RFC-7518, Section 2](https://tools.ietf.org/html/rfc7518#section-2).
-    //    - privateExponent: The private exponent value for the RSA private key in `base64urlUInt` encoding
+    ///    - privateExponent: The private exponent value for the RSA private key in `base64urlUInt` encoding
     ///               as specified in [RFC-7518, Section 2](https://tools.ietf.org/html/rfc7518#section-2).
     ///   - parameters: Additional JWK parameters.
     public init(modulus: String, exponent: String, privateExponent: String, additionalParameters parameters: [String: String] = [:]) {
diff --git a/Tests/AESCBCContentDecryptionTests.swift b/Tests/AESCBCContentDecryptionTests.swift
@@ -151,3 +151,4 @@ class AESCBCContentDecryptionTests: XCTestCase {
         XCTAssertEqual(plaintext, testPlaintext)
     }
 }
+// swiftlint:enable force_unwrapping
diff --git a/Tests/AESCBCContentEncryptionTests.swift b/Tests/AESCBCContentEncryptionTests.swift
@@ -235,3 +235,4 @@ class AESCBCContentEncryptionTests: XCTestCase {
         XCTAssertEqual(cryptData, plaintext)
     }
 }
+// swiftlint:enable force_unwrapping
diff --git a/Tests/AESKeyWrapKeyManagementModeTests.swift b/Tests/AESKeyWrapKeyManagementModeTests.swift
@@ -234,3 +234,4 @@ private func ccAESKeyUnwrap(
 
     return (rawKey, status)
 }
+// swiftlint:enable force_unwrapping
diff --git a/Tests/AESKeyWrapTests.swift b/Tests/AESKeyWrapTests.swift
@@ -166,3 +166,4 @@ class AESKeyWrapTests: XCTestCase {
         }
     }
 }
+// swiftlint:enable force_unwrapping
diff --git a/Tests/ASN1DERParsingTests.swift b/Tests/ASN1DERParsingTests.swift
@@ -273,3 +273,4 @@ class ASN1DERParsingTests: XCTestCase {
     }
 
 }
+// swiftlint:enable force_unwrapping
diff --git a/Tests/CryptoTestCase.swift b/Tests/CryptoTestCase.swift
@@ -88,3 +88,4 @@ extension Data {
             .joined(separator: "")
     }
 }
+// swiftlint:enable force_unwrapping
diff --git a/Tests/DataExtensionTests.swift b/Tests/DataExtensionTests.swift
@@ -184,3 +184,4 @@ class DataExtensionTests: XCTestCase {
         XCTAssertEqual(false, testData1._timingSafeCompare(with: testData2))
     }
 }
+// swiftlint:enable force_unwrapping
diff --git a/Tests/DataRSAPublicKeyTests.swift b/Tests/DataRSAPublicKeyTests.swift
@@ -93,3 +93,4 @@ class DataRSAPublicKeyTests: RSACryptoTestCase {
     }
 
 }
+// swiftlint:enable force_unwrapping
diff --git a/Tests/DirectEncryptionKeyManagementModeTests.swift b/Tests/DirectEncryptionKeyManagementModeTests.swift
@@ -47,3 +47,4 @@ class DirectEncryptionKeyManagementModeTests: XCTestCase {
         XCTAssertEqual(encryptedKey, Data())
     }
 }
+// swiftlint:enable force_unwrapping
diff --git a/Tests/ECCryptoTestCase.swift b/Tests/ECCryptoTestCase.swift
@@ -270,3 +270,4 @@ class ECCryptoTestCase: CryptoTestCase {
         // do nothing: setup happens in the construction of the ECTestKeyData instances
     }
 }
+// swiftlint:enable force_unwrapping
diff --git a/Tests/ECPrivateKeyToSecKeyTests.swift b/Tests/ECPrivateKeyToSecKeyTests.swift
@@ -66,3 +66,4 @@ class ECPrivateKeyToSecKeyTests: ECCryptoTestCase {
     }
 
 }
+// swiftlint:enable force_unwrapping
diff --git a/Tests/ECPublicKeyToDataTests.swift b/Tests/ECPublicKeyToDataTests.swift
@@ -40,3 +40,4 @@ class ECPublicKeyToDataTests: ECCryptoTestCase {
     }
 
 }
+// swiftlint:enable force_unwrapping
diff --git a/Tests/ECPublicKeyToSecKeyTests.swift b/Tests/ECPublicKeyToSecKeyTests.swift
@@ -62,3 +62,4 @@ class ECPublicKeyToSecKeyTests: ECCryptoTestCase {
     }
 
 }
+// swiftlint:enable force_unwrapping
diff --git a/Tests/ECSignerTests.swift b/Tests/ECSignerTests.swift
@@ -56,3 +56,4 @@ class ECSignerTests: ECCryptoTestCase {
         _testSigning(algorithm: .ES512, keyData: p521)
     }
 }
+// swiftlint:enable force_unwrapping
diff --git a/Tests/EncrypterDecrypterInitializationTests.swift b/Tests/EncrypterDecrypterInitializationTests.swift
@@ -218,3 +218,4 @@ class EncrypterDecrypterInitializationTests: RSACryptoTestCase {
         }
     }
 }
+// swiftlint:enable force_unwrapping
diff --git a/Tests/HMACCryptoTestCase.swift b/Tests/HMACCryptoTestCase.swift
@@ -67,3 +67,4 @@ class HMACCryptoTestCase: CryptoTestCase {
         // do nothing
     }
 }
+// swiftlint:enable force_unwrapping
diff --git a/Tests/HMACTests.swift b/Tests/HMACTests.swift
@@ -92,3 +92,4 @@ class HMACTests: HMACCryptoTestCase {
         XCTAssertNotEqual(hmacOutput, hmac512TestOutput)
     }
 }
+// swiftlint:enable force_unwrapping
diff --git a/Tests/JWEAESKeyWrapTests.swift b/Tests/JWEAESKeyWrapTests.swift
@@ -74,3 +74,4 @@ class JWEAESKeyWrapTests: XCTestCase {
         XCTAssertThrowsError(try jwe.decrypt(using: decyrpter))
     }
 }
+// swiftlint:enable force_unwrapping
diff --git a/Tests/JWECompressionTests.swift b/Tests/JWECompressionTests.swift
@@ -140,3 +140,5 @@ class JWECompressionTests: RSACryptoTestCase {
         XCTAssertEqual(try deflateCompressor.decompress(data: compressedData), data)
     }
 }
+// swiftlint:enable force_unwrapping
+// swiftlint:enable force_cast
diff --git a/Tests/JWEDeserializationTests.swift b/Tests/JWEDeserializationTests.swift
@@ -125,3 +125,4 @@ class JWEDeserializationTests: XCTestCase {
         XCTFail()
     }
 }
+// swiftlint:enable force_unwrapping
diff --git a/Tests/JWEDirectEncryptionTests.swift b/Tests/JWEDirectEncryptionTests.swift
@@ -156,3 +156,4 @@ class JWEDirectEncryptionTests: RSACryptoTestCase {
     }
 
 }
+// swiftlint:enable force_unwrapping
diff --git a/Tests/JWEHeaderTests.swift b/Tests/JWEHeaderTests.swift
@@ -319,3 +319,4 @@ class JWEHeaderTests: XCTestCase {
         XCTAssertEqual(jwk.modulus, headerJwk?.modulus)
     }
 }
+// swiftlint:enable force_unwrapping
diff --git a/Tests/JWERSATests.swift b/Tests/JWERSATests.swift
@@ -304,3 +304,4 @@ class JWERSATests: RSACryptoTestCase {
     }
 
 }
+// swiftlint:enable force_unwrapping
diff --git a/Tests/JWKECDecodingTests.swift b/Tests/JWKECDecodingTests.swift
@@ -288,3 +288,4 @@ class JWKECDecodingTests: ECCryptoTestCase {
     }
 
 }
+// swiftlint:enable force_unwrapping
diff --git a/Tests/JWKECEncodingTests.swift b/Tests/JWKECEncodingTests.swift
@@ -117,3 +117,4 @@ class JWKECEncodingTests: ECCryptoTestCase {
         XCTAssertEqual(dict["y"] as? String ?? "", keyData.expectedYCoordinateBase64Url)
     }
 }
+// swiftlint:enable force_unwrapping
diff --git a/Tests/JWKECKeysTests.swift b/Tests/JWKECKeysTests.swift
@@ -262,3 +262,4 @@ class JWKECKeysTests: ECCryptoTestCase {
         }
     }
 }
+// swiftlint:enable force_unwrapping
diff --git a/Tests/JWKRSADecodingTests.swift b/Tests/JWKRSADecodingTests.swift
@@ -379,3 +379,4 @@ class JWKRSADecodingTests: RSACryptoTestCase {
         XCTAssertNoThrow(try JWKSet(data: json))
     }
 }
+// swiftlint:enable force_unwrapping
diff --git a/Tests/JWKRSAEncodingTests.swift b/Tests/JWKRSAEncodingTests.swift
@@ -117,3 +117,4 @@ class JWKRSAEncodingTests: RSACryptoTestCase {
     }
 
 }
+// swiftlint:enable force_unwrapping
diff --git a/Tests/JWKRSAKeysTests.swift b/Tests/JWKRSAKeysTests.swift
@@ -163,3 +163,4 @@ class JWKRSAKeysTests: RSACryptoTestCase {
         XCTAssertEqual(jwk.parameters[JWKParameter.keyUse.rawValue], useKey)
     }
 }
+// swiftlint:enable force_unwrapping
diff --git a/Tests/JWKSetCodingTests.swift b/Tests/JWKSetCodingTests.swift
@@ -428,3 +428,4 @@ class JWKSetCodingTests: XCTestCase {
         XCTAssertEqual(jwkSet.jsonString()!.count, String(data: testDataTwoRSAPublicKeys, encoding: .utf8)!.count)
     }
 }
+// swiftlint:enable force_unwrapping
diff --git a/Tests/JWKtoJSONTests.swift b/Tests/JWKtoJSONTests.swift
@@ -68,3 +68,4 @@ class JWKtoJSONTests: RSACryptoTestCase {
         XCTAssertEqual(dict!["e"] as? String ?? "", expectedExponentBase64)
     }
 }
+// swiftlint:enable force_unwrapping
diff --git a/Tests/JWSDeserializationTests.swift b/Tests/JWSDeserializationTests.swift
@@ -106,3 +106,4 @@ class JWSDeserializationTests: XCTestCase {
     }
 
 }
+// swiftlint:enable force_unwrapping
diff --git a/Tests/JWSECTests.swift b/Tests/JWSECTests.swift
@@ -77,3 +77,4 @@ class JWSECTests: ECCryptoTestCase {
         XCTAssertEqual(payload, plainTextPayload)
     }
 }
+// swiftlint:enable force_unwrapping
diff --git a/Tests/JWSHMACTests.swift b/Tests/JWSHMACTests.swift
@@ -63,3 +63,4 @@ class JWSHMACTests: HMACCryptoTestCase {
         _testHMACSerializationValidationAndDeserialization(algorithm: .HS512)
     }
 }
+// swiftlint:enable force_unwrapping
diff --git a/Tests/JWSHeaderTests.swift b/Tests/JWSHeaderTests.swift
@@ -231,3 +231,4 @@ class JWSHeaderTests: XCTestCase {
         XCTAssertEqual(jwk.modulus, headerJwk?.modulus)
     }
 }
+// swiftlint:enable force_unwrapping
diff --git a/Tests/JWSRSATests.swift b/Tests/JWSRSATests.swift
@@ -146,3 +146,4 @@ class JWSRSATests: RSACryptoTestCase {
         }
     }
 }
+// swiftlint:enable force_unwrapping
diff --git a/Tests/JWSSigningInputTest.swift b/Tests/JWSSigningInputTest.swift
@@ -48,3 +48,4 @@ class JWSSigningInputTest: XCTestCase {
     }
 
 }
+// swiftlint:enable force_unwrapping
diff --git a/Tests/JWSValidationTests.swift b/Tests/JWSValidationTests.swift
@@ -253,3 +253,4 @@ extension JOSESwiftError: Equatable {
         }
     }
 }
+// swiftlint:enable force_unwrapping
diff --git a/Tests/RSACryptoTestCase.swift b/Tests/RSACryptoTestCase.swift
@@ -187,3 +187,4 @@ class RSACryptoTestCase: CryptoTestCase {
     }
 
 }
+// swiftlint:enable force_unwrapping
diff --git a/Tests/RSADecryptionTests.swift b/Tests/RSADecryptionTests.swift
@@ -245,3 +245,4 @@ class RSADecryptionTests: RSACryptoTestCase {
     }
 
 }
+// swiftlint:enable force_unwrapping
diff --git a/Tests/RSAEncryptionTests.swift b/Tests/RSAEncryptionTests.swift
@@ -180,3 +180,4 @@ class RSAEncryptionTests: RSACryptoTestCase {
         }
     }
 }
+// swiftlint:enable force_unwrapping
diff --git a/Tests/RSAKeyManagementModeTests.swift b/Tests/RSAKeyManagementModeTests.swift
@@ -178,3 +178,4 @@ class RSAKeyManagementModeTests: RSACryptoTestCase {
         }
     }
 }
+// swiftlint:enable force_unwrapping
diff --git a/Tests/RSAPublicKeyToSecKeyTests.swift b/Tests/RSAPublicKeyToSecKeyTests.swift
@@ -54,3 +54,4 @@ class RSAPublicKeyToSecKeyTests: RSACryptoTestCase {
     }
 
 }
+// swiftlint:enable force_unwrapping
diff --git a/Tests/RSASignerTests.swift b/Tests/RSASignerTests.swift
@@ -51,3 +51,4 @@ class RSASignerTests: RSACryptoTestCase {
         XCTAssertEqual(signature.base64URLEncodedString(), signatureBase64URL)
     }
 }
+// swiftlint:enable force_unwrapping
diff --git a/Tests/RSAVerifierTests.swift b/Tests/RSAVerifierTests.swift
@@ -53,3 +53,4 @@ class RSAVerifierTests: RSACryptoTestCase {
     }
 
 }
+// swiftlint:enable force_unwrapping
diff --git a/Tests/SecKeyECPrivateKeyTests.swift b/Tests/SecKeyECPrivateKeyTests.swift
@@ -80,3 +80,4 @@ class SecKeyECPrivateKeyTests: ECCryptoTestCase {
         }
     }
 }
+// swiftlint:enable force_unwrapping
diff --git a/Tests/SecKeyECPublicKeyTests.swift b/Tests/SecKeyECPublicKeyTests.swift
@@ -73,3 +73,4 @@ class SecKeyECPublicKeyTests: ECCryptoTestCase {
         }
     }
 }
+// swiftlint:enable force_unwrapping
diff --git a/Tests/SecKeyRSAPublicKeyTests.swift b/Tests/SecKeyRSAPublicKeyTests.swift
@@ -123,3 +123,4 @@ class SecKeyRSAPublicKeyTests: RSACryptoTestCase {
     }
 
 }
+// swiftlint:enable force_unwrapping
diff --git a/Tests/SymmetricKeyTests.swift b/Tests/SymmetricKeyTests.swift
@@ -166,3 +166,4 @@ class SymmetricKeyTests: XCTestCase {
         XCTAssertEqual(jwk.parameters[JWKParameter.algorithm.rawValue], ContentEncryptionAlgorithm.A256CBCHS512.rawValue)
     }
 }
+// swiftlint:enable force_unwrapping

Original file line number	Diff line number	Diff line change
`@@ -151,3 +151,4 @@ class AESCBCContentDecryptionTests: XCTestCase {`
`151`	`151`	`XCTAssertEqual(plaintext, testPlaintext)`
`152`	`152`	`}`
`153`	`153`	`}`
	`154`	`+// swiftlint:enable force_unwrapping`
Original file line number	Diff line number	Diff line change
`@@ -235,3 +235,4 @@ class AESCBCContentEncryptionTests: XCTestCase {`
`235`	`235`	`XCTAssertEqual(cryptData, plaintext)`
`236`	`236`	`}`
`237`	`237`	`}`
	`238`	`+// swiftlint:enable force_unwrapping`
Original file line number	Diff line number	Diff line change
`@@ -234,3 +234,4 @@ private func ccAESKeyUnwrap(`
`234`	`234`
`235`	`235`	`return (rawKey, status)`
`236`	`236`	`}`
	`237`	`+// swiftlint:enable force_unwrapping`
Original file line number	Diff line number	Diff line change
`@@ -166,3 +166,4 @@ class AESKeyWrapTests: XCTestCase {`
`166`	`166`	`}`
`167`	`167`	`}`
`168`	`168`	`}`
	`169`	`+// swiftlint:enable force_unwrapping`
Original file line number	Diff line number	Diff line change
`@@ -273,3 +273,4 @@ class ASN1DERParsingTests: XCTestCase {`
`273`	`273`	`}`
`274`	`274`
`275`	`275`	`}`
	`276`	`+// swiftlint:enable force_unwrapping`
Original file line number	Diff line number	Diff line change
`@@ -88,3 +88,4 @@ extension Data {`
`88`	`88`	`.joined(separator: "")`
`89`	`89`	`}`
`90`	`90`	`}`
	`91`	`+// swiftlint:enable force_unwrapping`
Original file line number	Diff line number	Diff line change
`@@ -184,3 +184,4 @@ class DataExtensionTests: XCTestCase {`
`184`	`184`	`XCTAssertEqual(false, testData1._timingSafeCompare(with: testData2))`
`185`	`185`	`}`
`186`	`186`	`}`
	`187`	`+// swiftlint:enable force_unwrapping`