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.
This commit is contained in:
Colin Walters 2020-04-16 16:43:43 +00:00
parent eae41ea203
commit d1e5ed379e
6 changed files with 8 additions and 8 deletions

View File

@ -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)

View File

@ -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}

View File

@ -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

View File

@ -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"

View File

@ -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

View File

@ -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"