Skip to content
This repository has been archived by the owner on Mar 5, 2021. It is now read-only.

Commit

Permalink
Clean
Browse files Browse the repository at this point in the history
  • Loading branch information
@nielsandriesse
nielsandriesse committed Feb 3, 2020
1 parent 2c53db7 commit 68cdcb1
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 11 deletions.
18 changes: 12 additions & 6 deletions Pods.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4040,12 +4040,10 @@
7B78468425550A60EE166E6B8AEE0B11 /* YapDatabaseViewChange.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = YapDatabaseViewChange.h; path = YapDatabase/Extensions/View/Utilities/YapDatabaseViewChange.h; sourceTree = "<group>"; };
7B8E856EC2F9A34AFABA6856E8478B19 /* NVActivityIndicatorAnimationBallRotateChase.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = NVActivityIndicatorAnimationBallRotateChase.swift; path = Source/NVActivityIndicatorView/Animations/NVActivityIndicatorAnimationBallRotateChase.swift; sourceTree = "<group>"; };
7BC2D0573F3D2FFBF57D032AB589649D /* SyndicationNamespace.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SyndicationNamespace.swift; path = Sources/FeedKit/Models/Namespaces/Syndication/SyndicationNamespace.swift; sourceTree = "<group>"; };
7BD4836923E0FD7A0007F1BA /* LKGroupUtilities.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LKGroupUtilities.m; sourceTree = "<group>"; };
7BD4836A23E0FD7A0007F1BA /* LKGroupUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LKGroupUtilities.h; sourceTree = "<group>"; };
7BD4836D23E0FECA0007F1BA /* LKSessionRequestMessage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LKSessionRequestMessage.m; sourceTree = "<group>"; };
7BD4836E23E0FECA0007F1BA /* LKSessionRequestMessage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LKSessionRequestMessage.h; sourceTree = "<group>"; };
7BD4838623E2A1740007F1BA /* FallbackSessionCipher.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = FallbackSessionCipher.swift; path = SignalMetadataKit/src/FallbackSessionCipher.swift; sourceTree = "<group>"; };
7BD4838723E2A1740007F1BA /* DiffieHellman.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = DiffieHellman.swift; path = SignalMetadataKit/src/DiffieHellman.swift; sourceTree = "<group>"; };
7BD4838623E2A1740007F1BA /* FallbackSessionCipher.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FallbackSessionCipher.swift; sourceTree = "<group>"; };
7BD4838723E2A1740007F1BA /* DiffieHellman.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DiffieHellman.swift; sourceTree = "<group>"; };
7BD4838E23E3B39D0007F1BA /* LokiFriendRequestMessage.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = LokiFriendRequestMessage.h; path = AxolotlKit/Classes/CipherMessage/LokiFriendRequestMessage.h; sourceTree = "<group>"; };
7BD4838F23E3B39D0007F1BA /* LokiFriendRequestMessage.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = LokiFriendRequestMessage.m; path = AxolotlKit/Classes/CipherMessage/LokiFriendRequestMessage.m; sourceTree = "<group>"; };
7BDC536E8C3A0398A5B80E40B44D7D60 /* OWSAttachmentDownloads.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = OWSAttachmentDownloads.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -5738,8 +5736,7 @@
13036EACEC510F0170A65B495596FEF8 /* SignalMetadataKit */ = {
isa = PBXGroup;
children = (
7BD4838723E2A1740007F1BA /* DiffieHellman.swift */,
7BD4838623E2A1740007F1BA /* FallbackSessionCipher.swift */,
B8E0BA5223E8DF6500A60168 /* Loki */,
FE057F396BEF9C563941FA95CBF10B5A /* ECPrivateKey.swift */,
BEF3E023E39D7061D467BC7D198A548E /* ECPublicKey.swift */,
72174990EDC07CF015EDCEE4355BAD9E /* NSData+messagePadding.h */,
Expand Down Expand Up @@ -7840,6 +7837,15 @@
name = SQLCipher;
sourceTree = "<group>";
};
B8E0BA5223E8DF6500A60168 /* Loki */ = {
isa = PBXGroup;
children = (
7BD4838723E2A1740007F1BA /* DiffieHellman.swift */,
7BD4838623E2A1740007F1BA /* FallbackSessionCipher.swift */,
);
path = Loki;
sourceTree = "<group>";
};
B938F01F6E17B0F95D94CA4535CE5243 /* Resources */ = {
isa = PBXGroup;
children = (
Expand Down
0 ...SignalMetadataKit/src/DiffieHellman.swift → SignalMetadataKit/Loki/DiffieHellman.swift
View file
File renamed without changes.
5 changes: 2 additions & 3 deletions ...tadataKit/src/FallbackSessionCipher.swift → ...adataKit/Loki/FallbackSessionCipher.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,10 @@ private extension String {
}
}

/// A fallback session cipher which uses the the recipients public key to encrypt data
/// A fallback session cipher which uses the the recipient's public key to encrypt data.
@objc public final class FallBackSessionCipherMeta : NSObject {
// The pubkey hex string of the recipient
/// The hex encoded public key of the recipient.
private let recipientId: String
// The private key
private let privateKey: Data?

// The length of the iv
Expand Down
2 changes: 0 additions & 2 deletions SignalMetadataKit/SignalMetadataKit/src/SMKSecretSessionCipher.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,15 +173,13 @@ public class SMKDecryptResult: NSObject {
let cipher = FallBackSessionCipherMeta(recipientId: recipientId, privateKey: privateKey)
encryptedMessage = LokiFriendRequestMessage.init(_throws_with: cipher.encrypt(message: paddedPlaintext)!)
} else {
// CiphertextMessage message = new SessionCipher(signalProtocolStore, destinationAddress).encrypt(paddedPlaintext);
let cipher = SessionCipher(sessionStore: sessionStore,
preKeyStore: preKeyStore,
signedPreKeyStore: signedPreKeyStore,
identityKeyStore: identityStore,
recipientId: recipientId,
deviceId: deviceId)

// CiphertextMessage message = new SessionCipher(signalProtocolStore, destinationAddress).encrypt(paddedPlaintext);
encryptedMessage = try cipher.encryptMessage(paddedPlaintext, protocolContext: protocolContext)
}

Expand Down

0 comments on commit 68cdcb1

Please sign in to comment.