Skip to content

Commit 6880d0a

Browse files
authored
Merge pull request #211 from BANKEX/develop
Remove libsodium
2 parents 004bad3 + c049c9e commit 6880d0a

File tree

500 files changed

+4429
-35544
lines changed

Some content is hidden

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

500 files changed

+4429
-35544
lines changed

Podfile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
def import_pods
2+
pod 'scrypt', '~> 1.5'
23
pod "PromiseKit", "~> 6.3"
34
pod 'BigInt', '~> 3.1'
4-
pod 'CryptoSwift', '~> 0.10'
5+
pod 'CryptoSwift', '~> 0.11'
56
pod 'Result', '~> 3.0'
6-
pod 'libsodium', :modular_headers => true
7+
# pod 'libsodium', :modular_headers => true
78
pod 'secp256k1_ios', :git => 'https://github.com/shamatar/secp256k1_ios.git', :modular_headers => true
89
end
910

1011
target 'web3swift-macOS' do
11-
platform :osx, '10.13'
12+
platform :osx, '10.11'
1213
# use_frameworks!
1314
use_modular_headers!
1415
import_pods

Podfile.lock

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
PODS:
22
- BigInt (3.1.0):
33
- SipHash (~> 1.2)
4-
- CryptoSwift (0.10.0)
5-
- libsodium (1.0.12)
4+
- CryptoSwift (0.11.0)
65
- PromiseKit (6.3.4):
76
- PromiseKit/CorePromise (= 6.3.4)
87
- PromiseKit/Foundation (= 6.3.4)
@@ -13,24 +12,26 @@ PODS:
1312
- PromiseKit/UIKit (6.3.4):
1413
- PromiseKit/CorePromise
1514
- Result (3.2.4)
15+
- scrypt (1.5):
16+
- CryptoSwift (~> 0.11)
1617
- secp256k1_ios (0.1.3)
1718
- SipHash (1.2.2)
1819

1920
DEPENDENCIES:
2021
- BigInt (~> 3.1)
21-
- CryptoSwift (~> 0.10)
22-
- libsodium
22+
- CryptoSwift (~> 0.11)
2323
- PromiseKit (~> 6.3)
2424
- Result (~> 3.0)
25+
- scrypt (~> 1.5)
2526
- secp256k1_ios (from `https://github.com/shamatar/secp256k1_ios.git`)
2627

2728
SPEC REPOS:
2829
https://github.com/cocoapods/specs.git:
2930
- BigInt
3031
- CryptoSwift
31-
- libsodium
3232
- PromiseKit
3333
- Result
34+
- scrypt
3435
- SipHash
3536

3637
EXTERNAL SOURCES:
@@ -44,13 +45,13 @@ CHECKOUT OPTIONS:
4445

4546
SPEC CHECKSUMS:
4647
BigInt: 76b5dfdfa3e2e478d4ffdf161aeede5502e2742f
47-
CryptoSwift: 6c778d69282bed3b4e975ff97a79d074f20bb011
48-
libsodium: 9a8faa5ef2fa0d2d57bd7f7d79bf8fb7c1a9f0ea
48+
CryptoSwift: ad5208dd2aae0a764ea4ce2c2d34bd067cae67f0
4949
PromiseKit: e1425568123ec844a944c93f2bcb29d511d39cf5
5050
Result: d2d07204ce72856f1fd9130bbe42c35a7b0fea10
51+
scrypt: 0da45be386be45f857d8545216148e86e753a9a1
5152
secp256k1_ios: ac9ef04e761f43c58012b28548afa91493761f17
5253
SipHash: fad90a4683e420c52ef28063063dbbce248ea6d4
5354

54-
PODFILE CHECKSUM: 7bf3f0b4c63191f570350a917c9cf1da16215395
55+
PODFILE CHECKSUM: ee85c7e6b43ed8a658c17d7f72f086ad3a5af402
5556

5657
COCOAPODS: 1.5.3

Pods/CryptoSwift/README.md

Lines changed: 1 addition & 1 deletion
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

Lines changed: 9 additions & 149 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/CryptoSwift/Sources/CryptoSwift/BlockDecryptor.swift

Lines changed: 84 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/CryptoSwift/Sources/CryptoSwift/BlockEncryptor.swift

Lines changed: 57 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)