diff --git a/pgpainless-core/src/main/java/org/pgpainless/util/ArmoredInputStreamFactory.java b/pgpainless-core/src/main/java/org/pgpainless/util/ArmoredInputStreamFactory.java
deleted file mode 100644
index 77e9c236..00000000
--- a/pgpainless-core/src/main/java/org/pgpainless/util/ArmoredInputStreamFactory.java
+++ /dev/null
@@ -1,43 +0,0 @@
-// SPDX-FileCopyrightText: 2021 Paul Schaub <vanitasvitae@fsfe.org>
-//
-// SPDX-License-Identifier: Apache-2.0
-
-package org.pgpainless.util;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.bouncycastle.bcpg.ArmoredInputStream;
-
-import javax.annotation.Nonnull;
-
-/**
- * Factory class for instantiating preconfigured {@link ArmoredInputStream ArmoredInputStreams}.
- * {@link #get(InputStream)} will return an {@link ArmoredInputStream} that is set up to properly detect CRC errors.
- */
-public final class ArmoredInputStreamFactory {
-
-    private ArmoredInputStreamFactory() {
-
-    }
-
-    /**
-     * Return an instance of {@link ArmoredInputStream} which will detect CRC errors.
-     *
-     * @param inputStream input stream
-     * @return armored input stream
-     * @throws IOException in case of an IO error
-     */
-    @Nonnull
-    public static ArmoredInputStream get(@Nonnull InputStream inputStream) throws IOException {
-        if (inputStream instanceof CRCingArmoredInputStreamWrapper) {
-            return (ArmoredInputStream) inputStream;
-        }
-        if (inputStream instanceof ArmoredInputStream) {
-            return new CRCingArmoredInputStreamWrapper((ArmoredInputStream) inputStream);
-        }
-
-        ArmoredInputStream armorIn = new ArmoredInputStream(inputStream);
-        return new CRCingArmoredInputStreamWrapper(armorIn);
-    }
-}
diff --git a/pgpainless-core/src/main/kotlin/org/pgpainless/util/ArmoredInputStreamFactory.kt b/pgpainless-core/src/main/kotlin/org/pgpainless/util/ArmoredInputStreamFactory.kt
new file mode 100644
index 00000000..82d8f248
--- /dev/null
+++ b/pgpainless-core/src/main/kotlin/org/pgpainless/util/ArmoredInputStreamFactory.kt
@@ -0,0 +1,36 @@
+// SPDX-FileCopyrightText: 2023 Paul Schaub <vanitasvitae@fsfe.org>
+//
+// SPDX-License-Identifier: Apache-2.0
+
+package org.pgpainless.util
+
+import org.bouncycastle.bcpg.ArmoredInputStream
+import java.io.IOException
+import java.io.InputStream
+
+/**
+ * Factory class for instantiating preconfigured [ArmoredInputStream] instances.
+ * [get] will return an [ArmoredInputStream] that is set up to properly detect CRC errors v4 style.
+ */
+class ArmoredInputStreamFactory {
+
+    companion object {
+
+        /**
+         * Return an instance of [ArmoredInputStream] which will detect CRC errors.
+         *
+         * @param inputStream input stream
+         * @return armored input stream
+         * @throws IOException in case of an IO error
+         */
+        @JvmStatic
+        @Throws(IOException::class)
+        fun get(inputStream: InputStream): ArmoredInputStream {
+            return when (inputStream) {
+                is CRCingArmoredInputStreamWrapper -> inputStream
+                is ArmoredInputStream -> CRCingArmoredInputStreamWrapper(inputStream)
+                else -> CRCingArmoredInputStreamWrapper(ArmoredInputStream(inputStream))
+            }
+        }
+    }
+}
\ No newline at end of file