Use `sign-ed25519` for the feature name

`libsodium` is an implementation detail.  In particular, I'd like
to consider using OpenSSL for ed25519 (if libsodium isn't configured
and openssl is).

So switch the name of the exposed feature and adjust the tests.

diff --git a/configure.ac b/configure.ac
index 5d9d2a23766b364a9ce844974c6a40cc82f1d6bc..92e47b2ac75e1c445149c156d6c35d50c9126c2e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -253,7 +253,7 @@ AS_IF([test x$with_libsodium != xno], [
     AS_IF([ test x$have_libsodium = xno ], [
        AC_MSG_ERROR([Need LIBSODIUM version $LIBSODIUM_DEPENDENCY or later])
     ])
-    OSTREE_FEATURES="$OSTREE_FEATURES libsodium"
+    OSTREE_FEATURES="$OSTREE_FEATURES sign-ed25519"
 ], with_libsodium=no )
 AM_CONDITIONAL(USE_LIBSODIUM, test "x$have_libsodium" = xyes)
 

diff --git a/tests/libtest.sh b/tests/libtest.sh
index c473fd82df90dcca928698f92e54b6ba759af4c1..315c4df501e564e6cc1ac397219fb5e2cc36e108 100755 (executable)
--- a/tests/libtest.sh
+++ b/tests/libtest.sh
@@ -679,10 +679,10 @@ libtest_cleanup_gpg () {
 }
 libtest_exit_cmds+=(libtest_cleanup_gpg)
 
-has_libsodium () {
+has_sign_ed25519 () {
     local ret
     ${CMD_PREFIX} ostree --version > version.txt
-    grep -q -e '- libsodium' version.txt
+    grep -q -e '- sign-ed25519' version.txt
     ret=$?
     rm -f version.txt
     return ${ret}

diff --git a/tests/test-local-pull.sh b/tests/test-local-pull.sh
index 8cbc97328e39c5fc5c02f71d506ecad411e6c8d2..d443421ad237005647517296d65881f1342584af 100755 (executable)
--- a/tests/test-local-pull.sh
+++ b/tests/test-local-pull.sh
@@ -116,7 +116,7 @@ for src_object in `find repo/objects -name '*.filez'`; do
 done
 echo "ok pull-local z2 to z2 default hardlink"
 
-if has_libsodium; then
+if has_sign_ed25519; then
     gen_ed25519_keys
 
     mkdir repo8

diff --git a/tests/test-signed-commit.sh b/tests/test-signed-commit.sh
index 3ac3f3c13ad0898005506e72faad41e9ff9fc6a5..dd76f28ff5f89b717b33681ccba1f3fde3da0cbe 100755 (executable)
--- a/tests/test-signed-commit.sh
+++ b/tests/test-signed-commit.sh
@@ -63,7 +63,7 @@ assert_file_has_content_literal err.txt ' No valid signatures found'
 echo "ok dummy sig requires env"
 
 # tests below require libsodium support
-if ! has_libsodium; then
+if ! has_sign_ed25519; then
     echo "ok Detached ed25519 signature # SKIP due libsodium unavailability"
     echo "ok ed25519 signature verified # SKIP due libsodium unavailability"
     echo "ok multiple signing # SKIP due libsodium unavailability"

diff --git a/tests/test-signed-pull-summary.sh b/tests/test-signed-pull-summary.sh
index 7a7dd073c0232c5196b32948587297b684cfa735..6a2406351c3044fca46cd0c874e010a046a6e171 100755 (executable)
--- a/tests/test-signed-pull-summary.sh
+++ b/tests/test-signed-pull-summary.sh
@@ -51,7 +51,7 @@ do
             PUBLIC_KEY="dummysign"
             ;;
         ed25519)
-            if ! has_libsodium; then
+            if ! has_sign_ed25519; then
                 echo "ok ${engine} pull mirror summary # SKIP due libsodium unavailability"
                 echo "ok ${engine} pull with signed summary # SKIP due libsodium unavailability"
                 echo "ok ${engine} prune summary cache # SKIP due libsodium unavailability"
@@ -173,7 +173,7 @@ do
 
 done
 
-if ! has_libsodium; then
+if ! has_sign_ed25519; then
     echo "ok ${engine} pull with signed summary remote old summary # SKIP due libsodium unavailability"
     echo "ok ${engine} pull with signed summary broken cache # SKIP due libsodium unavailability"
     exit 0

diff --git a/tests/test-signed-pull.sh b/tests/test-signed-pull.sh
index a8d52bc537ba17f70138714a10e81c1cc0847cf9..075c5f2bd62090463fdd319560f019457c4ecd2e 100755 (executable)
--- a/tests/test-signed-pull.sh
+++ b/tests/test-signed-pull.sh
@@ -98,7 +98,7 @@ ${CMD_PREFIX} ostree --repo=repo config set 'remote "origin"'.verification-dummy
 ${CMD_PREFIX} ostree --repo=repo config unset 'remote "origin"'.verification-dummy-file
 test_signed_pull "dummy" ""
 
-if ! has_libsodium; then
+if ! has_sign_ed25519; then
     echo "ok ed25519-key pull signed commit # SKIP due libsodium unavailability"
     echo "ok ed25519-key re-pull signature for stored commit # SKIP due libsodium unavailability"
     echo "ok ed25519-key+file pull signed commit # SKIP due libsodium unavailability"