Merge pull request #26 from ProtonMail/wrapper-ios

Add wrappers for iOS

crypto/keyring_message.go

@@ -15,7 +15,7 @@ import (
 // * message    : The plaintext input as a PlainMessage
 // * privateKey : (optional) an unlocked private keyring to include signature in the message
 func (keyRing *KeyRing) Encrypt(message *PlainMessage, privateKey *KeyRing) (*PGPMessage, error) {
-	encrypted, err := asymmetricEncrypt(message.GetBinary(), keyRing, privateKey, true)
+	encrypted, err := asymmetricEncrypt(message.GetBinary(), keyRing, privateKey, message.IsBinary())
 	if err != nil {
 		return nil, err
 	}

helper/ios.go

@@ -0,0 +1,42 @@
+package helper
+
+import (
+	"github.com/ProtonMail/gopenpgp/crypto"
+)
+
+type ExplicitVerifyMessage struct {
+	Message *crypto.PlainMessage
+	SignatureVerificationError *crypto.SignatureVerificationError
+}
+
+// DecryptVerifyMessageArmored decrypts an armored PGP message given a private key and its passphrase
+// and verifies the embedded signature.
+// Returns the plain data or an error on signature verification failure.
+func DecryptExplicitVerify(
+	pgpMessage *crypto.PGPMessage,
+	privateKeyRing, publicKeyRing *crypto.KeyRing,
+	verifyTime int64,
+) (*ExplicitVerifyMessage, error) {
+	var explicitVerify *ExplicitVerifyMessage
+
+	message, err := privateKeyRing.Decrypt(pgpMessage, publicKeyRing, verifyTime);
+
+	if err != nil {
+		castedErr, isType := err.(crypto.SignatureVerificationError)
+		if !isType {
+			return nil, err
+		}
+
+		explicitVerify = &ExplicitVerifyMessage{
+			Message: message,
+			SignatureVerificationError: &castedErr,
+		}
+	} else {
+		explicitVerify = &ExplicitVerifyMessage{
+			Message: message,
+			SignatureVerificationError: nil,
+		}
+	}
+
+	return explicitVerify, nil
+}

helper/ios_test.go

@@ -0,0 +1,52 @@
+package helper
+
+import (
+	"testing"
+
+	"github.com/ProtonMail/gopenpgp/constants"
+	"github.com/ProtonMail/gopenpgp/crypto"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestIOSSignedMessageDecryption(t *testing.T) {
+	testPrivateKeyRing, _ := pgp.BuildKeyRingArmored(readTestFile("keyring_privateKey", false))
+	testPublicKeyRing, _ := pgp.BuildKeyRingArmored(readTestFile("mime_publicKey", false))
+
+	// Password defined in base_test
+	err := testPrivateKeyRing.UnlockWithPassphrase(testMailboxPassword)
+	if err != nil {
+		t.Fatal("Expected no error unlocking privateKey, got:", err)
+	}
+
+	pgpMessage, err := crypto.NewPGPMessageFromArmored(readTestFile("message_signed", false))
+	if err != nil {
+		t.Fatal("Expected no error when unarmoring, got:", err)
+	}
+
+	decrypted, err := DecryptExplicitVerify(pgpMessage, testPrivateKeyRing, testPublicKeyRing, pgp.GetUnixTime())
+	if err != nil {
+		t.Fatal("Expected no error when decrypting, got:", err)
+	}
+
+	assert.Exactly(t, constants.SIGNATURE_NO_VERIFIER, decrypted.SignatureVerificationError.Status)
+	assert.Exactly(t, readTestFile("message_plaintext", true), decrypted.Message.GetString())
+
+	testPublicKeyRing, _ = pgp.BuildKeyRingArmored(readTestFile("keyring_publicKey", false))
+
+	pgpMessage, err = testPublicKeyRing.Encrypt(decrypted.Message, testPrivateKeyRing)
+	if err != nil {
+		t.Fatal("Expected no error when encrypting, got:", err)
+	}
+
+	decrypted, err = DecryptExplicitVerify(pgpMessage, testPrivateKeyRing, testPublicKeyRing, pgp.GetUnixTime())
+	if err != nil {
+		t.Fatal("Expected no error when decrypting, got:", err)
+	}
+
+	assert.Nil(t, decrypted.SignatureVerificationError)
+	assert.Exactly(t, readTestFile("message_plaintext", true), decrypted.Message.GetString())
+
+	decrypted, err = DecryptExplicitVerify(pgpMessage, testPublicKeyRing, testPublicKeyRing, pgp.GetUnixTime())
+	assert.NotNil(t, err)
+	assert.Nil(t, decrypted)
+}