aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSitaram Chamarty <sitaram@atc.tcs.com>2015-03-19 05:17:59 +0530
committerSitaram Chamarty <sitaram@atc.tcs.com>2015-03-19 12:59:20 +0530
commited807a40c6683960e357bc995b3acf721ec088b4 (patch)
tree3990ac2737e81971dceedba8f177bca42fb77012
parentallow repo symlinks while still being paranoid... (diff)
downloadgitolite-gentoo-ed807a40c6683960e357bc995b3acf721ec088b4.tar.gz
gitolite-gentoo-ed807a40c6683960e357bc995b3acf721ec088b4.tar.bz2
gitolite-gentoo-ed807a40c6683960e357bc995b3acf721ec088b4.zip
openssh 6.8 compat
-rwxr-xr-xsrc/triggers/post-compile/ssh-authkeys2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/triggers/post-compile/ssh-authkeys b/src/triggers/post-compile/ssh-authkeys
index 84dda73..d5f5d8b 100755
--- a/src/triggers/post-compile/ssh-authkeys
+++ b/src/triggers/post-compile/ssh-authkeys
@@ -115,7 +115,7 @@ sub fp_file {
my $f = shift;
my $fp = `ssh-keygen -l -f '$f'`;
chomp($fp);
- _die "fingerprinting failed for '$f'" unless $fp =~ /([0-9a-f][0-9a-f](:[0-9a-f][0-9a-f])+)/;
+ _die "fingerprinting failed for '$f'" unless $fp =~ /([0-9a-f][0-9a-f](:[0-9a-f][0-9a-f])+)/ or $fp =~ m(SHA256:([A-ZA-z0-9+/]+));
$fp = $1;
return $fp;
}