PGPainless/pgpainless
PGPainless
/
pgpainless
mirror of https://github.com/pgpainless/pgpainless.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Remove KeyRingUtils.removeSecretKey() in favor of stripSecretKey()

This commit is contained in:
Paul Schaub 2023-05-03 17:15:30 +02:00
parent 09bacd40d1
commit 7a194c517a
Signed by: vanitasvitae
GPG Key ID: 62BEE9264BF17311
2 changed files with 1 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pgpainless-core/src/main/java/org/pgpainless/key/util/KeyRingUtils.java
View File

@ -440,30 +440,6 @@ public final class KeyRingUtils {
return newSecretKey;
}
/**
* Remove the secret key of the subkey identified by the given secret key id from the key ring.
* The public part stays attached to the key ring, so that it can still be used for encryption / verification of signatures.
*
* This method is intended to be used to remove secret primary keys from live keys when those are kept in offline storage.
*
* @param secretKeys secret key ring
* @param secretKeyId id of the secret key to remove
* @return secret key ring with removed secret key
*
* @throws IOException in case of an error during serialization / deserialization of the key
* @throws PGPException in case of a broken key
*
* @deprecated use {@link #stripSecretKey(PGPSecretKeyRing, long)} instead.
* TODO: Remove in 1.2.X
*/
@Nonnull
@Deprecated
public static PGPSecretKeyRing removeSecretKey(@Nonnull PGPSecretKeyRing secretKeys,
long secretKeyId)
throws IOException, PGPException {
return stripSecretKey(secretKeys, secretKeyId);
}
/**
* Remove the secret key of the subkey identified by the given secret key id from the key ring.
* The public part stays attached to the key ring, so that it can still be used for encryption / verification of signatures.

2
pgpainless-core/src/test/java/org/pgpainless/decryption_verification/CertificateWithMissingSecretKeyTest.java
View File

@ -83,7 +83,7 @@ public class CertificateWithMissingSecretKeyTest {
encryptionSubkeyId = PGPainless.inspectKeyRing(secretKeys)
.getEncryptionSubkeys(EncryptionPurpose.ANY).get(0).getKeyID();
// remove the encryption/decryption secret key
missingDecryptionSecKey = KeyRingUtils.removeSecretKey(secretKeys, encryptionSubkeyId);
missingDecryptionSecKey = KeyRingUtils.stripSecretKey(secretKeys, encryptionSubkeyId);
}
@Test