2 files changed, 28 insertions, 2 deletions
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpConversionHelper.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpConversionHelper.java
index a30e0718f..b268de3a6 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpConversionHelper.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpConversionHelper.java
@@ -26,6 +26,8 @@ import org.spongycastle.openpgp.PGPKeyRing;
 import org.spongycastle.openpgp.PGPObjectFactory;
 import org.spongycastle.openpgp.PGPSecretKey;
 import org.spongycastle.openpgp.PGPSecretKeyRing;
+import org.spongycastle.openpgp.PGPSignature;
+import org.spongycastle.openpgp.PGPSignatureList;
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.util.Log;
 
@@ -104,6 +106,28 @@ public class PgpConversionHelper {
     }
 
     /**
+     * Convert from byte[] to PGPSignature
+     *
+     * @param sigBytes
+     * @return
+     */
+    public static PGPSignature BytesToPGPSignature(byte[] sigBytes) {
+        PGPObjectFactory factory = new PGPObjectFactory(sigBytes);
+        PGPSignatureList signatures = null;
+        try {
+            if ((signatures = (PGPSignatureList) factory.nextObject()) == null || signatures.isEmpty()) {
+                Log.e(Constants.TAG, "No signatures given!");
+                return null;
+            }
+        } catch (IOException e) {
+            Log.e(Constants.TAG, "Error while converting to PGPSignature!", e);
+            return null;
+        }
+
+        return signatures.get(0);
+    }
+
+    /**
      * Convert from ArrayList<PGPSecretKey> to byte[]
      * 
      * @param keys
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyHelper.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyHelper.java
index 71c921c33..902dd8da9 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyHelper.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyHelper.java
@@ -422,7 +422,6 @@ public class PgpKeyHelper {
                 algorithmStr = "RSA";
                 break;
             }
-
             case PGPPublicKey.DSA: {
                 algorithmStr = "DSA";
                 break;
@@ -439,7 +438,10 @@ public class PgpKeyHelper {
                 break;
             }
         }
-        return algorithmStr + ", " + keySize + " bit";
+        if(keySize > 0)
+            return algorithmStr + ", " + keySize + " bit";
+        else
+            return algorithmStr;
     }
 
     public static String getFingerPrint(Context context, long keyId) {