more modern preferences for rfc9580/pqc

Author: TJ-91

src/lib/keygen.cpp

@@ -399,16 +399,31 @@ UserPrefs::add_aead_prefs(pgp_symm_alg_t sym_alg, pgp_aead_alg_t aead_alg)
 #endif
 
 void
-UserPrefs::check_defaults(pgp_version_t version)
+UserPrefs::check_defaults(pgp_version_t version, pgp_pubkey_alg_t pk_alg)
 {
     if (symm_algs.empty()) {
         symm_algs = {PGP_SA_AES_256, PGP_SA_AES_192, PGP_SA_AES_128};
     }
     if (hash_algs.empty()) {
-        hash_algs = {PGP_HASH_SHA256, PGP_HASH_SHA384, PGP_HASH_SHA512, PGP_HASH_SHA224};
+#if defined(ENABLE_PQC)
+        if (Key::is_pqc_alg(pk_alg)) {
+            hash_algs = {PGP_HASH_SHA256,
+                         PGP_HASH_SHA384,
+                         PGP_HASH_SHA512,
+                         PGP_HASH_SHA3_256,
+                         PGP_HASH_SHA3_512};
+        } else
+#endif
+        {
+            hash_algs = {PGP_HASH_SHA256, PGP_HASH_SHA384, PGP_HASH_SHA512, PGP_HASH_SHA224};
+        }
     }
     if (z_algs.empty()) {
+#if defined(ENABLE_CRYPTO_REFRESH) || defined(ENABLE_PQC)
+        z_algs = {PGP_C_NONE};
+#else
         z_algs = {PGP_C_ZLIB, PGP_C_BZIP2, PGP_C_ZIP, PGP_C_NONE};
+#endif
     }
 #if defined(ENABLE_CRYPTO_REFRESH)
     if (aead_prefs.empty() && (version == PGP_V6)) {
@@ -423,7 +438,7 @@ UserPrefs::check_defaults(pgp_version_t version)
 void
 CertParams::check_defaults(const KeygenParams &params)
 {
-    prefs.check_defaults(params.version());
+    prefs.check_defaults(params.version(), params.alg());
 
     if (!flags) {
         // set some default key flags if none are provided

src/lib/keygen.hpp

@@ -149,7 +149,8 @@ class UserPrefs {
 #if defined(ENABLE_CRYPTO_REFRESH)
     void add_aead_prefs(pgp_symm_alg_t sym_alg, pgp_aead_alg_t aead_alg);
 #endif
-    void check_defaults(pgp_version_t version = PGP_V4);
+    void check_defaults(pgp_version_t    version = PGP_V4,
+                        pgp_pubkey_alg_t pk_alg = PGP_PKA_NOTHING);
 };
 
 class CertParams {