26 lines
894 B
Diff
26 lines
894 B
Diff
From ed807a40c6683960e357bc995b3acf721ec088b4 Mon Sep 17 00:00:00 2001
|
|
From: Sitaram Chamarty <sitaram@atc.tcs.com>
|
|
Date: Thu, 19 Mar 2015 05:17:59 +0530
|
|
Subject: [PATCH] openssh 6.8 compat
|
|
|
|
---
|
|
src/triggers/post-compile/ssh-authkeys | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
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;
|
|
}
|
|
--
|
|
2.2.1
|
|
|