Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update carthage libraries #325

Merged
merged 2 commits into from
Jun 23, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
github "attaswift/BigInt" "v5.2.0"
github "attaswift/BigInt" "v5.2.1"
github "attaswift/SipHash" "v1.2.2"
github "daltoniam/Starscream" "3.1.1"
github "krzyzanowskim/CryptoSwift" "1.3.2"
github "mxcl/PromiseKit" "6.13.3"
github "krzyzanowskim/CryptoSwift" "1.4.0"
github "mxcl/PromiseKit" "6.15.3"
2 changes: 1 addition & 1 deletion Carthage/Checkouts/BigInt/BigInt.podspec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Pod::Spec.new do |spec|
spec.name = 'BigInt'
spec.version = '5.2.0'
spec.version = '5.2.1'
spec.ios.deployment_target = "8.0"
spec.osx.deployment_target = "10.9"
spec.tvos.deployment_target = "9.0"
Expand Down
6 changes: 6 additions & 0 deletions Carthage/Checkouts/BigInt/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# 5.2.1 (2020-11-15)

This release contains the following changes:

- Added a temporary fix for [SR-13491](https://bugs.swift.org/browse/SR-13491)

# 5.2.0 (2020-08-24)

This release contains the following changes:
Expand Down
Binary file not shown.
8 changes: 4 additions & 4 deletions Carthage/Checkouts/BigInt/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ The last version with support for Swift 2 was BigInt 1.3.0.)
| 3.x | 2.1.0 |
| 4.0 | 3.1.0 |
| 4.2 | 4.0.0 |
| 5.0 | 5.0.0 |
| 5.x | 5.2.1 |

BigInt deploys to macOS 10.10, iOS 9, watchOS 2 and tvOS 9.
It has been tested on the latest OS releases only---however, as the module uses very few platform-provided APIs,
Expand All @@ -121,19 +121,19 @@ Setup instructions:
Add this to the dependency section of your `Package.swift` manifest:

```Swift
.package(url: "https://github.com/attaswift/BigInt.git", from: "5.0.0")
.package(url: "https://github.com/attaswift/BigInt.git", from: "5.2.1")
```

- **CocoaPods:** Put this in your `Podfile`:

```Ruby
pod 'BigInt', '~> 5.0'
pod 'BigInt', '~> 5.2'
```

- **Carthage:** Put this in your `Cartfile`:

```
github "attaswift/BigInt" ~> 5.0
github "attaswift/BigInt" ~> 5.2
```

## <a name="notes">Implementation notes</a>
Expand Down
13 changes: 7 additions & 6 deletions Carthage/Checkouts/BigInt/Sources/Division.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@

//MARK: Full-width multiplication and division

extension FixedWidthInteger where Magnitude == Self {
// TODO: Return to `where Magnitude == Self` when SR-13491 is resolved
extension FixedWidthInteger {
private var halfShift: Self {
return Self(Self.bitWidth / 2)

Expand Down Expand Up @@ -91,13 +92,13 @@ extension FixedWidthInteger where Magnitude == Self {
let w = Self(Self.bitWidth) - z
let vn = self << z

let un32 = (z == 0 ? dividend.high : (dividend.high &<< z) | (dividend.low &>> w)) // No bits are lost
let un32 = (z == 0 ? dividend.high : (dividend.high &<< z) | ((dividend.low as! Self) &>> w)) // No bits are lost
let un10 = dividend.low &<< z
let (un1, un0) = un10.split

// Divide `(un32,un10)` by `vn`, splitting the full 4/2 division into two 3/2 ones.
let (q1, un21) = quotientAndRemainder(dividing: (un32, un1), by: vn)
let (q0, rn) = quotientAndRemainder(dividing: (un21, un0), by: vn)
let (q1, un21) = quotientAndRemainder(dividing: (un32, (un1 as! Self)), by: vn)
let (q0, rn) = quotientAndRemainder(dividing: (un21, (un0 as! Self)), by: vn)

// Undo normalization of the remainder and combine the two halves of the quotient.
let mod = rn >> z
Expand All @@ -120,7 +121,7 @@ extension FixedWidthInteger where Magnitude == Self {
r = s
}
else {
(q, r) = y.0.fastDividingFullWidth((x.0, x.1))
(q, r) = y.0.fastDividingFullWidth((x.0, (x.1 as! Magnitude)))
}
// Now refine q by considering x.2 and y.1.
// Note that since y is normalized, q * y - x is between 0 and 2.
Expand All @@ -130,7 +131,7 @@ extension FixedWidthInteger where Magnitude == Self {
let (r1, ro) = r.addingReportingOverflow(y.0)
if ro { return q - 1 }

let (pl1, so) = pl.subtractingReportingOverflow(y.1)
let (pl1, so) = pl.subtractingReportingOverflow((y.1 as! Magnitude))
let ph1 = (so ? ph - 1 : ph)

if ph1 < r1 || (ph1 == r1 && pl1 <= x.2) { return q - 1 }
Expand Down
5 changes: 3 additions & 2 deletions Carthage/Checkouts/BigInt/Tests/BigIntTests/WordTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,12 @@
import XCTest
@testable import BigInt

struct TestDivision<Word: FixedWidthInteger> where Word.Magnitude == Word {
// TODO: Return to `where Word.Magnitude == Word` when SR-13491 is resolved
struct TestDivision<Word: FixedWidthInteger> {
static func testDivision(_ u: (high: Word, low: Word.Magnitude), _ v: Word) {
let (div, mod) = v.fastDividingFullWidth(u)
var (ph, pl) = div.multipliedFullWidth(by: v)
let (s, o) = pl.addingReportingOverflow(mod)
let (s, o) = pl.addingReportingOverflow((mod as! Word.Magnitude))
pl = s
if o { ph += Word(1) }

Expand Down
4 changes: 2 additions & 2 deletions Carthage/Checkouts/BigInt/version.xcconfig
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Increment the build number whenever you modify the version string.
VERSION_STRING = 5.2.0
BUILD_NUMBER = 16
VERSION_STRING = 5.2.1
BUILD_NUMBER = 17

PROJECT_NAME = BigInt
BUNDLE_IDENTIFIER_BASE = org.attaswift.$(PROJECT_NAME)
Expand Down
2 changes: 1 addition & 1 deletion Carthage/Checkouts/CryptoSwift/.github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
branches: [ master ]

env:
DEVELOPER_DIR: /Applications/Xcode_11.4.1.app/Contents/Developer
DEVELOPER_DIR: /Applications/Xcode_12.2.app/Contents/Developer

jobs:
build:
Expand Down
26 changes: 26 additions & 0 deletions Carthage/Checkouts/CryptoSwift/CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,29 @@
1.4.0
- Customize CFB segment size (cfb8, cfb128).
- Adapt Swift @inlineable for better code optimization

1.3.8
- Revert xcframework revolution. Back to build from sources. (I'm sorry)

1.3.7
- Re-release to workaround Swift Package Manager release

1.3.6
- Fix macOS binary
- Windows support

1.3.5
- Re-release binary framework due to codesign issue

1.3.4
- Distribute optimized binary (xcframework) via SPM for apple platforms

1.3.3
- Adds OCB Authenticated-Encryption Algorithm (RFC7253)
- build-framework.sh output CryptoSwift.xcframework
- Xcode 12.2 maintenance updates
- Removed CryptoSwift.playground (couldn't make it work since Xcode 12 update)

1.3.2
- Swift 5.3 update (Xcode 12)
- Bump target platform (iOS 9, macOS 10.12)
Expand Down
5 changes: 5 additions & 0 deletions Carthage/Checkouts/CryptoSwift/CONTRIBUTORS.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,14 @@ organizations who have contributed source code to CryptoSwift.
- Alexey Komnin <Interfere@users.noreply.github.com>
- Alsey Coleman Miller <alseycmiller@gmail.com>
- Andrew Wagner <845683+drewag@users.noreply.github.com>
- André Berenguel <andre.berenguel@gmail.com>
- Anton <antonmes@users.noreply.github.com>
- Ayaka Nonaka <ayanonagon@gmail.com>
- Bart Cone <cone.bart@gmail.com>
- Bing Cheung <32565605+eungch@users.noreply.github.com>
- Bogdan Bystritskiy <q80061@gmail.com>
- Brice Cesarin <bc@dejamobile.com>
- Bruce Geerdes <bruce@vdub.software>
- Bryan Chen <xlchen1291@gmail.com>
- Bryant Luk <bryant.luk@bryantluk.com>
- C.W. Betts <computers57@hotmail.com>
Expand All @@ -35,6 +37,7 @@ organizations who have contributed source code to CryptoSwift.
- Frank Langel <frank@frankjlangel.com>
- Frank Langel <gr.markin@googlemail.com>
- Franklin Schrans <f.schrans@me.com>
- FreeThinker <59345560+Free-FreeThinker@users.noreply.github.com>
- Grzegorz Nowicki <sp3esu@gmail.com>
- Hamilton Chapman <hamchapman@gmail.com>
- Honza Dvorsky <jan.dvorsky@yahoo.com>
Expand Down Expand Up @@ -65,6 +68,7 @@ organizations who have contributed source code to CryptoSwift.
- Michael Redig <mredig@gmail.com>
- Mo Ramezanpoor <me@mohsenr.com>
- Nate West <nwest@detroitlabs.com>
- Nathan Fallet <contact@nathanfallet.me>
- Nicholas Maccharoli <nicko@screaming-cactus.com>
- Nobutaka Yuasa <nobutaka.yuasa@gmail.com>
- Oscar De Moya <oscar.demoya@koombea.com>
Expand All @@ -84,6 +88,7 @@ organizations who have contributed source code to CryptoSwift.
- ScottieY <scottieyan@gmail.com>
- Semen Zhydenko <simeon.zhidenko@gmail.com>
- Simon Hartmann <simon.hartmann@andrena.de>
- Stefan Hintz <stefan.hintz@bild.de>
- Thomas Bibby <hello@ipadtills.com>
- Thomas Haak <thomas.haak@teleboy.ch>
- TictoDev <kjelldebaeremaecker@icloud.com>
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion Carthage/Checkouts/CryptoSwift/CryptoSwift.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "CryptoSwift"
s.version = "1.3.2"
s.version = "1.4.0"
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"
Expand Down
Loading