packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2072 from cgwalters/feature-ed25519 

Use `sign-ed25519` for the feature name
This commit is contained in:
OpenShift Merge Robot 2020-04-16 13:29:36 -07:00 committed by GitHub
parent eae41ea203 d1e5ed379e
commit 5092a8feac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -253,7 +253,7 @@ AS_IF([test x$with_libsodium != xno], [
AS_IF([ test x$have_libsodium = xno ], [ AS_IF([ test x$have_libsodium = xno ], [
AC_MSG_ERROR([Need LIBSODIUM version $LIBSODIUM_DEPENDENCY or later]) AC_MSG_ERROR([Need LIBSODIUM version $LIBSODIUM_DEPENDENCY or later])
]) ])
OSTREE_FEATURES="$OSTREE_FEATURES libsodium" OSTREE_FEATURES="$OSTREE_FEATURES sign-ed25519"
], with_libsodium=no ) ], with_libsodium=no )
AM_CONDITIONAL(USE_LIBSODIUM, test "x$have_libsodium" = xyes) AM_CONDITIONAL(USE_LIBSODIUM, test "x$have_libsodium" = xyes)

4
tests/libtest.sh
View File

@ -679,10 +679,10 @@ libtest_cleanup_gpg () {
} }
libtest_exit_cmds+=(libtest_cleanup_gpg) libtest_exit_cmds+=(libtest_cleanup_gpg)
has_libsodium () { has_sign_ed25519 () {
local ret local ret
${CMD_PREFIX} ostree --version > version.txt ${CMD_PREFIX} ostree --version > version.txt
grep -q -e '- libsodium' version.txt grep -q -e '- sign-ed25519' version.txt
ret=$? ret=$?
rm -f version.txt rm -f version.txt
return ${ret} return ${ret}

2
tests/test-local-pull.sh
View File

@ -116,7 +116,7 @@ for src_object in `find repo/objects -name '*.filez'`; do
done done
echo "ok pull-local z2 to z2 default hardlink" echo "ok pull-local z2 to z2 default hardlink"
if has_libsodium; then if has_sign_ed25519; then
gen_ed25519_keys gen_ed25519_keys
mkdir repo8 mkdir repo8

2
tests/test-signed-commit.sh
View File

@ -63,7 +63,7 @@ assert_file_has_content_literal err.txt ' No valid signatures found'
echo "ok dummy sig requires env" echo "ok dummy sig requires env"
# tests below require libsodium support # 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 Detached ed25519 signature # SKIP due libsodium unavailability"
echo "ok ed25519 signature verified # SKIP due libsodium unavailability" echo "ok ed25519 signature verified # SKIP due libsodium unavailability"
echo "ok multiple signing # SKIP due libsodium unavailability" echo "ok multiple signing # SKIP due libsodium unavailability"

4
tests/test-signed-pull-summary.sh
View File

@ -51,7 +51,7 @@ do
PUBLIC_KEY="dummysign" PUBLIC_KEY="dummysign"
;; ;;
ed25519) ed25519)
if ! has_libsodium; then if ! has_sign_ed25519; then
echo "ok ${engine} pull mirror summary # SKIP due libsodium unavailability" echo "ok ${engine} pull mirror summary # SKIP due libsodium unavailability"
echo "ok ${engine} pull with signed 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" echo "ok ${engine} prune summary cache # SKIP due libsodium unavailability"
@ -173,7 +173,7 @@ do
done 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 remote old summary # SKIP due libsodium unavailability"
echo "ok ${engine} pull with signed summary broken cache # SKIP due libsodium unavailability" echo "ok ${engine} pull with signed summary broken cache # SKIP due libsodium unavailability"
exit 0 exit 0

2
tests/test-signed-pull.sh
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 ${CMD_PREFIX} ostree --repo=repo config unset 'remote "origin"'.verification-dummy-file
test_signed_pull "dummy" "" 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 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 re-pull signature for stored commit # SKIP due libsodium unavailability"
echo "ok ed25519-key+file pull signed commit # SKIP due libsodium unavailability" echo "ok ed25519-key+file pull signed commit # SKIP due libsodium unavailability"