From 92e2828885ffa894e5114adee96efbc0b0493250 Mon Sep 17 00:00:00 2001
From: Paul Schaub <vanitasvitae@fsfe.org>
Date: Tue, 3 Nov 2020 19:32:01 +0100
Subject: [PATCH] Add support for deleting subKeys (untested)

---
 .../key/modification/KeyRingEditor.java           | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/pgpainless-core/src/main/java/org/pgpainless/key/modification/KeyRingEditor.java b/pgpainless-core/src/main/java/org/pgpainless/key/modification/KeyRingEditor.java
index 514f9c10..f594b114 100644
--- a/pgpainless-core/src/main/java/org/pgpainless/key/modification/KeyRingEditor.java
+++ b/pgpainless-core/src/main/java/org/pgpainless/key/modification/KeyRingEditor.java
@@ -157,12 +157,23 @@ public class KeyRingEditor implements KeyRingEditorInterface {
 
     @Override
     public KeyRingEditorInterface deleteSubKey(OpenPgpV4Fingerprint fingerprint, SecretKeyRingProtector protector) {
-        throw new NotYetImplementedException();
+        return deleteSubKey(fingerprint.getKeyId(), protector);
     }
 
     @Override
     public KeyRingEditorInterface deleteSubKey(long subKeyId, SecretKeyRingProtector protector) {
-        throw new NotYetImplementedException();
+        if (secretKeyRing.getSecretKey().getKeyID() == subKeyId) {
+            throw new IllegalArgumentException("You cannot delete the primary key of this key ring.");
+        }
+
+        PGPSecretKey deleteMe = secretKeyRing.getSecretKey(subKeyId);
+        if (deleteMe == null) {
+            throw new NoSuchElementException("KeyRing does not contain such a key.");
+        }
+
+        PGPSecretKeyRing newKeyRing = PGPSecretKeyRing.removeSecretKey(secretKeyRing, deleteMe);
+        secretKeyRing = newKeyRing;
+        return this;
     }
 
     @Override