Skip to content

Commit 3a08971

Browse files
committed
Merge commit 'e6fdc842128038eb23b41fadf74d99f361d7c7e5' into develop
2 parents 57a2cd0 + e6fdc84 commit 3a08971

File tree

65 files changed

+2671
-2766
lines changed

Some content is hidden

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

65 files changed

+2671
-2766
lines changed

Podfile.lock

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PODS:
22
- BigInt (3.1.0):
33
- SipHash (~> 1.2)
4-
- CryptoSwift (0.12.0)
4+
- CryptoSwift (0.13.0)
55
- PromiseKit (6.4.1):
66
- PromiseKit/CorePromise (= 6.4.1)
77
- PromiseKit/Foundation (= 6.4.1)
@@ -41,7 +41,7 @@ SPEC REPOS:
4141

4242
SPEC CHECKSUMS:
4343
BigInt: 76b5dfdfa3e2e478d4ffdf161aeede5502e2742f
44-
CryptoSwift: 1c07ca50843dd48bc54e6ea53d7a4dba3b645716
44+
CryptoSwift: 16e78bebf567bad1c87b2d58f6547f25b74c31aa
4545
PromiseKit: 4c76a6506638034e3d7bede97b2ff7743f7bd2dc
4646
Result: 7645bb3f50c2ce726dd0ff2fa7b6f42bbe6c3713
4747
scrypt: 3fe5b1a3b0976f97cd87488673a8f7c65708cc84
@@ -51,4 +51,4 @@ SPEC CHECKSUMS:
5151

5252
PODFILE CHECKSUM: 2664c33ef7c46c222ed5963c84c7ebd86a806b9e
5353

54-
COCOAPODS: 1.6.0.beta.2
54+
COCOAPODS: 1.6.0.beta.1

Pods/CryptoSwift/README.md

+21-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/CryptoSwift/Sources/CryptoSwift/AES.Cryptors.swift

+3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/CryptoSwift/Sources/CryptoSwift/BlockDecryptor.swift

+6-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/CryptoSwift/Sources/CryptoSwift/BlockEncryptor.swift

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/CryptoSwift/Sources/CryptoSwift/BlockMode/BlockModeOptions.swift

-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)