isPassphraseCorrect(): Return false if passphrase provided and key is not locked

vanitasvitae · vanitasvitae · commit 6e134897188d · 2025-03-27T15:37:04.000+01:00
diff --git a/pg/src/main/java/org/bouncycastle/openpgp/api/OpenPGPKey.java b/pg/src/main/java/org/bouncycastle/openpgp/api/OpenPGPKey.java
@@ -367,6 +367,11 @@ private void sanitizeProtectionMode()
 
         public boolean isPassphraseCorrect(char[] passphrase)
         {
+            if (passphrase != null && !isLocked())
+            {
+                return false;
+            }
+
             try
             {
                 OpenPGPPrivateKey privateKey = unlock(passphrase);

Original file line number	Diff line number	Diff line change
`@@ -367,6 +367,11 @@ private void sanitizeProtectionMode()`
`367`	`367`
`368`	`368`	`public boolean isPassphraseCorrect(char[] passphrase)`
`369`	`369`	`{`
	`370`	`+ if (passphrase != null && !isLocked())`
	`371`	`+ {`
	`372`	`+ return false;`
	`373`	`+ }`
	`374`	`+`
`370`	`375`	`try`
`371`	`376`	`{`
`372`	`377`	`OpenPGPPrivateKey privateKey = unlock(passphrase);`