github:115 fix to s2kUsage if previously none

Author: dghgit

pg/src/main/java/org/bouncycastle/openpgp/PGPSecretKey.java

@@ -323,6 +323,16 @@ public long getKeyID()
         return pub.getKeyID();
     }
 
+    /**
+     * Return the S2K usage associated with this key.
+     *
+     * @return the key's S2K usage
+     */
+    public int getS2KUsage()
+    {
+        return secret.getS2KUsage();
+    }
+
     /**
      * Return the S2K used to process this key
      *
@@ -682,6 +692,10 @@ public static PGPSecretKey copyWithNewPassword(
         }
         else
         {
+            if (s2kUsage == SecretKeyPacket.USAGE_NONE)
+            {
+                s2kUsage = SecretKeyPacket.USAGE_CHECKSUM;
+            }
             if (key.secret.getPublicKeyPacket().getVersion() < 4)
             {
                 // Version 2 or 3 - RSA Keys only

pg/src/test/java/org/bouncycastle/openpgp/test/PGPKeyRingTest.java

@@ -11,6 +11,7 @@
 import javax.crypto.Cipher;
 
 import org.bouncycastle.bcpg.HashAlgorithmTags;
+import org.bouncycastle.bcpg.SecretKeyPacket;
 import org.bouncycastle.bcpg.SymmetricKeyAlgorithmTags;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.bouncycastle.jce.spec.ElGamalParameterSpec;
@@ -2355,9 +2356,9 @@ private void rewrapTest()
                 // this should succeed
                 PGPPrivateKey privTmp = pgpKey.extractPrivateKey(null);
 
-                if (pgpKey.getKeyID() != oldKeyID)
+                if (pgpKey.getKeyID() != oldKeyID || pgpKey.getS2KUsage() != SecretKeyPacket.USAGE_NONE)
                 {
-                    fail("key ID mismatch");
+                    fail("usage/key ID mismatch");
                 }
             }
 
@@ -2379,9 +2380,9 @@ private void rewrapTest()
                 // this should succeed
                 PGPPrivateKey privTmp = pgpKey.extractPrivateKey(new JcePBESecretKeyDecryptorBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider("BC").build()).setProvider("BC").build(newPass));
 
-                if (pgpKey.getKeyID() != oldKeyID)
+                if (pgpKey.getKeyID() != oldKeyID || pgpKey.getS2KUsage() != SecretKeyPacket.USAGE_CHECKSUM)
                 {
-                    fail("key ID mismatch");
+                    fail("usage/key ID mismatch");
                 }
             }
         }