diff --git a/pgpainless-core/src/main/kotlin/org/pgpainless/decryption_verification/OpenPgpMessageInputStream.kt b/pgpainless-core/src/main/kotlin/org/pgpainless/decryption_verification/OpenPgpMessageInputStream.kt index af6034bb..e3e11760 100644 --- a/pgpainless-core/src/main/kotlin/org/pgpainless/decryption_verification/OpenPgpMessageInputStream.kt +++ b/pgpainless-core/src/main/kotlin/org/pgpainless/decryption_verification/OpenPgpMessageInputStream.kt @@ -347,13 +347,12 @@ class OpenPgpMessageInputStream( syntaxVerifier.next(InputSymbol.ENCRYPTED_DATA) val encDataList = packetInputStream!!.readEncryptedDataList() + /* if (encDataList.isEmpty) { - LOGGER.debug( - "Missing encrypted session key packet.") + LOGGER.debug("Missing encrypted session key packet.") return false } - - + */ if (!encDataList.isIntegrityProtected && !encDataList.isEmpty && diff --git a/pgpainless-sop/src/main/kotlin/org/pgpainless/sop/ArmorImpl.kt b/pgpainless-sop/src/main/kotlin/org/pgpainless/sop/ArmorImpl.kt index a9a2ea96..7431f11f 100644 --- a/pgpainless-sop/src/main/kotlin/org/pgpainless/sop/ArmorImpl.kt +++ b/pgpainless-sop/src/main/kotlin/org/pgpainless/sop/ArmorImpl.kt @@ -29,13 +29,14 @@ class ArmorImpl(private val api: PGPainless) : Armor { // Determine the nature of the given data - val openPgpIn = OpenPGPAnimalSnifferInputStream(data).apply { - try { - inspectBuffer() - } catch (e: IOException) { - // ignore + val openPgpIn = + OpenPGPAnimalSnifferInputStream(data).apply { + try { + inspectBuffer() + } catch (e: IOException) { + // ignore + } } - } if (openPgpIn.isAsciiArmored) { // armoring already-armored data is an idempotent operation diff --git a/pgpainless-sop/src/main/kotlin/org/pgpainless/sop/DetachedVerifyImpl.kt b/pgpainless-sop/src/main/kotlin/org/pgpainless/sop/DetachedVerifyImpl.kt index e2d71545..2114fda9 100644 --- a/pgpainless-sop/src/main/kotlin/org/pgpainless/sop/DetachedVerifyImpl.kt +++ b/pgpainless-sop/src/main/kotlin/org/pgpainless/sop/DetachedVerifyImpl.kt @@ -28,11 +28,12 @@ class DetachedVerifyImpl(private val api: PGPainless) : DetachedVerify { override fun data(data: InputStream): List { try { - val verificationStream = try { - api.processMessage().onInputStream(data).withOptions(options) - } catch (e: RuntimeException) { - throw SOPGPException.BadData(e) - } + val verificationStream = + try { + api.processMessage().onInputStream(data).withOptions(options) + } catch (e: RuntimeException) { + throw SOPGPException.BadData(e) + } Streams.drain(verificationStream) verificationStream.close()