From 269297716860473300a6a97ece7bf22b29bc935f Mon Sep 17 00:00:00 2001
From: Michael Kirk <michael.code@endoftheworl.de>
Date: Wed, 7 Jun 2017 10:15:53 -0400
Subject: [PATCH] [SSK] New identity manager

// FREEBIE
---
 Podfile      |  8 ++++----
 Podfile.lock | 16 +++++++++++-----
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/Podfile b/Podfile
index 4de5fa3a0..55d7dcd08 100644
--- a/Podfile
+++ b/Podfile
@@ -3,10 +3,10 @@ source 'https://github.com/CocoaPods/Specs.git'
 
 target 'Signal' do
     pod 'SocketRocket',               :git => 'https://github.com/facebook/SocketRocket.git'
-    #pod 'AxolotlKit',                 git: 'https://github.com/WhisperSystems/SignalProtocolKit.git'
-    pod 'AxolotlKit',                 path: '../SignalProtocolKit'
-    #pod 'SignalServiceKit',           git: 'https://github.com/WhisperSystems/SignalServiceKit.git'
-    pod 'SignalServiceKit',           path: '../SignalServiceKit'
+    pod 'AxolotlKit',                 git: 'https://github.com/WhisperSystems/SignalProtocolKit.git'
+    #pod 'AxolotlKit',                 path: '../SignalProtocolKit'
+    pod 'SignalServiceKit',           git: 'https://github.com/WhisperSystems/SignalServiceKit.git'
+    #pod 'SignalServiceKit',           path: '../SignalServiceKit'
     pod 'OpenSSL'
     pod 'JSQMessagesViewController',  git: 'https://github.com/WhisperSystems/JSQMessagesViewController.git', branch: 'mkirk/position-edit-menu'
     #pod 'JSQMessagesViewController'   path: '../JSQMessagesViewController'
diff --git a/Podfile.lock b/Podfile.lock
index e4127585b..e421ac97e 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -109,29 +109,35 @@ PODS:
     - YapDatabase/SQLCipher/Core
 
 DEPENDENCIES:
-  - AxolotlKit (from `../SignalProtocolKit`)
+  - AxolotlKit (from `https://github.com/WhisperSystems/SignalProtocolKit.git`)
   - JSQMessagesViewController (from `https://github.com/WhisperSystems/JSQMessagesViewController.git`, branch `mkirk/position-edit-menu`)
   - OpenSSL
   - PureLayout
   - Reachability
-  - SignalServiceKit (from `../SignalServiceKit`)
+  - SignalServiceKit (from `https://github.com/WhisperSystems/SignalServiceKit.git`)
   - SocketRocket (from `https://github.com/facebook/SocketRocket.git`)
 
 EXTERNAL SOURCES:
   AxolotlKit:
-    :path: ../SignalProtocolKit
+    :git: https://github.com/WhisperSystems/SignalProtocolKit.git
   JSQMessagesViewController:
     :branch: mkirk/position-edit-menu
     :git: https://github.com/WhisperSystems/JSQMessagesViewController.git
   SignalServiceKit:
-    :path: ../SignalServiceKit
+    :git: https://github.com/WhisperSystems/SignalServiceKit.git
   SocketRocket:
     :git: https://github.com/facebook/SocketRocket.git
 
 CHECKOUT OPTIONS:
+  AxolotlKit:
+    :commit: 9179d4e326df58185f35af45831e7a5d7250ab85
+    :git: https://github.com/WhisperSystems/SignalProtocolKit.git
   JSQMessagesViewController:
     :commit: 7054e4b13ee5bcd6d524adb6dc9a726e8c466308
     :git: https://github.com/WhisperSystems/JSQMessagesViewController.git
+  SignalServiceKit:
+    :commit: d475c58348a0a8c4ed9b0fcdbe352cd87e8ce269
+    :git: https://github.com/WhisperSystems/SignalServiceKit.git
   SocketRocket:
     :commit: 877ac7438be3ad0b45ef5ca3969574e4b97112bf
     :git: https://github.com/facebook/SocketRocket.git
@@ -158,6 +164,6 @@ SPEC CHECKSUMS:
   UnionFind: c33be5adb12983981d6e827ea94fc7f9e370f52d
   YapDatabase: cd911121580ff16675f65ad742a9eb0ab4d9e266
 
-PODFILE CHECKSUM: dc5ed308ade575a81ccadf5c485990530353c4ee
+PODFILE CHECKSUM: 48e80d7f1e049bbf544a689fdfdf33e8196c640a
 
 COCOAPODS: 1.2.1