Skip to contentSkip to conversation

crypto: misc pbkdf fixes for testing & algorithm compat

PATCH In review Daniel P. Berrangé 2 participants 6 messages Aug 30, 2024 – Sep 4, 2024

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

cover crypto: misc pbkdf fixes for testing & algorithm compat

Daniel P. Berrangé (2):
crypto: check gnutls & gcrypt support the requested pbkdf hash tests/unit: always build the pbkdf crypto unit test

 crypto/pbkdf-gcrypt.c          | 2 +-
 crypto/pbkdf-gnutls.c          | 2 +-
 tests/unit/meson.build         | 4 +---
 tests/unit/test-crypto-pbkdf.c | 9 ++++++---
 4 files changed, 9 insertions(+), 8 deletions(-)
Signature · 1 line
2.45.2
#1 lore raw

PATCH 1/2 crypto: check gnutls & gcrypt support the requested pbkdf hash

Both gnutls and gcrypt can be configured to exclude support for certain algorithms via a runtime check against system crypto policies. Thus it is not sufficient to have a compile time test for hash support in their pbkdf implementations.

---
 crypto/pbkdf-gcrypt.c | 2 +-
 crypto/pbkdf-gnutls.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
crypto/pbkdf-gcrypt.c +1 -1
index a8d8e64f4d..bc0719c831 100644
@@ -33,7 +33,7 @@ bool qcrypto_pbkdf2_supports(QCryptoHashAlgorithm hash)
     case QCRYPTO_HASH_ALG_SHA384:
     case QCRYPTO_HASH_ALG_SHA512:
     case QCRYPTO_HASH_ALG_RIPEMD160:
-        return true;
+        return qcrypto_hash_supports(hash);
     default:
         return false;
     }
crypto/pbkdf-gnutls.c +1 -1
index 2dfbbd382c..911b565bea 100644
@@ -33,7 +33,7 @@ bool qcrypto_pbkdf2_supports(QCryptoHashAlgorithm hash)
     case QCRYPTO_HASH_ALG_SHA384:
     case QCRYPTO_HASH_ALG_SHA512:
     case QCRYPTO_HASH_ALG_RIPEMD160:
-        return true;
+        return qcrypto_hash_supports(hash);
     default:
         return false;
     }
Signature · 1 line
2.45.2
Reviewed-by on v1 1/2
#2 lore raw

Re: [PATCH 1/2] crypto: check gnutls & gcrypt support the requested pbkdf hash

Quoted 10 lines · Daniel P. Berrangé

Both gnutls and gcrypt can be configured to exclude support for certain algorithms via a runtime check against system crypto policies. Thus it is not sufficient to have a compile time test for hash support in their pbkdf implementations.

---
  crypto/pbkdf-gcrypt.c | 2 +-
  crypto/pbkdf-gnutls.c | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
#3 lore raw

PATCH 2/2 tests/unit: always build the pbkdf crypto unit test

In reply to Daniel P. Berrangé

The meson rules were excluding the pbkdf crypto test when gnutls was the crypto backend. It was then excluded again in #if statements in the test file.

Rather than update these conditions, remove them all, and use the result of the qcrypto_pbkdf_supports() function to determine whether to skip test registration.

Also add CONFIG_DARWIN to the remaining condition, since we have a way to measure CPU time on this platform since commit bf98afc75efedf1.

---
 tests/unit/meson.build         | 4 +---
 tests/unit/test-crypto-pbkdf.c | 9 ++++++---
 2 files changed, 7 insertions(+), 6 deletions(-)
tests/unit/meson.build +1 -3
index 490ab8182d..972d792883 100644
@@ -121,9 +121,7 @@ if have_block
   if config_host_data.get('CONFIG_REPLICATION')
     tests += {'test-replication': [testblock]}
   endif
-  if nettle.found() or gcrypt.found()
-    tests += {'test-crypto-pbkdf': [io]}
-  endif
+  tests += {'test-crypto-pbkdf': [io]}
 endif
 
 if have_system
tests/unit/test-crypto-pbkdf.c +6 -3
index 43c417f6b4..034bb02422 100644
@@ -25,8 +25,7 @@
 #include <sys/resource.h>
 #endif
 
-#if ((defined(CONFIG_NETTLE) || defined(CONFIG_GCRYPT)) && \
-     (defined(_WIN32) || defined(RUSAGE_THREAD)))
+#if defined(_WIN32) || defined(RUSAGE_THREAD) || defined(CONFIG_DARWIN)
 #include "crypto/pbkdf.h"
 
 typedef struct QCryptoPbkdfTestData QCryptoPbkdfTestData;
@@ -422,13 +421,17 @@ int main(int argc, char **argv)
     g_assert(qcrypto_init(NULL) == 0);
 
     for (i = 0; i < G_N_ELEMENTS(test_data); i++) {
+        if (!qcrypto_pbkdf2_supports(test_data[i].hash)) {
+            continue;
+        }
+
         if (!test_data[i].slow ||
             g_test_slow()) {
             g_test_add_data_func(test_data[i].path, &test_data[i], test_pbkdf);
         }
     }
 
-    if (g_test_slow()) {
+    if (g_test_slow() && qcrypto_pbkdf2_supports(QCRYPTO_HASH_ALG_SHA256)) {
         g_test_add_func("/crypt0/pbkdf/timing", test_pbkdf_timing);
     }
 
Signature · 1 line
2.45.2
Reviewed-by on v1 2/2
#4 lore raw

Re: [PATCH 2/2] tests/unit: always build the pbkdf crypto unit test

Quoted 37 lines · Daniel P. Berrangé

The meson rules were excluding the pbkdf crypto test when gnutls was the crypto backend. It was then excluded again in #if statements in the test file.

Rather than update these conditions, remove them all, and use the result of the qcrypto_pbkdf_supports() function to determine whether to skip test registration.

Also add CONFIG_DARWIN to the remaining condition, since we have a way to measure CPU time on this platform since commit bf98afc75efedf1.

---
  tests/unit/meson.build         | 4 +---
  tests/unit/test-crypto-pbkdf.c | 9 ++++++---
  2 files changed, 7 insertions(+), 6 deletions(-)
tests/unit/meson.build +1 -3
index 490ab8182d..972d792883 100644
@@ -121,9 +121,7 @@ if have_block
    if config_host_data.get('CONFIG_REPLICATION')
      tests += {'test-replication': [testblock]}
    endif
-  if nettle.found() or gcrypt.found()
-    tests += {'test-crypto-pbkdf': [io]}
-  endif
+  tests += {'test-crypto-pbkdf': [io]}
  endif
 
  if have_system
tests/unit/test-crypto-pbkdf.c +0 -0
index 43c417f6b4..034bb02422 100644

tests/unit/test-crypto-pbkdf.c line 28

Quoted 6 lines
tests/unit/test-crypto-pbkdf.c +1 -2
@@ -25,8 +25,7 @@
  #include <sys/resource.h>
  #endif
 
-#if ((defined(CONFIG_NETTLE) || defined(CONFIG_GCRYPT)) && \
-     (defined(_WIN32) || defined(RUSAGE_THREAD)))
+#if defined(_WIN32) || defined(RUSAGE_THREAD) || defined(CONFIG_DARWIN)

Add CONFIG_DARWIN in a subsequent commit?

Quoted 10 lines
tests/unit/test-crypto-pbkdf.c +3 -0
  #include "crypto/pbkdf.h"
 
  typedef struct QCryptoPbkdfTestData QCryptoPbkdfTestData;
@@ -422,13 +421,17 @@ int main(int argc, char **argv)
      g_assert(qcrypto_init(NULL) == 0);
 
      for (i = 0; i < G_N_ELEMENTS(test_data); i++) {
+        if (!qcrypto_pbkdf2_supports(test_data[i].hash)) {
+            continue;
+        }

tests/unit/test-crypto-pbkdf.c int main(int argc, char **argv) · line 435

Quoted 10 lines
tests/unit/test-crypto-pbkdf.c +2 -1
+
          if (!test_data[i].slow ||
              g_test_slow()) {
              g_test_add_data_func(test_data[i].path, &test_data[i], test_pbkdf);
          }
      }
 
-    if (g_test_slow()) {
+    if (g_test_slow() && qcrypto_pbkdf2_supports(QCRYPTO_HASH_ALG_SHA256)) {
          g_test_add_func("/crypt0/pbkdf/timing", test_pbkdf_timing);

While here, rename test_pbkdf_timing -> test_pbkdf_sha256_timing?

tests/unit/test-crypto-pbkdf.c int main(int argc, char **argv) · line 437

Quoted 2 lines
tests/unit/test-crypto-pbkdf.c +0 -0
      }
 

Anyway,

#5 lore raw

Re: [PATCH 2/2] tests/unit: always build the pbkdf crypto unit test

Quoted 36 lines · Philippe Mathieu-Daudé
Quoted 35 lines · Daniel P. Berrangé

The meson rules were excluding the pbkdf crypto test when gnutls was the crypto backend. It was then excluded again in #if statements in the test file.

Rather than update these conditions, remove them all, and use the result of the qcrypto_pbkdf_supports() function to determine whether to skip test registration.

Also add CONFIG_DARWIN to the remaining condition, since we have a way to measure CPU time on this platform since commit bf98afc75efedf1.

---
  tests/unit/meson.build         | 4 +---
  tests/unit/test-crypto-pbkdf.c | 9 ++++++---
  2 files changed, 7 insertions(+), 6 deletions(-)
tests/unit/meson.build +1 -3
index 490ab8182d..972d792883 100644
@@ -121,9 +121,7 @@ if have_block
    if config_host_data.get('CONFIG_REPLICATION')
      tests += {'test-replication': [testblock]}
    endif
-  if nettle.found() or gcrypt.found()
-    tests += {'test-crypto-pbkdf': [io]}
-  endif
+  tests += {'test-crypto-pbkdf': [io]}
  endif
  if have_system
tests/unit/test-crypto-pbkdf.c +0 -0
index 43c417f6b4..034bb02422 100644
Quoted 8 lines

tests/unit/test-crypto-pbkdf.c line 27

Quoted 6 lines
tests/unit/test-crypto-pbkdf.c +1 -2
@@ -25,8 +25,7 @@
  #include <sys/resource.h>
  #endif
-#if ((defined(CONFIG_NETTLE) || defined(CONFIG_GCRYPT)) && \
-     (defined(_WIN32) || defined(RUSAGE_THREAD)))
+#if defined(_WIN32) || defined(RUSAGE_THREAD) || defined(CONFIG_DARWIN)

Add CONFIG_DARWIN in a subsequent commit?

Yes, classic trap. If you have "Also ..." in a commit message then you've just told yourself it should have been a separate commit :-)

Quoted 12 lines
Quoted 12 lines
tests/unit/test-crypto-pbkdf.c +4 -0
  #include "crypto/pbkdf.h"
  typedef struct QCryptoPbkdfTestData QCryptoPbkdfTestData;
@@ -422,13 +421,17 @@ int main(int argc, char **argv)
      g_assert(qcrypto_init(NULL) == 0);
      for (i = 0; i < G_N_ELEMENTS(test_data); i++) {
+        if (!qcrypto_pbkdf2_supports(test_data[i].hash)) {
+            continue;
+        }
+
          if (!test_data[i].slow ||
              g_test_slow()) {
Quoted 8 lines

tests/unit/test-crypto-pbkdf.c int main(int argc, char **argv) · line 435

Quoted 6 lines
tests/unit/test-crypto-pbkdf.c +1 -1
              g_test_add_data_func(test_data[i].path, &test_data[i], test_pbkdf);
          }
      }
-    if (g_test_slow()) {
+    if (g_test_slow() && qcrypto_pbkdf2_supports(QCRYPTO_HASH_ALG_SHA256)) {
          g_test_add_func("/crypt0/pbkdf/timing", test_pbkdf_timing);

While here, rename test_pbkdf_timing -> test_pbkdf_sha256_timing?

Will do

Quoted 6 lines

tests/unit/test-crypto-pbkdf.c int main(int argc, char **argv) · line 434

Quoted 2 lines
tests/unit/test-crypto-pbkdf.c +0 -0
      }

Anyway,

With regards,
Daniel

Signature · 3 lines
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|