aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2016-01-12 23:31:39 -0800
committerRobin H. Johnson <robbat2@gentoo.org>2016-01-12 23:33:49 -0800
commitb39fbd11500f352770394e4b3ea0a69ac530d5a7 (patch)
tree73d688f7e22d1b731725a7bdbd4ace2aa2472d21
parentsskm: use new ssh fingerprint functions. (diff)
downloadgitolite-gentoo-wip-sshfp.tar.gz
gitolite-gentoo-wip-sshfp.tar.bz2
gitolite-gentoo-wip-sshfp.zip
ukm: use new ssh fingerprint functions.wip-sshfp
UKM was never updated for new-style fingerprints at all. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-rwxr-xr-xcontrib/commands/ukm8
1 files changed, 4 insertions, 4 deletions
diff --git a/contrib/commands/ukm b/contrib/commands/ukm
index 8a2d361..3683154 100755
--- a/contrib/commands/ukm
+++ b/contrib/commands/ukm
@@ -220,10 +220,10 @@ sub cd_temp_clone {
# compute the fingerprint from the full path of a pubkey file
sub fingerprint {
- my $fp = `ssh-keygen -l -f $_[0]`;
- die "does not seem to be a valid pubkey\n"
- unless $fp =~ /(([0-9a-f]+:)+[0-9a-f]+) /i;
- return $1;
+ my ($fp, $output) = ssh_fingerprint_file(shift);
+ # Do not print the output of $output to an untrusted destination.
+ die "does not seem to be a valid pubkey\n" unless $fp;
+ return $fp;
}