Merge pull request #576 from Valodim/stripped-secretkeys

Support stripped secretkeys

2 files changed, 20 insertions, 2 deletions

diff --git a/libraries/spongycastle/pg/src/main/j2me/org/spongycastle/openpgp/PGPSecretKey.java b/libraries/spongycastle/pg/src/main/j2me/org/spongycastle/openpgp/PGPSecretKey.java
index 2554be8f1..8552f6fca 100644
--- a/libraries/spongycastle/pg/src/main/j2me/org/spongycastle/openpgp/PGPSecretKey.java
+++ b/libraries/spongycastle/pg/src/main/j2me/org/spongycastle/openpgp/PGPSecretKey.java
@@ -278,7 +278,16 @@ public class PGPSecretKey
     {
         return pub.getUserIDs();
     }
-    
+
+    /**
+     * Return the S2K object used to encrypt this secret key.
+     *
+     * @return this secret key's s2k object'
+     */
+    public S2K getS2K() {
+        return secret.getS2K();
+    }
+
     /**
      * Return any user attribute vectors associated with the key.
      * 
diff --git a/libraries/spongycastle/pg/src/main/java/org/spongycastle/openpgp/PGPSecretKey.java b/libraries/spongycastle/pg/src/main/java/org/spongycastle/openpgp/PGPSecretKey.java
index c0f7dfa3b..f7e3a50c7 100644
--- a/libraries/spongycastle/pg/src/main/java/org/spongycastle/openpgp/PGPSecretKey.java
+++ b/libraries/spongycastle/pg/src/main/java/org/spongycastle/openpgp/PGPSecretKey.java
@@ -431,7 +431,16 @@ public class PGPSecretKey
     {
         return pub.getUserIDs();
     }
-    
+
+    /**
+     * Return the S2K this secret key is encrypted with.
+     *
+     * @return the S2K for this key.
+     */
+    public S2K getS2K() {
+        return secret.getS2K();
+    }
+
     /**
      * Return any user attribute vectors associated with the key.
      *