Skip to content

Commit b3d054c

Browse files
committed
udpate carthage build instrictions
1 parent 5b49d96 commit b3d054c

Some content is hidden

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

43 files changed

+144
-1466
lines changed

73a65a1766e605eaeb5d699fcaa8da02

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Subproject commit 4b9283599f7dc904dda099e820226cc1639e6b82

Cartfile.resolved

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
github "attaswift/BigInt" "v5.2.1"
22
github "attaswift/SipHash" "v1.2.2"
33
github "daltoniam/Starscream" "4.0.4"
4-
github "krzyzanowskim/CryptoSwift" "1.4.0"
4+
github "krzyzanowskim/CryptoSwift" "1.4.1"
55
github "mxcl/PromiseKit" "6.15.3"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
jobs:
1010
build:
1111

12-
runs-on: ubuntu-18.04
12+
runs-on: ubuntu-20.04
1313

1414
steps:
1515
- uses: actions/checkout@v2

Carthage/Checkouts/CryptoSwift/.pre-commit-config.yaml

Lines changed: 0 additions & 11 deletions
This file was deleted.

Carthage/Checkouts/CryptoSwift/CHANGELOG

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
1.4.1
2+
- Introduce ISO 10126 padding
3+
- fix various compiler warnings
4+
- Revert Xcode project deployment target
5+
16
1.4.0
27
- Customize CFB segment size (cfb8, cfb128).
38
- Adapt Swift @inlineable for better code optimization

Carthage/Checkouts/CryptoSwift/CONTRIBUTORS.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,12 @@ organizations who have contributed source code to CryptoSwift.
2828
- Chris Amanse <[email protected]>
2929
- Christian Steffens <[email protected]>
3030
- Cihat Gündüz <[email protected]>
31+
- Cosmin Baies <[email protected]>
3132
- Dave Wood <[email protected]>
3233
- Dima Kalachov <[email protected]>
3334
- Dusan Klinec <[email protected]>
3435
- Eneko Alonso <[email protected]>
36+
- Eugene Berdnikov <[email protected]>
3537
- Evan Maloney <[email protected]>
3638
- Evin Ugur <[email protected]>
3739
- Frank Langel <[email protected]>
@@ -47,6 +49,7 @@ organizations who have contributed source code to CryptoSwift.
4749
- Javier Soto <[email protected]>
4850
- Jeremy Greenwood <[email protected]>
4951
- John Hammerlund <[email protected]>
52+
- Jonas Obrist <[email protected]>
5053
- K.K. POON <[email protected]>
5154
- Keith Smiley <[email protected]>
5255
- Koray Koska <[email protected]>

Carthage/Checkouts/CryptoSwift/CryptoSwift.playground/Contents.swift

Lines changed: 0 additions & 171 deletions
This file was deleted.

Carthage/Checkouts/CryptoSwift/CryptoSwift.playground/contents.xcplayground

Lines changed: 0 additions & 4 deletions
This file was deleted.

Carthage/Checkouts/CryptoSwift/CryptoSwift.podspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
Pod::Spec.new do |s|
22
s.name = "CryptoSwift"
3-
s.version = "1.4.0"
3+
s.version = "1.4.1"
44
s.source = { :git => "https://github.com/krzyzanowskim/CryptoSwift.git", :tag => "#{s.version}" }
55
s.summary = "Cryptography in Swift. SHA, MD5, CRC, PBKDF, Poly1305, HMAC, CMAC, HDKF, Scrypt, ChaCha20, Rabbit, Blowfish, AES."
66
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"
77
s.homepage = "https://github.com/krzyzanowskim/CryptoSwift"
88
s.license = {:type => "Attribution", :file => "LICENSE"}
99
s.authors = {'Marcin Krzyżanowski' => '[email protected]'}
1010
s.social_media_url = "https://twitter.com/krzyzanowskim"
11-
s.cocoapods_version = '>= 1.9.1'
11+
s.cocoapods_version = '>= 1.10.0'
1212
s.swift_version = "5.3"
1313
s.ios.deployment_target = "9.0"
1414
s.osx.deployment_target = "10.12"

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
14156CE52011422400DDCFBC /* ChaCha20Poly1305Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 14156CE42011422400DDCFBC /* ChaCha20Poly1305Tests.swift */; };
1414
1467460F2017BB3600DF04ED /* AEAD.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1467460E2017BB3600DF04ED /* AEAD.swift */; };
1515
35F3E51C23BF9A6700A024A1 /* OCB.swift in Sources */ = {isa = PBXBuildFile; fileRef = 35F3E51B23BF9A6700A024A1 /* OCB.swift */; };
16+
42012783267A6F1C00F82506 /* ISO10126Padding.swift in Sources */ = {isa = PBXBuildFile; fileRef = 42012782267A6F1C00F82506 /* ISO10126Padding.swift */; };
1617
674A736F1BF5D85B00866C5B /* RabbitTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 674A736E1BF5D85B00866C5B /* RabbitTests.swift */; };
1718
750509991F6BEF2A00394A1B /* PKCS7.swift in Sources */ = {isa = PBXBuildFile; fileRef = 750509981F6BEF2A00394A1B /* PKCS7.swift */; };
1819
750CC3EB1DC0CACE0096BE6E /* BlowfishTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 750CC3EA1DC0CACE0096BE6E /* BlowfishTests.swift */; };
@@ -204,6 +205,7 @@
204205
1467460E2017BB3600DF04ED /* AEAD.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AEAD.swift; sourceTree = "<group>"; };
205206
35F3E51B23BF9A6700A024A1 /* OCB.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OCB.swift; sourceTree = "<group>"; };
206207
35F3E51D23BF9AD300A024A1 /* AESOCBTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AESOCBTests.swift; sourceTree = "<group>"; };
208+
42012782267A6F1C00F82506 /* ISO10126Padding.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ISO10126Padding.swift; sourceTree = "<group>"; };
207209
674A736E1BF5D85B00866C5B /* RabbitTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RabbitTests.swift; sourceTree = "<group>"; };
208210
750509981F6BEF2A00394A1B /* PKCS7.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PKCS7.swift; sourceTree = "<group>"; };
209211
750CC3EA1DC0CACE0096BE6E /* BlowfishTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BlowfishTests.swift; sourceTree = "<group>"; };
@@ -509,6 +511,7 @@
509511
isa = PBXGroup;
510512
children = (
511513
0AF023D4230F2B0F008E4E68 /* ISO78164Padding.swift */,
514+
42012782267A6F1C00F82506 /* ISO10126Padding.swift */,
512515
7529366820683DFC00195874 /* AEAD */,
513516
75EC52381EE8B6CA0048EB3B /* AES.swift */,
514517
751EE9771F93996100161FFC /* AES.Cryptors.swift */,
@@ -831,6 +834,7 @@
831834
isa = PBXSourcesBuildPhase;
832835
buildActionMask = 2147483647;
833836
files = (
837+
42012783267A6F1C00F82506 /* ISO10126Padding.swift in Sources */,
834838
0AF023D5230F2B0F008E4E68 /* ISO78164Padding.swift in Sources */,
835839
75EC52861EE8B8170048EB3B /* CFB.swift in Sources */,
836840
75EC52901EE8B81A0048EB3B /* Collection+Extension.swift in Sources */,

0 commit comments

Comments
 (0)