wip

Author: DenBond7

FlowCrypt/build.gradle.kts

@@ -468,7 +468,7 @@ dependencies {
   implementation("org.bitbucket.b_c:jose4j:0.9.6")
   implementation("org.jsoup:jsoup:1.19.1")
   implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1")
-  implementation("org.pgpainless:pgpainless-core:1.7.3")
+  implementation("org.pgpainless:pgpainless-core:1.7.5")
   implementation("org.eclipse.angus:angus-mail:2.0.3")
   implementation("org.eclipse.angus:gimap:2.0.3")
   implementation("commons-io:commons-io:2.18.0")

FlowCrypt/src/main/java/com/flowcrypt/email/extensions/org/bouncycastle/openpgp/PGPKeyRingExt.kt

@@ -38,6 +38,13 @@ import java.time.Instant
 @Throws(IOException::class)
 @WorkerThread
 fun PGPKeyRing.toPgpKeyRingDetails(hideArmorMeta: Boolean = false): PgpKeyRingDetails {
+  if (containsHashAlgorithmWithSHA1()) {
+    val sigHashAlgoPolicy = PGPainless.getPolicy().certificationSignatureHashAlgorithmPolicy
+    if (!sigHashAlgoPolicy.isAcceptable(HashAlgorithm.SHA1)) {
+      throw PGPException("Unsupported signature(HashAlgorithm = SHA1)")
+    }
+  }
+
   val keyRingInfo = KeyRingInfo(this)
 
   val algo = Algo(
@@ -56,13 +63,6 @@ fun PGPKeyRing.toPgpKeyRingDetails(hideArmorMeta: Boolean = false): PgpKeyRingDe
     throw IllegalArgumentException("There are no fingerprints")
   }
 
-  if (containsHashAlgorithmWithSHA1()) {
-    val sigHashAlgoPolicy = PGPainless.getPolicy().certificationSignatureHashAlgorithmPolicy
-    if (!sigHashAlgoPolicy.isAcceptable(HashAlgorithm.SHA1)) {
-      throw PGPException("Unsupported signature(HashAlgorithm = SHA1)")
-    }
-  }
-
   val privateKey = if (keyRingInfo.isSecretKey) armor(hideArmorMeta = hideArmorMeta) else null
   val publicKey = if (keyRingInfo.isSecretKey) {
     (this as PGPSecretKeyRing).toPublicKeyRing().armor(hideArmorMeta = hideArmorMeta)

FlowCrypt/src/test/java/com/flowcrypt/email/security/pgp/PgpKeyTest.kt

@@ -81,8 +81,13 @@ class PgpKeyTest {
     )
     val parseKeyResult = PgpKey.parseKeys(source = TestKeys.KEYS["rsa1"]!!.publicKey)
     assertEquals(1, parseKeyResult.getAllKeys().size)
-    val actual = parseKeyResult.pgpKeyDetailsList.first()
-      .run { this.copy(publicKey = replaceVersionInKey(this.publicKey)) }
+    val actual = parseKeyResult.pgpKeyDetailsList.first().copy(
+      /*
+       * we replace publicKey source here because it can't be a constant.
+       * If other fields of [PgpKeyRingDetails] will be the same it means objects are equal
+       */
+      publicKey = expected.publicKey
+    )
     assertEquals(expected, actual)
   }
 
@@ -122,8 +127,13 @@ class PgpKeyTest {
     )
     val parseKeyResult = PgpKey.parseKeys(source = TestKeys.KEYS["expired"]!!.publicKey)
     assertEquals(1, parseKeyResult.getAllKeys().size)
-    val actual = parseKeyResult.pgpKeyDetailsList.first()
-      .run { this.copy(publicKey = replaceVersionInKey(this.publicKey)) }
+    val actual = parseKeyResult.pgpKeyDetailsList.first().copy(
+      /*
+       * we replace publicKey source here because it can't be a constant.
+       * If other fields of [PgpKeyRingDetails] will be the same it means objects are equal
+       */
+      publicKey = expected.publicKey
+    )
     assertEquals(expected, actual)
   }