Test kryoptic with NSS DB

Signed-off-by: Jakub Jelen <[email protected]>
Jakuje · Dec 9, 2024 · 33d0c20 · 33d0c20
1 parent 755cbc8
commit 33d0c20
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 27 deletions.
diff --git a/.github/workflows/kryoptic.yml b/.github/workflows/kryoptic.yml
@@ -75,8 +75,8 @@ jobs:
       - name: Build Kryoptic
         run: |
           cd kryoptic
-          cargo build --features standard
-          cargo test --features standard | tee testout.log 2>&1
+          cargo build --features standard,nssdb
+          cargo test --features standard,nssdb | tee testout.log 2>&1
           grep -q "0 failed" testout.log
 
       - name: Setup

diff --git a/tests/kryoptic-init-nss.sh b/tests/kryoptic-init-nss.sh
@@ -0,0 +1,16 @@
+#!/bin/bash -ex
+# Copyright (C) 2024 Jakub Jelen <[email protected]>
+# SPDX-License-Identifier: Apache-2.0
+#
+
+export KRYOPTIC_CONF="${TMPPDIR}/kryoptic.conf"
+cat >"${KRYOPTIC_CONF}" <<_EOF
+[[slots]]
+slot = 42
+dbtype = "nssdb"
+dbpath = "${TOKDIR}"
+description = "The NSS DB"
+_EOF
+
+# the rest is the same
+source "${TESTSSRCDIR}/kryoptic-init.sh"
diff --git a/tests/kryoptic-init.sh b/tests/kryoptic-init.sh
@@ -26,8 +26,7 @@ find_kryoptic \
 
 title LINE "Creating Kyroptic database"
 
-# Kryoptic configuration
-export KRYOPTIC_CONF="$TOKDIR/kryoptic.sql"
+# Kryoptic configuration set by the caller
 
 export TOKENLABEL="Kryoptic Token"
 export TOKENLABELURI="Kryoptic%20Token"

diff --git a/tests/meson.build b/tests/meson.build
@@ -31,7 +31,7 @@ if nss_softokn.found()
 endif
 
 setup_script=find_program('setup.sh')
-foreach suite : ['softokn', 'softhsm', 'kryoptic']
+foreach suite : ['softokn', 'softhsm', 'kryoptic', 'kryoptic-nss']
   test(
     'setup',
     setup_script,
@@ -118,29 +118,29 @@ foreach t, sources : test_programs
 endforeach
 
 tests = {
-  'basic': {'suites': ['softokn', 'softhsm', 'kryoptic']},
-  'pubkey': {'suites': ['softokn', 'softhsm', 'kryoptic']},
-  'certs': {'suites': ['softokn', 'softhsm', 'kryoptic']},
-  'ecc': {'suites': ['softokn', 'softhsm', 'kryoptic']},
-  'edwards': {'suites': ['softhsm', 'kryoptic']},
-  'ecdh': {'suites': ['softokn', 'kryoptic']},
-  'democa': {'suites': ['softokn', 'softhsm', 'kryoptic'], 'is_parallel': false},
-  'digest': {'suites': ['softokn', 'softhsm', 'kryoptic']},
-  'fork': {'suites': ['softokn', 'softhsm', 'kryoptic']},
-  'oaepsha2': {'suites': ['softokn', 'kryoptic']},
-  'hkdf': {'suites': ['softokn', 'kryoptic']},
-  'imported' : {'suites': ['softokn', 'kryoptic']},
-  'rsapss': {'suites': ['softokn', 'softhsm', 'kryoptic']},
+  'basic': {'suites': ['softokn', 'softhsm', 'kryoptic', 'kryoptic-nss']},
+  'pubkey': {'suites': ['softokn', 'softhsm', 'kryoptic', 'kryoptic-nss']},
+  'certs': {'suites': ['softokn', 'softhsm', 'kryoptic', 'kryoptic-nss']},
+  'ecc': {'suites': ['softokn', 'softhsm', 'kryoptic', 'kryoptic-nss']},
+  'edwards': {'suites': ['softhsm', 'kryoptic', 'kryoptic-nss']},
+  'ecdh': {'suites': ['softokn', 'kryoptic', 'kryoptic-nss']},
+  'democa': {'suites': ['softokn', 'softhsm', 'kryoptic', 'kryoptic-nss'], 'is_parallel': false},
+  'digest': {'suites': ['softokn', 'softhsm', 'kryoptic', 'kryoptic-nss']},
+  'fork': {'suites': ['softokn', 'softhsm', 'kryoptic', 'kryoptic-nss']},
+  'oaepsha2': {'suites': ['softokn', 'kryoptic', 'kryoptic-nss']},
+  'hkdf': {'suites': ['softokn', 'kryoptic', 'kryoptic-nss']},
+  'imported' : {'suites': ['softokn', 'kryoptic', 'kryoptic-nss']},
+  'rsapss': {'suites': ['softokn', 'softhsm', 'kryoptic', 'kryoptic-nss']},
   'rsapssam': {'suites': ['softhsm']},
-  'genkey': {'suites': ['softokn', 'softhsm', 'kryoptic']},
-  'session': {'suites': ['softokn', 'softhsm', 'kryoptic']},
-  'rand': {'suites': ['softokn', 'softhsm', 'kryoptic']},
-  'readkeys': {'suites': ['softokn', 'softhsm', 'kryoptic']},
-  'tls': {'suites': ['softokn', 'softhsm', 'kryoptic'], 'is_parallel': false},
-  'tlsfuzzer': {'suites': ['softokn', 'softhsm', 'kryoptic']},
-  'uri': {'suites': ['softokn', 'softhsm', 'kryoptic']},
-  'ecxc': {'suites': ['softhsm', 'kryoptic']},
-  'cms': {'suites': ['softokn', 'kryoptic']},
+  'genkey': {'suites': ['softokn', 'softhsm', 'kryoptic', 'kryoptic-nss']},
+  'session': {'suites': ['softokn', 'softhsm', 'kryoptic', 'kryoptic-nss']},
+  'rand': {'suites': ['softokn', 'softhsm', 'kryoptic', 'kryoptic-nss']},
+  'readkeys': {'suites': ['softokn', 'softhsm', 'kryoptic', 'kryoptic-nss']},
+  'tls': {'suites': ['softokn', 'softhsm', 'kryoptic', 'kryoptic-nss'], 'is_parallel': false},
+  'tlsfuzzer': {'suites': ['softokn', 'softhsm', 'kryoptic', 'kryoptic-nss']},
+  'uri': {'suites': ['softokn', 'softhsm', 'kryoptic', 'kryoptic-nss']},
+  'ecxc': {'suites': ['softhsm', 'kryoptic', 'kryoptic-nss']},
+  'cms': {'suites': ['softokn', 'kryoptic', 'kryoptic-nss']},
   'pinlock': {'suites': ['kryoptic']},
 }
 

diff --git a/tests/setup.sh b/tests/setup.sh
@@ -30,7 +30,10 @@ if [ "${TOKENTYPE}" == "softhsm" ]; then
 elif [ "${TOKENTYPE}" == "softokn" ]; then
     source "${TESTSSRCDIR}/softokn-init.sh"
 elif [ "${TOKENTYPE}" == "kryoptic" ]; then
+    export KRYOPTIC_CONF="$TOKDIR/kryoptic.sql"
     source "${TESTSSRCDIR}/kryoptic-init.sh"
+elif [ "${TOKENTYPE}" == "kryoptic-nss" ]; then
+    source "${TESTSSRCDIR}/kryoptic-init-nss.sh"
 else
     echo "Unknown token type: $1"
     exit 1