mirror of
https://github.com/pgpainless/pgpainless.git
synced 2024-12-22 19:08:00 +01:00
Remove KeyRingUtils.removeSecretKey() in favor of stripSecretKey()
This commit is contained in:
parent
09bacd40d1
commit
7a194c517a
2 changed files with 1 additions and 25 deletions
|
@ -440,30 +440,6 @@ public final class KeyRingUtils {
|
||||||
return newSecretKey;
|
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.
|
* 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.
|
* The public part stays attached to the key ring, so that it can still be used for encryption / verification of signatures.
|
||||||
|
|
|
@ -83,7 +83,7 @@ public class CertificateWithMissingSecretKeyTest {
|
||||||
encryptionSubkeyId = PGPainless.inspectKeyRing(secretKeys)
|
encryptionSubkeyId = PGPainless.inspectKeyRing(secretKeys)
|
||||||
.getEncryptionSubkeys(EncryptionPurpose.ANY).get(0).getKeyID();
|
.getEncryptionSubkeys(EncryptionPurpose.ANY).get(0).getKeyID();
|
||||||
// remove the encryption/decryption secret key
|
// remove the encryption/decryption secret key
|
||||||
missingDecryptionSecKey = KeyRingUtils.removeSecretKey(secretKeys, encryptionSubkeyId);
|
missingDecryptionSecKey = KeyRingUtils.stripSecretKey(secretKeys, encryptionSubkeyId);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
|
Loading…
Reference in a new issue