Add and use function pgp_is_aes().

rnpgp · Dec 20, 2024 · 299f28a · 299f28a
1 parent 18add10
commit 299f28a
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 15 deletions.
diff --git a/src/lib/crypto/symmetric.h b/src/lib/crypto/symmetric.h
@@ -133,6 +133,7 @@ typedef struct pgp_crypt_t {
 unsigned pgp_block_size(pgp_symm_alg_t);
 unsigned pgp_key_size(pgp_symm_alg_t);
 bool     pgp_is_sa_supported(int alg, bool silent = false);
+bool     pgp_is_sa_aes(pgp_symm_alg_t alg);
 size_t   pgp_cipher_block_size(pgp_crypt_t *crypt);
 
 /**

diff --git a/src/lib/crypto/symmetric_common.cpp b/src/lib/crypto/symmetric_common.cpp
@@ -260,6 +260,19 @@ pgp_key_size(pgp_symm_alg_t alg)
     }
 }
 
+bool
+pgp_is_sa_aes(pgp_symm_alg_t alg)
+{
+    switch (alg) {
+    case PGP_SA_AES_128:
+    case PGP_SA_AES_192:
+    case PGP_SA_AES_256:
+        return true;
+    default:
+        return false;
+    }
+}
+
 #if defined(ENABLE_AEAD)
 size_t
 pgp_cipher_aead_granularity(pgp_crypt_t *crypt)

diff --git a/src/librepgp/stream-common.cpp b/src/librepgp/stream-common.cpp
@@ -1226,20 +1226,7 @@ do_encrypt_pkesk_v3_alg_id(pgp_pubkey_alg_t alg)
 bool
 check_enforce_aes_v3_pkesk(pgp_pubkey_alg_t alg, pgp_symm_alg_t salg, pgp_pkesk_version_t ver)
 {
-    if (ver != PGP_PKSK_V3) {
-        return true;
-    }
-    /* The same algorithms */
-    if (have_pkesk_checksum(alg)) {
-        return true;
-    }
-    switch (salg) {
-    case PGP_SA_AES_128:
-    case PGP_SA_AES_192:
-    case PGP_SA_AES_256:
-        return true;
-    default:
-        return false;
-    }
+    /* The same algorithms as with pkesk_checksum */
+    return (ver != PGP_PKSK_V3) || have_pkesk_checksum(alg) || pgp_is_sa_aes(salg);
 }
 #endif