Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Groom references to deprecated tangd-update script #500

Merged
merged 1 commit into from
Nov 7, 2024
Merged

Groom references to deprecated tangd-update script #500

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions src/pins/tang/tests/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,6 @@ kgen = find_program(
join_paths('/', 'usr', get_option('libexecdir'), 'tangd-keygen'),
required: false
)
updt = find_program(
join_paths(libexecdir, 'tangd-update'),
join_paths(get_option('prefix'), get_option('libdir'), 'tangd-update'),
join_paths(get_option('prefix'), get_option('libexecdir'), 'tangd-update'),
join_paths('/', 'usr', get_option('libdir'), 'tangd-update'),
join_paths('/', 'usr', get_option('libexecdir'), 'tangd-update'),
required: false
)
tang = find_program(
join_paths(libexecdir, 'tangd'),
join_paths(get_option('prefix'), get_option('libdir'), 'tangd'),
Expand All @@ -28,7 +20,6 @@ socat = find_program('socat', required: false)
tang_data = configuration_data()
tang_data.set('SOCAT', '')
tang_data.set('TANGD_KEYGEN', '')
tang_data.set('TANGD_UPDATE', '')
tang_data.set('TANGD', '')

if socat.found()
Expand All @@ -43,10 +34,6 @@ if tang.found()
tang_data.set('TANGD', tang.path())
endif

if updt.found()
sarroutbi marked this conversation as resolved.
Show resolved Hide resolved
tang_data.set('TANGD_UPDATE', updt.path())
endif

tang_tests_common = configure_file(
input: 'tang-common-test-functions.in',
output: 'tang-common-test-functions',
Expand Down
7 changes: 1 addition & 6 deletions src/pins/tang/tests/tang-common-test-functions.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@

SOCAT="@SOCAT@"
TANGD_KEYGEN="@TANGD_KEYGEN@"
TANGD_UPDATE="@TANGD_UPDATE@"
TANGD="@TANGD@"

tang_error() {
Expand Down Expand Up @@ -70,8 +69,6 @@ tang_remove_rotated_keys() {
pushd "${db}"
find . -name ".*.jwk" -exec rm -f {} \;
popd

[ -n "${TANGD_UPDATE}" ] && "${TANGD_UPDATE}" "${db}" "${basedir}/cache"
return 0
}

Expand Down Expand Up @@ -101,7 +98,6 @@ tang_new_keys() {
fi

"${TANGD_KEYGEN}" "${db}" ${sig_name} ${exc_name}
[ -n "${TANGD_UPDATE}" ] && "${TANGD_UPDATE}" "${db}" "${basedir}/cache"

return 0
}
Expand Down Expand Up @@ -152,8 +148,7 @@ tang_run() {
tang_error "Error creating new keys for tang server"
fi

local KEYS="${basedir}/cache"
[ -z "${TANGD_UPDATE}" ] && KEYS="${basedir}/db"
local KEYS="${basedir}/db"

local pid pidfile portfile
pidfile="${basedir}/tang.pid"
Expand Down