Changed PGP backend from ObjectivePGP to GopenPGP

Podfile

@@ -2,7 +2,6 @@ platform :ios, '10.2'
 use_frameworks!
 
 target 'passKit' do
-    pod 'ObjectivePGP', :git => 'https://github.com/krzyzanowskim/ObjectivePGP.git', :tag => '0.14.0'
     target 'pass' do
         inherit! :search_paths
     end

go/dist/Gopenpgpwrapper.framework/Headers/Gopenpgpwrapper.h

@@ -0,0 +1,13 @@
+
+// Objective-C API for talking to the following Go packages
+//
+//	github.com/ZortacDev/GopenPGPWrapper/go/gopenpgpwrapper
+//
+// File is generated by gomobile bind. Do not edit.
+#ifndef __Gopenpgpwrapper_FRAMEWORK_H__
+#define __Gopenpgpwrapper_FRAMEWORK_H__
+
+#include "Gopenpgpwrapper.objc.h"
+#include "Universe.objc.h"
+
+#endif

go/dist/Gopenpgpwrapper.framework/Headers/Gopenpgpwrapper.objc.h

@@ -0,0 +1,29 @@
+// Objective-C API for talking to github.com/ZortacDev/GopenPGPWrapper/go/gopenpgpwrapper Go package.
+//   gobind -lang=objc github.com/ZortacDev/GopenPGPWrapper/go/gopenpgpwrapper
+//
+// File is generated by gobind. Do not edit.
+
+#ifndef __Gopenpgpwrapper_H__
+#define __Gopenpgpwrapper_H__
+
+@import Foundation;
+#include "ref.h"
+#include "Universe.objc.h"
+
+
+@class GopenpgpwrapperKey;
+
+@interface GopenpgpwrapperKey : NSObject <goSeqRefInterface> {
+}
+@property(strong, readonly) _Nonnull id _ref;
+
+- (nonnull instancetype)initWithRef:(_Nonnull id)ref;
+- (nonnull instancetype)init;
+- (NSData* _Nullable)decrypt:(NSData* _Nullable)ciphertext passphrase:(NSString* _Nullable)passphrase;
+- (NSData* _Nullable)encrypt:(NSData* _Nullable)plaintext armor:(BOOL)armor;
+- (NSString* _Nonnull)getKeyID;
+@end
+
+FOUNDATION_EXPORT GopenpgpwrapperKey* _Nullable GopenpgpwrapperReadKey(NSData* _Nullable data);
+
+#endif

go/dist/Gopenpgpwrapper.framework/Headers/Universe.objc.h

@@ -0,0 +1,29 @@
+// Objective-C API for talking to  Go package.
+//   gobind -lang=objc 
+//
+// File is generated by gobind. Do not edit.
+
+#ifndef __Universe_H__
+#define __Universe_H__
+
+@import Foundation;
+#include "ref.h"
+
+@protocol Universeerror;
+@class Universeerror;
+
+@protocol Universeerror <NSObject>
+- (NSString* _Nonnull)error;
+@end
+
+@class Universeerror;
+
+@interface Universeerror : NSError <goSeqRefInterface, Universeerror> {
+}
+@property(strong, readonly) _Nonnull id _ref;
+
+- (nonnull instancetype)initWithRef:(_Nonnull id)ref;
+- (NSString* _Nonnull)error;
+@end
+
+#endif

go/dist/Gopenpgpwrapper.framework/Headers/ref.h

@@ -0,0 +1,35 @@
+// Copyright 2015 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+#ifndef __GO_REF_HDR__
+#define __GO_REF_HDR__
+
+#include <Foundation/Foundation.h>
+
+// GoSeqRef is an object tagged with an integer for passing back and
+// forth across the language boundary. A GoSeqRef may represent either
+// an instance of a Go object, or an Objective-C object passed to Go.
+// The explicit allocation of a GoSeqRef is used to pin a Go object
+// when it is passed to Objective-C. The Go seq package maintains a
+// reference to the Go object in a map keyed by the refnum along with
+// a reference count. When the reference count reaches zero, the Go
+// seq package will clear the corresponding entry in the map.
+@interface GoSeqRef : NSObject {
+}
+@property(readonly) int32_t refnum;
+@property(strong) id obj; // NULL when representing a Go object.
+
+// new GoSeqRef object to proxy a Go object. The refnum must be
+// provided from Go side.
+- (instancetype)initWithRefnum:(int32_t)refnum obj:(id)obj;
+
+- (int32_t)incNum;
+
+@end
+
+@protocol goSeqRefInterface
+-(GoSeqRef*) _ref;
+@end
+
+#endif

go/dist/Gopenpgpwrapper.framework/Modules/module.modulemap

@@ -0,0 +1,8 @@
+framework module "Gopenpgpwrapper" {
+	header "ref.h"
+    header "Gopenpgpwrapper.objc.h"
+    header "Universe.objc.h"
+    header "Gopenpgpwrapper.h"
+
+    export *
+}

go/dist/Gopenpgpwrapper.framework/Resources/Info.plist

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+    <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+    <plist version="1.0">
+      <dict>
+      </dict>
+    </plist>

go/dist/Gopenpgpwrapper.framework/Versions/A/Headers/Gopenpgpwrapper.h

@@ -0,0 +1,13 @@
+
+// Objective-C API for talking to the following Go packages
+//
+//	github.com/ZortacDev/GopenPGPWrapper/go/gopenpgpwrapper
+//
+// File is generated by gomobile bind. Do not edit.
+#ifndef __Gopenpgpwrapper_FRAMEWORK_H__
+#define __Gopenpgpwrapper_FRAMEWORK_H__
+
+#include "Gopenpgpwrapper.objc.h"
+#include "Universe.objc.h"
+
+#endif

go/dist/Gopenpgpwrapper.framework/Versions/A/Headers/Gopenpgpwrapper.objc.h

@@ -0,0 +1,29 @@
+// Objective-C API for talking to github.com/ZortacDev/GopenPGPWrapper/go/gopenpgpwrapper Go package.
+//   gobind -lang=objc github.com/ZortacDev/GopenPGPWrapper/go/gopenpgpwrapper
+//
+// File is generated by gobind. Do not edit.
+
+#ifndef __Gopenpgpwrapper_H__
+#define __Gopenpgpwrapper_H__
+
+@import Foundation;
+#include "ref.h"
+#include "Universe.objc.h"
+
+
+@class GopenpgpwrapperKey;
+
+@interface GopenpgpwrapperKey : NSObject <goSeqRefInterface> {
+}
+@property(strong, readonly) _Nonnull id _ref;
+
+- (nonnull instancetype)initWithRef:(_Nonnull id)ref;
+- (nonnull instancetype)init;
+- (NSData* _Nullable)decrypt:(NSData* _Nullable)ciphertext passphrase:(NSString* _Nullable)passphrase;
+- (NSData* _Nullable)encrypt:(NSData* _Nullable)plaintext armor:(BOOL)armor;
+- (NSString* _Nonnull)getKeyID;
+@end
+
+FOUNDATION_EXPORT GopenpgpwrapperKey* _Nullable GopenpgpwrapperReadKey(NSData* _Nullable data);
+
+#endif

go/dist/Gopenpgpwrapper.framework/Versions/A/Headers/Universe.objc.h

@@ -0,0 +1,29 @@
+// Objective-C API for talking to  Go package.
+//   gobind -lang=objc 
+//
+// File is generated by gobind. Do not edit.
+
+#ifndef __Universe_H__
+#define __Universe_H__
+
+@import Foundation;
+#include "ref.h"
+
+@protocol Universeerror;
+@class Universeerror;
+
+@protocol Universeerror <NSObject>
+- (NSString* _Nonnull)error;
+@end
+
+@class Universeerror;
+
+@interface Universeerror : NSError <goSeqRefInterface, Universeerror> {
+}
+@property(strong, readonly) _Nonnull id _ref;
+
+- (nonnull instancetype)initWithRef:(_Nonnull id)ref;
+- (NSString* _Nonnull)error;
+@end
+
+#endif

go/dist/Gopenpgpwrapper.framework/Versions/A/Headers/ref.h

@@ -0,0 +1,35 @@
+// Copyright 2015 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+#ifndef __GO_REF_HDR__
+#define __GO_REF_HDR__
+
+#include <Foundation/Foundation.h>
+
+// GoSeqRef is an object tagged with an integer for passing back and
+// forth across the language boundary. A GoSeqRef may represent either
+// an instance of a Go object, or an Objective-C object passed to Go.
+// The explicit allocation of a GoSeqRef is used to pin a Go object
+// when it is passed to Objective-C. The Go seq package maintains a
+// reference to the Go object in a map keyed by the refnum along with
+// a reference count. When the reference count reaches zero, the Go
+// seq package will clear the corresponding entry in the map.
+@interface GoSeqRef : NSObject {
+}
+@property(readonly) int32_t refnum;
+@property(strong) id obj; // NULL when representing a Go object.
+
+// new GoSeqRef object to proxy a Go object. The refnum must be
+// provided from Go side.
+- (instancetype)initWithRefnum:(int32_t)refnum obj:(id)obj;
+
+- (int32_t)incNum;
+
+@end
+
+@protocol goSeqRefInterface
+-(GoSeqRef*) _ref;
+@end
+
+#endif

go/dist/Gopenpgpwrapper.framework/Versions/A/Modules/module.modulemap

@@ -0,0 +1,8 @@
+framework module "Gopenpgpwrapper" {
+	header "ref.h"
+    header "Gopenpgpwrapper.objc.h"
+    header "Universe.objc.h"
+    header "Gopenpgpwrapper.h"
+
+    export *
+}

go/dist/Gopenpgpwrapper.framework/Versions/A/Resources/Info.plist

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+    <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+    <plist version="1.0">
+      <dict>
+      </dict>
+    </plist>

go/dist/Gopenpgpwrapper.framework/Versions/Current/Headers/Gopenpgpwrapper.h

@@ -0,0 +1,13 @@
+
+// Objective-C API for talking to the following Go packages
+//
+//	github.com/ZortacDev/GopenPGPWrapper/go/gopenpgpwrapper
+//
+// File is generated by gomobile bind. Do not edit.
+#ifndef __Gopenpgpwrapper_FRAMEWORK_H__
+#define __Gopenpgpwrapper_FRAMEWORK_H__
+
+#include "Gopenpgpwrapper.objc.h"
+#include "Universe.objc.h"
+
+#endif

go/dist/Gopenpgpwrapper.framework/Versions/Current/Headers/Gopenpgpwrapper.objc.h

@@ -0,0 +1,29 @@
+// Objective-C API for talking to github.com/ZortacDev/GopenPGPWrapper/go/gopenpgpwrapper Go package.
+//   gobind -lang=objc github.com/ZortacDev/GopenPGPWrapper/go/gopenpgpwrapper
+//
+// File is generated by gobind. Do not edit.
+
+#ifndef __Gopenpgpwrapper_H__
+#define __Gopenpgpwrapper_H__
+
+@import Foundation;
+#include "ref.h"
+#include "Universe.objc.h"
+
+
+@class GopenpgpwrapperKey;
+
+@interface GopenpgpwrapperKey : NSObject <goSeqRefInterface> {
+}
+@property(strong, readonly) _Nonnull id _ref;
+
+- (nonnull instancetype)initWithRef:(_Nonnull id)ref;
+- (nonnull instancetype)init;
+- (NSData* _Nullable)decrypt:(NSData* _Nullable)ciphertext passphrase:(NSString* _Nullable)passphrase;
+- (NSData* _Nullable)encrypt:(NSData* _Nullable)plaintext armor:(BOOL)armor;
+- (NSString* _Nonnull)getKeyID;
+@end
+
+FOUNDATION_EXPORT GopenpgpwrapperKey* _Nullable GopenpgpwrapperReadKey(NSData* _Nullable data);
+
+#endif

go/dist/Gopenpgpwrapper.framework/Versions/Current/Headers/Universe.objc.h

@@ -0,0 +1,29 @@
+// Objective-C API for talking to  Go package.
+//   gobind -lang=objc 
+//
+// File is generated by gobind. Do not edit.
+
+#ifndef __Universe_H__
+#define __Universe_H__
+
+@import Foundation;
+#include "ref.h"
+
+@protocol Universeerror;
+@class Universeerror;
+
+@protocol Universeerror <NSObject>
+- (NSString* _Nonnull)error;
+@end
+
+@class Universeerror;
+
+@interface Universeerror : NSError <goSeqRefInterface, Universeerror> {
+}
+@property(strong, readonly) _Nonnull id _ref;
+
+- (nonnull instancetype)initWithRef:(_Nonnull id)ref;
+- (NSString* _Nonnull)error;
+@end
+
+#endif

go/dist/Gopenpgpwrapper.framework/Versions/Current/Headers/ref.h

@@ -0,0 +1,35 @@
+// Copyright 2015 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+#ifndef __GO_REF_HDR__
+#define __GO_REF_HDR__
+
+#include <Foundation/Foundation.h>
+
+// GoSeqRef is an object tagged with an integer for passing back and
+// forth across the language boundary. A GoSeqRef may represent either
+// an instance of a Go object, or an Objective-C object passed to Go.
+// The explicit allocation of a GoSeqRef is used to pin a Go object
+// when it is passed to Objective-C. The Go seq package maintains a
+// reference to the Go object in a map keyed by the refnum along with
+// a reference count. When the reference count reaches zero, the Go
+// seq package will clear the corresponding entry in the map.
+@interface GoSeqRef : NSObject {
+}
+@property(readonly) int32_t refnum;
+@property(strong) id obj; // NULL when representing a Go object.
+
+// new GoSeqRef object to proxy a Go object. The refnum must be
+// provided from Go side.
+- (instancetype)initWithRefnum:(int32_t)refnum obj:(id)obj;
+
+- (int32_t)incNum;
+
+@end
+
+@protocol goSeqRefInterface
+-(GoSeqRef*) _ref;
+@end
+
+#endif

go/dist/Gopenpgpwrapper.framework/Versions/Current/Modules/module.modulemap

@@ -0,0 +1,8 @@
+framework module "Gopenpgpwrapper" {
+	header "ref.h"
+    header "Gopenpgpwrapper.objc.h"
+    header "Universe.objc.h"
+    header "Gopenpgpwrapper.h"
+
+    export *
+}

go/dist/Gopenpgpwrapper.framework/Versions/Current/Resources/Info.plist

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+    <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+    <plist version="1.0">
+      <dict>
+      </dict>
+    </plist>

go/src/gopenpgpwrapper.go

@@ -0,0 +1,84 @@
+package gopenpgpwrapper // import "gopenpgpwrapper"
+
+import (
+    "bytes"
+    "io"
+    "io/ioutil"
+
+    "github.com/ProtonMail/gopenpgp/crypto"
+    "github.com/ProtonMail/gopenpgp/armor"
+)
+
+type Key struct {
+    kr crypto.KeyRing
+}
+
+func (k *Key) GetKeyID() string {
+    return k.kr.FirstKeyID
+}
+
+func (k *Key) Encrypt(plaintext []byte, armor bool) []byte {
+    var b bytes.Buffer
+    var w io.WriteCloser
+    if armor {
+        wr, err := k.kr.EncryptArmored(&b, nil)
+        if err != nil {
+            return nil
+        }
+        w = wr
+    } else {
+        wr, err := k.kr.Encrypt(&b, nil, "", false)
+        if err != nil {
+            return nil
+        }
+        
+        w = wr
+    }
+
+    if _, err := w.Write(plaintext); err != nil {
+        return nil
+    }
+
+    if err := w.Close(); err != nil {
+        return nil
+    }
+
+    return b.Bytes()
+}
+
+func (k Key) Decrypt(ciphertext []byte, passphrase string) []byte {
+    unarmored, err := armor.Unarmor(string(ciphertext))
+    if err != nil {
+        // Assume ciphertext is already in binary format
+        unarmored = ciphertext
+    }
+    
+    err = k.kr.Unlock([]byte(passphrase))
+    if err != nil {
+        return nil
+    }
+    
+    r, _, err := k.kr.Decrypt(bytes.NewReader(unarmored))
+    if err != nil {
+        return nil
+    }
+    
+    if b, err := ioutil.ReadAll(r); err != nil {
+        return nil
+    } else {
+        return b
+    }
+}
+
+func ReadKey(data []byte) *Key {
+    kr, err := crypto.ReadArmoredKeyRing(bytes.NewReader(data))
+    if err != nil {
+        // Assume keyring is in binary form
+        kr, err = crypto.ReadKeyRing(bytes.NewReader(data))
+        if err != nil {
+            return nil
+        }
+    }
+    
+    return &Key{kr: *kr}
+}

pass.xcodeproj/project.pbxproj

@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		1154BEDD229AC00F00454075 /* Gopenpgpwrapper.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1154BEDB229AC00F00454075 /* Gopenpgpwrapper.framework */; };
 		18F19A67B0C07F13C17169E0 /* Pods_pass.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3A5620D17DF5E86B61761D0E /* Pods_pass.framework */; };
 		23B82F0228254275DBA609E7 /* Pods_passExtension.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B975797E0F0B7476CADD6A7D /* Pods_passExtension.framework */; };
 		300713C52219D54100F553AC /* AutoCellHeightUITableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 300713C42219D54100F553AC /* AutoCellHeightUITableViewController.swift */; };
@@ -207,6 +208,7 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		1154BEDB229AC00F00454075 /* Gopenpgpwrapper.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Gopenpgpwrapper.framework; path = go/dist/Gopenpgpwrapper.framework; sourceTree = "<group>"; };
 		300713C42219D54100F553AC /* AutoCellHeightUITableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AutoCellHeightUITableViewController.swift; sourceTree = "<group>"; };
 		301F6462216162550071A4CE /* AdditionField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdditionField.swift; sourceTree = "<group>"; };
 		301F6467216165290071A4CE /* ConstantsTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConstantsTest.swift; sourceTree = "<group>"; };
@@ -373,6 +375,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				1154BEDD229AC00F00454075 /* Gopenpgpwrapper.framework in Frameworks */,
 				61326CDA7A73757FB68DCB04 /* Pods_passKit.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -413,6 +416,7 @@
 			files = (
 				A239F5902158C07D00576CBF /* AuthenticationServices.framework in Frameworks */,
 				A260758D1EEC6F34005DB03E /* passKit.framework in Frameworks */,
+				1154BEDC229AC00F00454075 /* Gopenpgpwrapper.framework in Frameworks */,
 				DCC408C71E307DBB00F29B0E /* SVProgressHUD.framework in Frameworks */,
 				18F19A67B0C07F13C17169E0 /* Pods_pass.framework in Frameworks */,
 			);
@@ -768,6 +772,7 @@
 				B975797E0F0B7476CADD6A7D /* Pods_passExtension.framework */,
 				DAB3F5541E51ADC8C6B56642 /* Pods_passKit.framework */,
 				CF843B3CF7D55A4070CBA1E4 /* Pods_passKitTests.framework */,
+				1154BEDB229AC00F00454075 /* Gopenpgpwrapper.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -830,7 +835,6 @@
 				A260757C1EEC6F34005DB03E /* Sources */,
 				A260757D1EEC6F34005DB03E /* Frameworks */,
 				A260757E1EEC6F34005DB03E /* Resources */,
-				6AEAED0AF4328940B21EAC44 /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -890,7 +894,6 @@
 				DC917BEC1E2F3659000FDF54 /* Run Script */,
 				A26700191EEC450100176B8A /* Embed App Extensions */,
 				A26075921EEC6F34005DB03E /* Embed Frameworks */,
-				7F5ED3FD24ED627DC957D425 /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -1093,26 +1096,6 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		6AEAED0AF4328940B21EAC44 /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"${SRCROOT}/Pods/Target Support Files/Pods-passKitTests/Pods-passKitTests-frameworks.sh",
-				"${PODS_ROOT}/ObjectivePGP/Frameworks/ios/ObjectivePGP.framework",
-				"${PODS_ROOT}/ObjectivePGP/Frameworks/ios/ObjectivePGP.framework.dSYM",
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputPaths = (
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ObjectivePGP.framework",
-				"${DWARF_DSYM_FOLDER_PATH}/ObjectivePGP.framework.dSYM",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-passKitTests/Pods-passKitTests-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		736C6F64F90A20CB9A00B420 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -1131,26 +1114,6 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		7F5ED3FD24ED627DC957D425 /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"${SRCROOT}/Pods/Target Support Files/Pods-pass/Pods-pass-frameworks.sh",
-				"${PODS_ROOT}/ObjectivePGP/Frameworks/ios/ObjectivePGP.framework",
-				"${PODS_ROOT}/ObjectivePGP/Frameworks/ios/ObjectivePGP.framework.dSYM",
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputPaths = (
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ObjectivePGP.framework",
-				"${DWARF_DSYM_FOLDER_PATH}/ObjectivePGP.framework.dSYM",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-pass/Pods-pass-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		94AA4FCF7FF3474A970BE194 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -1502,7 +1465,10 @@
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				ENABLE_BITCODE = NO;
-				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(PROJECT_DIR)/go/dist",
+				);
 				HEADER_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = passKit/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -1541,7 +1507,10 @@
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				ENABLE_BITCODE = NO;
-				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(PROJECT_DIR)/go/dist",
+				);
 				HEADER_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = passKit/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -1830,7 +1799,10 @@
 				DEFINES_MODULE = NO;
 				DEVELOPMENT_TEAM = 4WDM8E95VU;
 				ENABLE_BITCODE = NO;
-				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(PROJECT_DIR)/go/dist",
+				);
 				HEADER_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = pass/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
@@ -1862,7 +1834,10 @@
 				DEFINES_MODULE = NO;
 				DEVELOPMENT_TEAM = 4WDM8E95VU;
 				ENABLE_BITCODE = NO;
-				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(PROJECT_DIR)/go/dist",
+				);
 				HEADER_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = pass/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";

pass/Controllers/SettingsTableViewController.swift

@@ -38,8 +38,8 @@ class SettingsTableViewController: UITableViewController, UITabBarControllerDele
             SVProgressHUD.show(withStatus: "FetchingPgpKey".localize())
             DispatchQueue.global(qos: .userInitiated).async { [unowned self] in
                 do {
-                    try self.passwordStore.initPGPKey(from: SharedDefaults[.pgpPublicKeyURL]!, keyType: .public)
-                    try self.passwordStore.initPGPKey(from: SharedDefaults[.pgpPrivateKeyURL]!, keyType: .secret)
+                    try self.passwordStore.initPGPKey(from: SharedDefaults[.pgpPublicKeyURL]!, keyType: .PUBLIC)
+                    try self.passwordStore.initPGPKey(from: SharedDefaults[.pgpPrivateKeyURL]!, keyType: .PRIVATE)
                     DispatchQueue.main.async {
                         self.pgpKeyTableViewCell.detailTextLabel?.text = self.passwordStore.pgpKeyID
                         SVProgressHUD.showSuccess(withStatus: "Success".localize())
@@ -68,8 +68,8 @@ class SettingsTableViewController: UITableViewController, UITabBarControllerDele
             SVProgressHUD.show(withStatus: "FetchingPgpKey".localize())
             DispatchQueue.global(qos: .userInitiated).async { [unowned self] in
                 do {
-                    try self.passwordStore.initPGPKey(with: SharedDefaults[.pgpPublicKeyArmor] ?? "", keyType: .public)
-                    try self.passwordStore.initPGPKey(with: SharedDefaults[.pgpPrivateKeyArmor] ?? "", keyType: .secret)
+                    try self.passwordStore.initPGPKey(with: SharedDefaults[.pgpPublicKeyArmor] ?? "", keyType: .PUBLIC)
+                    try self.passwordStore.initPGPKey(with: SharedDefaults[.pgpPrivateKeyArmor] ?? "", keyType: .PRIVATE)
                     DispatchQueue.main.async {
                         self.pgpKeyTableViewCell.detailTextLabel?.text = self.passwordStore.pgpKeyID
                         SVProgressHUD.showSuccess(withStatus: "Success".localize())

pass/Helpers/Objective-CBridgingHeader.h

@@ -9,7 +9,6 @@
 #ifndef Objective_CBridgingHeader_h
 #define Objective_CBridgingHeader_h
 
-#import "ObjectivePGP/ObjectivePGP.h"
 #import "ObjectiveGit/ObjectiveGit.h"
 
 #endif /* Objective_CBridgingHeader_h */

passKit/Models/PasswordStore.swift

@@ -11,8 +11,8 @@ import CoreData
 import UIKit
 import SwiftyUserDefaults
 import ObjectiveGit
-import ObjectivePGP
 import KeychainAccess
+import Gopenpgpwrapper
 
 public class PasswordStore {
     public static let shared = PasswordStore()
@@ -28,12 +28,19 @@ public class PasswordStore {
     
     public var storeRepository: GTRepository?
     public var pgpKeyID: String?
-    public var publicKey: Key? {
+    public var publicKey: GopenpgpwrapperKey? {
         didSet {
-            pgpKeyID = publicKey?.keyID.shortIdentifier
+            if publicKey != nil {
+                pgpKeyID = publicKey!.getID()
+            } else {
+                pgpKeyID = nil
+            }
         }
     }
-    public var privateKey: Key?
+    public var privateKey: GopenpgpwrapperKey?
+    public enum PGPKeyType {
+        case PUBLIC, PRIVATE
+    }
     
     public var gitSignatureForNow: GTSignature {
         get {
@@ -43,8 +50,6 @@ public class PasswordStore {
         }
     }
     
-    public let keyring = ObjectivePGP.defaultKeyring
-
     public var pgpKeyPassphrase: String? {
         set {
             Utils.addPasswordToKeychain(name: "pgpKeyPassphrase", password: newValue)
@@ -109,7 +114,7 @@ public class PasswordStore {
     }
     
     public var numberOfLocalCommits: Int? {
-        return (try? getLocalCommits())?.count
+        return (try? getLocalCommits())?.flatMap { $0.count }
     }
     
     public var lastSyncedTime: Date? {
@@ -121,6 +126,10 @@ public class PasswordStore {
     }
     
     private init() {
+        // File migration to group
+        migrateIfNeeded()
+        backwardCompatibility()
+        
         do {
             if fm.fileExists(atPath: storeURL.path) {
                 try storeRepository = GTRepository.init(url: storeURL)
@@ -131,6 +140,52 @@ public class PasswordStore {
         }
     }
     
+    private func migrateIfNeeded() {
+        // migrate happens only if the repository was cloned and pgp keys were set up using earlier versions
+        let needMigration = !pgpKeyExists() && !gitSSHKeyExists() && !fm.fileExists(atPath: Globals.repositoryPath) && fm.fileExists(atPath: Globals.repositoryPathLegacy)
+        guard needMigration == true else {
+            return
+        }
+        
+        do {
+            // migrate Defaults
+            let userDefaults = UserDefaults()
+            for key in Defaults.dictionaryRepresentation().keys {
+                if SharedDefaults.value(forKey: key) == nil {
+                    SharedDefaults.setValue(userDefaults.value(forKey: key), forKey: key)
+                }
+            }
+            
+            // migrate files
+            try fm.createDirectory(atPath: Globals.documentPath, withIntermediateDirectories: true, attributes: nil)
+            try fm.createDirectory(atPath: Globals.libraryPath, withIntermediateDirectories: true, attributes: nil)
+            if fm.fileExists(atPath: Globals.pgpPublicKeyPathLegacy) {
+                try fm.moveItem(atPath: Globals.pgpPublicKeyPathLegacy, toPath: Globals.pgpPublicKeyPath)
+            }
+            if fm.fileExists(atPath: Globals.pgpPrivateKeyPathLegacy) {
+                try fm.moveItem(atPath: Globals.pgpPrivateKeyPathLegacy, toPath: Globals.pgpPrivateKeyPath)
+            }
+            if fm.fileExists(atPath: Globals.gitSSHPrivateKeyPathLegacy) {
+                try fm.moveItem(atPath: Globals.gitSSHPrivateKeyPathLegacy, toPath: Globals.gitSSHPrivateKeyPath)
+            }
+            try fm.moveItem(atPath: Globals.repositoryPathLegacy, toPath: Globals.repositoryPath)
+        } catch {
+            print("MigrationError".localize(error))
+        }
+        updatePasswordEntityCoreData()
+    }
+    
+    private func backwardCompatibility() {
+        // For the newly-introduced isRememberGitCredentialPassphraseOn (20171008)
+        if (self.gitPassword != nil || self.gitSSHPrivateKeyPassphrase != nil) && SharedDefaults[.isRememberGitCredentialPassphraseOn] == false {
+            SharedDefaults[.isRememberGitCredentialPassphraseOn] = true
+        }
+        // For the renamed isRememberPGPPassphraseOn (20171008)
+        if self.pgpKeyPassphrase != nil && SharedDefaults[.isRememberPGPPassphraseOn] == false {
+            SharedDefaults[.isRememberPGPPassphraseOn] = true
+        }
+    }
+    
     enum SSHKeyType {
         case `public`, secret
     }
@@ -141,19 +196,19 @@ public class PasswordStore {
     }
     
     public func initPGPKeys() throws {
-        try initPGPKey(.public)
-        try initPGPKey(.secret)
+        try initPGPKey(.PUBLIC)
+        try initPGPKey(.PRIVATE)
     }
     
     public func initPGPKey(_ keyType: PGPKeyType) throws {
         switch keyType {
-        case .public:
+        case .PUBLIC:
             let keyPath = Globals.pgpPublicKeyPath
             self.publicKey = importKey(from: keyPath)
             if self.publicKey == nil {
                 throw AppError.KeyImport
             }
-        case .secret:
+        case .PRIVATE:
             let keyPath = Globals.pgpPrivateKeyPath
             self.privateKey = importKey(from: keyPath)
             if self.privateKey == nil  {
@@ -166,7 +221,7 @@ public class PasswordStore {
     
     public func initPGPKey(from url: URL, keyType: PGPKeyType) throws {
         var pgpKeyLocalPath = ""
-        if keyType == .public {
+        if keyType == .PUBLIC {
             pgpKeyLocalPath = Globals.pgpPublicKeyPath
         } else {
             pgpKeyLocalPath = Globals.pgpPrivateKeyPath
@@ -178,7 +233,7 @@ public class PasswordStore {
     
     public func initPGPKey(with armorKey: String, keyType: PGPKeyType) throws {
         var pgpKeyLocalPath = ""
-        if keyType == .public {
+        if keyType == .PUBLIC {
             pgpKeyLocalPath = Globals.pgpPublicKeyPath
         } else {
             pgpKeyLocalPath = Globals.pgpPrivateKeyPath
@@ -188,20 +243,13 @@ public class PasswordStore {
     }
     
     
-    private func importKey(from keyPath: String) -> Key? {
+    private func importKey(from keyPath: String) -> GopenpgpwrapperKey? {
         if fm.fileExists(atPath: keyPath) {
-            let keys = try! ObjectivePGP.readKeys(fromPath: keyPath)
-            keyring.import(keys: keys)
-            if !keys.isEmpty {
-                return keys.first
-            }
+            return GopenpgpwrapperReadKey(fm.contents(atPath: keyPath))
         }
         return nil
     }
     
-    public func getPgpPrivateKey() -> Key {
-        return keyring.keys.filter({$0.secretKey != nil})[0]
-    }
     
     public func repositoryExisted() -> Bool {
         let fm = FileManager()
@@ -221,6 +269,7 @@ public class PasswordStore {
         } catch {
             fatalError("FailedToFetchPasswordEntities".localize(error))
         }
+        return true
     }
     
     public func passwordEntityExisted(path: String) -> Bool {
@@ -236,6 +285,7 @@ public class PasswordStore {
         } catch {
             fatalError("FailedToFetchPasswordEntities".localize(error))
         }
+        return true
     }
     
     public func getPasswordEntity(by path: String, isDir: Bool) -> PasswordEntity? {
@@ -249,11 +299,11 @@ public class PasswordStore {
     }
     
     public func cloneRepository(remoteRepoURL: URL,
-                         credential: GitCredential,
-                         branchName: String,
-                         requestGitPassword: @escaping (GitCredential.Credential, String?) -> String?,
-                         transferProgressBlock: @escaping (UnsafePointer<git_transfer_progress>, UnsafeMutablePointer<ObjCBool>) -> Void,
-                         checkoutProgressBlock: @escaping (String?, UInt, UInt) -> Void) throws {
+                                credential: GitCredential,
+                                branchName: String,
+                                requestGitPassword: @escaping (GitCredential.Credential, String?) -> String?,
+                                transferProgressBlock: @escaping (UnsafePointer<git_transfer_progress>, UnsafeMutablePointer<ObjCBool>) -> Void,
+                                checkoutProgressBlock: @escaping (String?, UInt, UInt) -> Void) throws {
         try? fm.removeItem(at: storeURL)
         try? fm.removeItem(at: tempStoreURL)
         self.gitPassword = nil
@@ -323,16 +373,16 @@ public class PasswordStore {
         do {
             var q = try fm.contentsOfDirectory(atPath: self.storeURL.path).filter{
                 !$0.hasPrefix(".")
-            }.map { (filename) -> PasswordEntity in
-                let passwordEntity = NSEntityDescription.insertNewObject(forEntityName: "PasswordEntity", into: context) as! PasswordEntity
-                if filename.hasSuffix(".gpg") {
-                    passwordEntity.name = String(filename.prefix(upTo: filename.index(filename.endIndex, offsetBy: -4)))
-                } else {
-                    passwordEntity.name = filename
-                }
-                passwordEntity.path = filename
-                passwordEntity.parent = nil
-                return passwordEntity
+                }.map { (filename) -> PasswordEntity in
+                    let passwordEntity = NSEntityDescription.insertNewObject(forEntityName: "PasswordEntity", into: context) as! PasswordEntity
+                    if filename.hasSuffix(".gpg") {
+                        passwordEntity.name = String(filename.prefix(upTo: filename.index(filename.endIndex, offsetBy: -4)))
+                    } else {
+                        passwordEntity.name = filename
+                    }
+                    passwordEntity.path = filename
+                    passwordEntity.parent = nil
+                    return passwordEntity
             }
             while q.count > 0 {
                 let e = q.first!
@@ -445,9 +495,9 @@ public class PasswordStore {
         }
         guard let blameHunks = try? storeRepository.blame(withFile: filename, options: nil).hunks,
             let latestCommitTime = blameHunks.map({
-                 $0.finalSignature?.time?.timeIntervalSince1970 ?? 0
+                $0.finalSignature?.time?.timeIntervalSince1970 ?? 0
             }).max() else {
-            return "Unknown".localize()
+                return "Unknown".localize()
         }
         let lastCommitDate = Date(timeIntervalSince1970: latestCommitTime)
         if Date().timeIntervalSince(lastCommitDate) <= 60 {
@@ -640,8 +690,6 @@ public class PasswordStore {
             try deletePasswordEntities(passwordEntity: passwordEntity)
             let _ = try gitCommit(message: "RenamePassword.".localize(deletedFileURL.deletingPathExtension().path.removingPercentEncoding!, password.url.deletingPathExtension().path.removingPercentEncoding!))
         }
-        
-        self.saveUpdated(passwordEntity: newPasswordEntity!)
         NotificationCenter.default.post(name: .passwordStoreUpdated, object: nil)
         return newPasswordEntity
     }
@@ -779,8 +827,8 @@ public class PasswordStore {
         if passphrase == nil {
             passphrase = requestPGPKeyPassphrase()
         }
-        let decryptedData = try ObjectivePGP.decrypt(encryptedData, andVerifySignature: false, using: keyring.keys, passphraseForKey: {(_) in passphrase})
-        let plainText = String(data: decryptedData, encoding: .utf8) ?? ""
+        let decryptedData = privateKey?.decrypt(encryptedData, passphrase: passphrase)
+        let plainText = String(data: decryptedData!, encoding: .utf8) ?? ""
         guard let url = passwordEntity.getURL() else {
             throw AppError.Decryption
         }
@@ -788,16 +836,13 @@ public class PasswordStore {
     }
     
     public func encrypt(password: Password) throws -> Data {
-        guard keyring.keys.count > 0 else {
+        guard publicKey != nil else {
             throw AppError.PgpPublicKeyNotExist
         }
         let plainData = password.plainData
-        let encryptedData = try ObjectivePGP.encrypt(plainData, addSignature: false, using: keyring.keys, passphraseForKey: nil)
-        if SharedDefaults[.encryptInArmored] {
-            return Armor.armored(encryptedData, as: .message).data(using: .utf8)!
-        } else {
-            return encryptedData
-        }
+        let encryptedData = publicKey?.encrypt(plainData, armor: SharedDefaults[.encryptInArmored])
+        
+        return encryptedData!
     }
     
     public func removePGPKeys() {
@@ -809,7 +854,6 @@ public class PasswordStore {
         SharedDefaults.remove(.pgpPrivateKeyURL)
         SharedDefaults.remove(.pgpPublicKeyURL)
         Utils.removeKeychain(name: ".pgpKeyPassphrase")
-        keyring.deleteAll()
         publicKey = nil
         privateKey = nil
     }
@@ -838,17 +882,10 @@ public class PasswordStore {
     }
     
     public func gitSSHKeyImportFromFileSharing() throws {
-        if gitSSHKeyExists() {
-            try fm.removeItem(atPath: Globals.gitSSHPrivateKeyPath)
-        }
         try fm.moveItem(atPath: Globals.iTunesFileSharingSSHPrivate, toPath: Globals.gitSSHPrivateKeyPath)
     }
     
     public func pgpKeyImportFromFileSharing() throws {
-        if pgpKeyExists() {
-            try fm.removeItem(atPath: Globals.pgpPublicKeyPath)
-            try fm.removeItem(atPath: Globals.pgpPrivateKeyPath)
-        }
         try fm.moveItem(atPath: Globals.iTunesFileSharingPGPPublic, toPath: Globals.pgpPublicKeyPath)
         try fm.moveItem(atPath: Globals.iTunesFileSharingPGPPrivate, toPath: Globals.pgpPrivateKeyPath)
     }