|
 |
ef20f4 |
From 53ecfcf6d934206e3daef4ed3515a0d6f098e276 Mon Sep 17 00:00:00 2001
|
|
|
ef20f4 |
From: Sergio Correia <scorreia@redhat.com>
|
|
|
ef20f4 |
Date: Wed, 16 Oct 2019 11:40:33 -0300
|
|
|
ef20f4 |
Subject: [PATCH 1/2] Adjust pin-tang test to account for newer tang without
|
|
|
ef20f4 |
tangd-update
|
|
|
ef20f4 |
|
|
|
ef20f4 |
---
|
|
|
ef20f4 |
src/pins/tang/meson.build | 9 ++-------
|
|
|
ef20f4 |
src/pins/tang/pin-tang | 11 ++++++++---
|
|
|
ef20f4 |
2 files changed, 10 insertions(+), 10 deletions(-)
|
|
|
ef20f4 |
|
|
|
ef20f4 |
diff --git a/src/pins/tang/meson.build b/src/pins/tang/meson.build
|
|
|
ef20f4 |
index 110d72d..061a79f 100644
|
|
|
ef20f4 |
--- a/src/pins/tang/meson.build
|
|
|
ef20f4 |
+++ b/src/pins/tang/meson.build
|
|
|
ef20f4 |
@@ -8,11 +8,6 @@ kgen = find_program(
|
|
|
ef20f4 |
'/usr/libexec/tangd-keygen',
|
|
|
ef20f4 |
required: false
|
|
|
ef20f4 |
)
|
|
|
ef20f4 |
-updt = find_program(
|
|
|
ef20f4 |
- join_paths(libexecdir, 'tangd-update'),
|
|
|
ef20f4 |
- '/usr/libexec/tangd-update',
|
|
|
ef20f4 |
- required: false
|
|
|
ef20f4 |
-)
|
|
|
ef20f4 |
tang = find_program(
|
|
|
ef20f4 |
join_paths(libexecdir, 'tangd'),
|
|
|
ef20f4 |
'/usr/libexec/tangd',
|
|
|
ef20f4 |
@@ -25,7 +20,7 @@ if curl.found()
|
|
|
ef20f4 |
bins += join_paths(meson.current_source_dir(), 'clevis-encrypt-tang')
|
|
|
ef20f4 |
mans += join_paths(meson.current_source_dir(), 'clevis-encrypt-tang.1')
|
|
|
ef20f4 |
|
|
|
ef20f4 |
- if actv.found() and kgen.found() and updt.found() and tang.found()
|
|
|
ef20f4 |
+ if actv.found() and kgen.found() and tang.found()
|
|
|
ef20f4 |
env = environment()
|
|
|
ef20f4 |
env.set('SD_ACTIVATE', actv.path())
|
|
|
ef20f4 |
env.append('PATH',
|
|
|
ef20f4 |
@@ -42,4 +37,4 @@ if curl.found()
|
|
|
ef20f4 |
endif
|
|
|
ef20f4 |
else
|
|
|
ef20f4 |
warning('Will not install tang pin due to missing dependencies!')
|
|
|
ef20f4 |
-endif
|
|
|
ef20f4 |
\ No newline at end of file
|
|
|
ef20f4 |
+endif
|
|
|
ef20f4 |
diff --git a/src/pins/tang/pin-tang b/src/pins/tang/pin-tang
|
|
|
ef20f4 |
index f420818..9dcc2da 100755
|
|
|
ef20f4 |
--- a/src/pins/tang/pin-tang
|
|
|
ef20f4 |
+++ b/src/pins/tang/pin-tang
|
|
|
ef20f4 |
@@ -31,18 +31,23 @@ mkdir -p $TMP/db
|
|
|
ef20f4 |
mkdir -p $TMP/cache
|
|
|
ef20f4 |
|
|
|
ef20f4 |
# Generate the server keys
|
|
|
ef20f4 |
+KEYS=$TMP/db
|
|
|
ef20f4 |
tangd-keygen $TMP/db sig exc
|
|
|
ef20f4 |
-tangd-update $TMP/db $TMP/cache
|
|
|
ef20f4 |
+if which tangd-update; then
|
|
|
ef20f4 |
+ tangd-update $TMP/db $TMP/cache
|
|
|
ef20f4 |
+ KEYS=$TMP/cache
|
|
|
ef20f4 |
+fi
|
|
|
ef20f4 |
|
|
|
ef20f4 |
# Start the server
|
|
|
ef20f4 |
port=`shuf -i 1024-65536 -n 1`
|
|
|
ef20f4 |
-$SD_ACTIVATE --inetd -l 127.0.0.1:$port -a tangd $TMP/cache &
|
|
|
ef20f4 |
+$SD_ACTIVATE --inetd -l 127.0.0.1:$port -a tangd $KEYS &
|
|
|
ef20f4 |
export PID=$!
|
|
|
ef20f4 |
sleep 0.25
|
|
|
ef20f4 |
|
|
|
ef20f4 |
thp=`jose jwk thp -i "$TMP/db/sig.jwk"`
|
|
|
ef20f4 |
-adv="$TMP/cache/default.jws"
|
|
|
ef20f4 |
url="http://localhost:${port}"
|
|
|
ef20f4 |
+adv="$TMP/adv"
|
|
|
ef20f4 |
+curl "$url/adv" -o $adv
|
|
|
ef20f4 |
|
|
|
ef20f4 |
cfg=`printf '{"url":"%s","adv":"%s"}' "$url" "$adv"`
|
|
|
ef20f4 |
enc=`echo -n "hi" | clevis encrypt tang "$cfg"`
|
|
|
ef20f4 |
--
|
|
|
ef20f4 |
2.21.0
|
|
|
ef20f4 |
|