Skip to content

Commit

Permalink
Update Cocoapods.
Browse files Browse the repository at this point in the history
  • Loading branch information
charlesmchen-signal committed Apr 20, 2020
1 parent d23d040 commit b8d2f9f
Show file tree
Hide file tree
Showing 31 changed files with 5,796 additions and 5,754 deletions.
4 changes: 2 additions & 2 deletions Local Podspecs/SignalRingRTC.podspec.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"name": "SignalRingRTC",
"version": "1.2.0",
"version": "1.3.1",
"summary": "A Swift & Objective-C library used by the Signal iOS app for WebRTC interactions.",
"description": "A Swift & Objective-C library used by the Signal iOS app for WebRTC interactions.\"",
"license": "GPLv3",
"homepage": "https://github.com/signalapp/ringrtc",
"source": {
"git": "https://github.com/signalapp/ringrtc.git",
"tag": "v1.2.0"
"tag": "v1.3.1"
},
"authors": {
"iOS Team": "[email protected]"
Expand Down
4 changes: 2 additions & 2 deletions Local Podspecs/ZKGroup.podspec.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ZKGroup",
"version": "0.4.0",
"version": "0.5.0",
"summary": "Swift API for the Rust zkgroup crate.",
"homepage": "https://signal.org/",
"license": {
Expand All @@ -12,7 +12,7 @@
},
"source": {
"git": "https://github.com/signalapp/signal-groupzk-swift.git",
"tag": "0.4.0"
"tag": "0.5.0"
},
"platforms": {
"ios": "10.0"
Expand Down
16 changes: 8 additions & 8 deletions Manifest.lock
Original file line number Diff line number Diff line change
Expand Up @@ -100,10 +100,10 @@ PODS:
- HKDFKit
- SignalCoreKit
- SwiftProtobuf
- SignalRingRTC (1.2.0):
- SignalRingRTC (1.3.1):
- SignalCoreKit
- SignalRingRTC/WebRTC (= 1.2.0)
- SignalRingRTC/WebRTC (1.2.0):
- SignalRingRTC/WebRTC (= 1.3.1)
- SignalRingRTC/WebRTC (1.3.1):
- SignalCoreKit
- SignalServiceKit (0.9.0):
- AFNetworking/NSURLSession
Expand Down Expand Up @@ -222,8 +222,8 @@ PODS:
- YYImage/Core (1.0.4)
- YYImage/WebP (1.0.4):
- YYImage/Core
- ZKGroup (0.4.0)
- ZKGroup/Tests (0.4.0)
- ZKGroup (0.5.0)
- ZKGroup/Tests (0.5.0)
- ZXingObjC (3.6.5):
- ZXingObjC/All (= 3.6.5)
- ZXingObjC/All (3.6.5)
Expand Down Expand Up @@ -361,7 +361,7 @@ CHECKOUT OPTIONS:
:commit: e43ab163b2dcb4c817339c819b07dac545f05fea
:git: https://github.com/signalapp/YapDatabase.git
ZKGroup:
:commit: e3e7b29846c06c22ab9350382fddf8b1ae2c57e9
:commit: 82ce7ef9c5afdf50ab33ba664b049917a893ed3b
:git: https://github.com/signalapp/signal-zkgroup-swift
ZXingObjC:
:commit: fce3786177fd7032c62b230df8beeb206722d38e
Expand All @@ -387,15 +387,15 @@ SPEC CHECKSUMS:
SAMKeychain: 483e1c9f32984d50ca961e26818a534283b4cd5c
SignalCoreKit: 4562b2bbd9830077439ca003f952a798457d4ea5
SignalMetadataKit: a7aacedf262d947c22e2c619f0fd217163d2a637
SignalRingRTC: d6a8f36f67a36f2df01a9bc97ed0fbc204786558
SignalRingRTC: 9960e0dd8f82b252afeefefdec38c18d06a679f4
SignalServiceKit: cb2f67a0d53d0aebf588058e96f155eb5c8e6b75
SQLCipher: d305a7bd9af4b64f095c79bdc1a1fa50f2a15116
SSZipArchive: 41455d4b8d2b6ab93990820b50dc697c2554a322
Starscream: 8aaf1a7feb805c816d0e7d3190ef23856f6665b9
SwiftProtobuf: 4fd9645e69b72cbae6ec8da5be0cdd20ca6565dd
YapDatabase: b418a4baa6906e8028748938f9159807fd039af4
YYImage: 1e1b62a9997399593e4b9c4ecfbbabbf1d3f3b54
ZKGroup: e6b59a9e9faa04f06cff91fd27f4949593d25b4b
ZKGroup: 098a169564ee862f794daa4b8de49d22b17322cd
ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb

PODFILE CHECKSUM: 6ac96ed037cb6453c2c66281ff1ffbbfefe565dd
Expand Down
11,045 changes: 5,543 additions & 5,502 deletions Pods.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.2.0</string>
<string>1.3.1</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
#import "TSInfoMessage.h"
#import "TSInteraction.h"
#import "TSMessage.h"
#import "TSOutgoingDeleteMessage.h"
#import "TSOutgoingMessage.h"
#import "TSQuotedMessage.h"
#import "TSUnreadIndicatorInteraction.h"
Expand Down
2 changes: 1 addition & 1 deletion Target Support Files/ZKGroup/ZKGroup-Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>0.4.0</string>
<string>0.5.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
2 changes: 1 addition & 1 deletion ZKGroup/ZKGroup/AuthCredential.swift
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public class AuthCredential : ByteArray {
try super.init(newContents: contents, expectedLength: AuthCredential.SIZE)


let ffi_return = FFI_AuthCredential_checkValidContents(self.contents, UInt64(self.contents.count))
let ffi_return = FFI_AuthCredential_checkValidContents(self.contents, UInt32(self.contents.count))

if (ffi_return == Native.FFI_RETURN_INPUT_ERROR) {
throw ZkGroupException.InvalidInput
Expand Down
6 changes: 3 additions & 3 deletions ZKGroup/ZKGroup/AuthCredentialPresentation.swift
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public class AuthCredentialPresentation : ByteArray {
try super.init(newContents: contents, expectedLength: AuthCredentialPresentation.SIZE)


let ffi_return = FFI_AuthCredentialPresentation_checkValidContents(self.contents, UInt64(self.contents.count))
let ffi_return = FFI_AuthCredentialPresentation_checkValidContents(self.contents, UInt32(self.contents.count))

if (ffi_return == Native.FFI_RETURN_INPUT_ERROR) {
throw ZkGroupException.InvalidInput
Expand All @@ -31,7 +31,7 @@ public class AuthCredentialPresentation : ByteArray {
public func getUuidCiphertext() throws -> UuidCiphertext {
var newContents: [UInt8] = Array(repeating: 0, count: UuidCiphertext.SIZE)

let ffi_return = FFI_AuthCredentialPresentation_getUuidCiphertext(self.contents, UInt64(self.contents.count), &newContents, UInt64(newContents.count))
let ffi_return = FFI_AuthCredentialPresentation_getUuidCiphertext(self.contents, UInt32(self.contents.count), &newContents, UInt32(newContents.count))

if (ffi_return != Native.FFI_RETURN_OK) {
throw ZkGroupException.ZkGroupError
Expand All @@ -48,7 +48,7 @@ public class AuthCredentialPresentation : ByteArray {
public func getRedemptionTime() throws -> UInt32 {
var newContents: [UInt8] = Array(repeating: 0, count: Int(4))

let ffi_return = FFI_AuthCredentialPresentation_getRedemptionTime(self.contents, UInt64(self.contents.count), &newContents, UInt64(newContents.count))
let ffi_return = FFI_AuthCredentialPresentation_getRedemptionTime(self.contents, UInt32(self.contents.count), &newContents, UInt32(newContents.count))

if (ffi_return != Native.FFI_RETURN_OK) {
throw ZkGroupException.ZkGroupError
Expand Down
2 changes: 1 addition & 1 deletion ZKGroup/ZKGroup/AuthCredentialResponse.swift
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public class AuthCredentialResponse : ByteArray {
try super.init(newContents: contents, expectedLength: AuthCredentialResponse.SIZE)


let ffi_return = FFI_AuthCredentialResponse_checkValidContents(self.contents, UInt64(self.contents.count))
let ffi_return = FFI_AuthCredentialResponse_checkValidContents(self.contents, UInt32(self.contents.count))

if (ffi_return == Native.FFI_RETURN_INPUT_ERROR) {
throw ZkGroupException.InvalidInput
Expand Down
4 changes: 2 additions & 2 deletions ZKGroup/ZKGroup/ClientZkAuthOperations.swift
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public class ClientZkAuthOperations {
public func receiveAuthCredential(uuid: ZKGUuid, redemptionTime: UInt32, authCredentialResponse: AuthCredentialResponse) throws -> AuthCredential {
var newContents: [UInt8] = Array(repeating: 0, count: AuthCredential.SIZE)

let ffi_return = FFI_ServerPublicParams_receiveAuthCredential(serverPublicParams.getInternalContentsForFFI(), UInt64(serverPublicParams.getInternalContentsForFFI().count), uuid.getInternalContentsForFFI(), UInt64(uuid.getInternalContentsForFFI().count), redemptionTime, authCredentialResponse.getInternalContentsForFFI(), UInt64(authCredentialResponse.getInternalContentsForFFI().count), &newContents, UInt64(newContents.count))
let ffi_return = FFI_ServerPublicParams_receiveAuthCredential(serverPublicParams.getInternalContentsForFFI(), UInt32(serverPublicParams.getInternalContentsForFFI().count), uuid.getInternalContentsForFFI(), UInt32(uuid.getInternalContentsForFFI().count), redemptionTime, authCredentialResponse.getInternalContentsForFFI(), UInt32(authCredentialResponse.getInternalContentsForFFI().count), &newContents, UInt32(newContents.count))
if (ffi_return == Native.FFI_RETURN_INPUT_ERROR) {
throw ZkGroupException.VerificationFailed
}
Expand Down Expand Up @@ -44,7 +44,7 @@ public class ClientZkAuthOperations {
public func createAuthCredentialPresentation(randomness: [UInt8], groupSecretParams: GroupSecretParams, authCredential: AuthCredential) throws -> AuthCredentialPresentation {
var newContents: [UInt8] = Array(repeating: 0, count: AuthCredentialPresentation.SIZE)

let ffi_return = FFI_ServerPublicParams_createAuthCredentialPresentationDeterministic(serverPublicParams.getInternalContentsForFFI(), UInt64(serverPublicParams.getInternalContentsForFFI().count), randomness, UInt64(randomness.count), groupSecretParams.getInternalContentsForFFI(), UInt64(groupSecretParams.getInternalContentsForFFI().count), authCredential.getInternalContentsForFFI(), UInt64(authCredential.getInternalContentsForFFI().count), &newContents, UInt64(newContents.count))
let ffi_return = FFI_ServerPublicParams_createAuthCredentialPresentationDeterministic(serverPublicParams.getInternalContentsForFFI(), UInt32(serverPublicParams.getInternalContentsForFFI().count), randomness, UInt32(randomness.count), groupSecretParams.getInternalContentsForFFI(), UInt32(groupSecretParams.getInternalContentsForFFI().count), authCredential.getInternalContentsForFFI(), UInt32(authCredential.getInternalContentsForFFI().count), &newContents, UInt32(newContents.count))

if (ffi_return != Native.FFI_RETURN_OK) {
throw ZkGroupException.ZkGroupError
Expand Down
12 changes: 6 additions & 6 deletions ZKGroup/ZKGroup/ClientZkGroupCipher.swift
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public class ClientZkGroupCipher {
public func encryptUuid(uuid: ZKGUuid) throws -> UuidCiphertext {
var newContents: [UInt8] = Array(repeating: 0, count: UuidCiphertext.SIZE)

let ffi_return = FFI_GroupSecretParams_encryptUuid(groupSecretParams.getInternalContentsForFFI(), UInt64(groupSecretParams.getInternalContentsForFFI().count), uuid.getInternalContentsForFFI(), UInt64(uuid.getInternalContentsForFFI().count), &newContents, UInt64(newContents.count))
let ffi_return = FFI_GroupSecretParams_encryptUuid(groupSecretParams.getInternalContentsForFFI(), UInt32(groupSecretParams.getInternalContentsForFFI().count), uuid.getInternalContentsForFFI(), UInt32(uuid.getInternalContentsForFFI().count), &newContents, UInt32(newContents.count))

if (ffi_return != Native.FFI_RETURN_OK) {
throw ZkGroupException.ZkGroupError
Expand All @@ -31,7 +31,7 @@ public class ClientZkGroupCipher {
public func decryptUuid(uuidCiphertext: UuidCiphertext) throws -> ZKGUuid {
var newContents: [UInt8] = Array(repeating: 0, count: ZKGUuid.SIZE)

let ffi_return = FFI_GroupSecretParams_decryptUuid(groupSecretParams.getInternalContentsForFFI(), UInt64(groupSecretParams.getInternalContentsForFFI().count), uuidCiphertext.getInternalContentsForFFI(), UInt64(uuidCiphertext.getInternalContentsForFFI().count), &newContents, UInt64(newContents.count))
let ffi_return = FFI_GroupSecretParams_decryptUuid(groupSecretParams.getInternalContentsForFFI(), UInt32(groupSecretParams.getInternalContentsForFFI().count), uuidCiphertext.getInternalContentsForFFI(), UInt32(uuidCiphertext.getInternalContentsForFFI().count), &newContents, UInt32(newContents.count))
if (ffi_return == Native.FFI_RETURN_INPUT_ERROR) {
throw ZkGroupException.VerificationFailed
}
Expand Down Expand Up @@ -61,7 +61,7 @@ public class ClientZkGroupCipher {
public func encryptProfileKey(randomness: [UInt8], profileKey: ProfileKey, uuid: ZKGUuid) throws -> ProfileKeyCiphertext {
var newContents: [UInt8] = Array(repeating: 0, count: ProfileKeyCiphertext.SIZE)

let ffi_return = FFI_GroupSecretParams_encryptProfileKeyDeterministic(groupSecretParams.getInternalContentsForFFI(), UInt64(groupSecretParams.getInternalContentsForFFI().count), randomness, UInt64(randomness.count), profileKey.getInternalContentsForFFI(), UInt64(profileKey.getInternalContentsForFFI().count), uuid.getInternalContentsForFFI(), UInt64(uuid.getInternalContentsForFFI().count), &newContents, UInt64(newContents.count))
let ffi_return = FFI_GroupSecretParams_encryptProfileKeyDeterministic(groupSecretParams.getInternalContentsForFFI(), UInt32(groupSecretParams.getInternalContentsForFFI().count), randomness, UInt32(randomness.count), profileKey.getInternalContentsForFFI(), UInt32(profileKey.getInternalContentsForFFI().count), uuid.getInternalContentsForFFI(), UInt32(uuid.getInternalContentsForFFI().count), &newContents, UInt32(newContents.count))

if (ffi_return != Native.FFI_RETURN_OK) {
throw ZkGroupException.ZkGroupError
Expand All @@ -78,7 +78,7 @@ public class ClientZkGroupCipher {
public func decryptProfileKey(profileKeyCiphertext: ProfileKeyCiphertext, uuid: ZKGUuid) throws -> ProfileKey {
var newContents: [UInt8] = Array(repeating: 0, count: ProfileKey.SIZE)

let ffi_return = FFI_GroupSecretParams_decryptProfileKey(groupSecretParams.getInternalContentsForFFI(), UInt64(groupSecretParams.getInternalContentsForFFI().count), profileKeyCiphertext.getInternalContentsForFFI(), UInt64(profileKeyCiphertext.getInternalContentsForFFI().count), uuid.getInternalContentsForFFI(), UInt64(uuid.getInternalContentsForFFI().count), &newContents, UInt64(newContents.count))
let ffi_return = FFI_GroupSecretParams_decryptProfileKey(groupSecretParams.getInternalContentsForFFI(), UInt32(groupSecretParams.getInternalContentsForFFI().count), profileKeyCiphertext.getInternalContentsForFFI(), UInt32(profileKeyCiphertext.getInternalContentsForFFI().count), uuid.getInternalContentsForFFI(), UInt32(uuid.getInternalContentsForFFI().count), &newContents, UInt32(newContents.count))
if (ffi_return == Native.FFI_RETURN_INPUT_ERROR) {
throw ZkGroupException.VerificationFailed
}
Expand Down Expand Up @@ -108,7 +108,7 @@ public class ClientZkGroupCipher {
public func encryptBlob(randomness: [UInt8], plaintext: [UInt8]) throws -> [UInt8] {
var newContents: [UInt8] = Array(repeating: 0, count: Int(plaintext.count+28))

let ffi_return = FFI_GroupSecretParams_encryptBlobDeterministic(groupSecretParams.getInternalContentsForFFI(), UInt64(groupSecretParams.getInternalContentsForFFI().count), randomness, UInt64(randomness.count), plaintext, UInt64(plaintext.count), &newContents, UInt64(newContents.count))
let ffi_return = FFI_GroupSecretParams_encryptBlobDeterministic(groupSecretParams.getInternalContentsForFFI(), UInt32(groupSecretParams.getInternalContentsForFFI().count), randomness, UInt32(randomness.count), plaintext, UInt32(plaintext.count), &newContents, UInt32(newContents.count))
if (ffi_return == Native.FFI_RETURN_INPUT_ERROR) {
throw ZkGroupException.VerificationFailed
}
Expand All @@ -123,7 +123,7 @@ public class ClientZkGroupCipher {
public func decryptBlob(blobCiphertext: [UInt8]) throws -> [UInt8] {
var newContents: [UInt8] = Array(repeating: 0, count: Int(blobCiphertext.count-28))

let ffi_return = FFI_GroupSecretParams_decryptBlob(groupSecretParams.getInternalContentsForFFI(), UInt64(groupSecretParams.getInternalContentsForFFI().count), blobCiphertext, UInt64(blobCiphertext.count), &newContents, UInt64(newContents.count))
let ffi_return = FFI_GroupSecretParams_decryptBlob(groupSecretParams.getInternalContentsForFFI(), UInt32(groupSecretParams.getInternalContentsForFFI().count), blobCiphertext, UInt32(blobCiphertext.count), &newContents, UInt32(newContents.count))
if (ffi_return == Native.FFI_RETURN_INPUT_ERROR) {
throw ZkGroupException.VerificationFailed
}
Expand Down
6 changes: 3 additions & 3 deletions ZKGroup/ZKGroup/ClientZkProfileOperations.swift
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public class ClientZkProfileOperations {
public func createProfileKeyCredentialRequestContext(randomness: [UInt8], uuid: ZKGUuid, profileKey: ProfileKey) throws -> ProfileKeyCredentialRequestContext {
var newContents: [UInt8] = Array(repeating: 0, count: ProfileKeyCredentialRequestContext.SIZE)

let ffi_return = FFI_ServerPublicParams_createProfileKeyCredentialRequestContextDeterministic(serverPublicParams.getInternalContentsForFFI(), UInt64(serverPublicParams.getInternalContentsForFFI().count), randomness, UInt64(randomness.count), uuid.getInternalContentsForFFI(), UInt64(uuid.getInternalContentsForFFI().count), profileKey.getInternalContentsForFFI(), UInt64(profileKey.getInternalContentsForFFI().count), &newContents, UInt64(newContents.count))
let ffi_return = FFI_ServerPublicParams_createProfileKeyCredentialRequestContextDeterministic(serverPublicParams.getInternalContentsForFFI(), UInt32(serverPublicParams.getInternalContentsForFFI().count), randomness, UInt32(randomness.count), uuid.getInternalContentsForFFI(), UInt32(uuid.getInternalContentsForFFI().count), profileKey.getInternalContentsForFFI(), UInt32(profileKey.getInternalContentsForFFI().count), &newContents, UInt32(newContents.count))

if (ffi_return != Native.FFI_RETURN_OK) {
throw ZkGroupException.ZkGroupError
Expand All @@ -41,7 +41,7 @@ public class ClientZkProfileOperations {
public func receiveProfileKeyCredential(profileKeyCredentialRequestContext: ProfileKeyCredentialRequestContext, profileKeyCredentialResponse: ProfileKeyCredentialResponse) throws -> ProfileKeyCredential {
var newContents: [UInt8] = Array(repeating: 0, count: ProfileKeyCredential.SIZE)

let ffi_return = FFI_ServerPublicParams_receiveProfileKeyCredential(serverPublicParams.getInternalContentsForFFI(), UInt64(serverPublicParams.getInternalContentsForFFI().count), profileKeyCredentialRequestContext.getInternalContentsForFFI(), UInt64(profileKeyCredentialRequestContext.getInternalContentsForFFI().count), profileKeyCredentialResponse.getInternalContentsForFFI(), UInt64(profileKeyCredentialResponse.getInternalContentsForFFI().count), &newContents, UInt64(newContents.count))
let ffi_return = FFI_ServerPublicParams_receiveProfileKeyCredential(serverPublicParams.getInternalContentsForFFI(), UInt32(serverPublicParams.getInternalContentsForFFI().count), profileKeyCredentialRequestContext.getInternalContentsForFFI(), UInt32(profileKeyCredentialRequestContext.getInternalContentsForFFI().count), profileKeyCredentialResponse.getInternalContentsForFFI(), UInt32(profileKeyCredentialResponse.getInternalContentsForFFI().count), &newContents, UInt32(newContents.count))
if (ffi_return == Native.FFI_RETURN_INPUT_ERROR) {
throw ZkGroupException.VerificationFailed
}
Expand Down Expand Up @@ -71,7 +71,7 @@ public class ClientZkProfileOperations {
public func createProfileKeyCredentialPresentation(randomness: [UInt8], groupSecretParams: GroupSecretParams, profileKeyCredential: ProfileKeyCredential) throws -> ProfileKeyCredentialPresentation {
var newContents: [UInt8] = Array(repeating: 0, count: ProfileKeyCredentialPresentation.SIZE)

let ffi_return = FFI_ServerPublicParams_createProfileKeyCredentialPresentationDeterministic(serverPublicParams.getInternalContentsForFFI(), UInt64(serverPublicParams.getInternalContentsForFFI().count), randomness, UInt64(randomness.count), groupSecretParams.getInternalContentsForFFI(), UInt64(groupSecretParams.getInternalContentsForFFI().count), profileKeyCredential.getInternalContentsForFFI(), UInt64(profileKeyCredential.getInternalContentsForFFI().count), &newContents, UInt64(newContents.count))
let ffi_return = FFI_ServerPublicParams_createProfileKeyCredentialPresentationDeterministic(serverPublicParams.getInternalContentsForFFI(), UInt32(serverPublicParams.getInternalContentsForFFI().count), randomness, UInt32(randomness.count), groupSecretParams.getInternalContentsForFFI(), UInt32(groupSecretParams.getInternalContentsForFFI().count), profileKeyCredential.getInternalContentsForFFI(), UInt32(profileKeyCredential.getInternalContentsForFFI().count), &newContents, UInt32(newContents.count))

if (ffi_return != Native.FFI_RETURN_OK) {
throw ZkGroupException.ZkGroupError
Expand Down
Loading

0 comments on commit b8d2f9f

Please sign in to comment.