Changeset 2035 in ProjectBuilder for devel/pb

Timestamp:

Feb 17, 2016, 4:08:10 PM (8 years ago)

Author:

Bruno Cornec

Message:

• Adds support for ECDSA for openssh7 which doesn't support DSA by default anymore

File:

• devel/pb/bin/pb (modified) (2 diffs)

devel/pb/bin/pb

@@ -4517 +4517 @@
 
 # We have specific keys by default
-$keyfile = "$ENV{'HOME'}/.ssh/pb_dsa";
+$keyfile = "$ENV{'HOME'}/.ssh/pb_ecdsa";
 if (!(-e $keyfile) && ($create eq 1)) {
-    pb_system("ssh-keygen -q -b 1024 -N '' -f $keyfile -t dsa","Generating SSH keys for pb");
+    my $res = pb_system("ssh-keygen -q -b 1024 -N '' -f $keyfile -t ecdsa","Generating ECDSA SSH keys for pb");
+    $keyfile = "$ENV{'HOME'}/.ssh/pb_dsa";
+    if (($res != 0) && !(-e $keyfile) && ($create eq 1)) {
+        # ecdsa may not be supported if old ssh
+        pb_system("ssh-keygen -q -b 1024 -N '' -f $keyfile -t dsa","Generating DSA SSH keys for pb");
+    }
 }
 
@@ -4525 +4530 @@
 $keyfile = "$ENV{'HOME'}/.ssh/id_dsa" if (-s "$ENV{'HOME'}/.ssh/id_dsa");
 $keyfile = "$ENV{'HOME'}/.ssh/pb_dsa" if (-s "$ENV{'HOME'}/.ssh/pb_dsa");
+$keyfile = "$ENV{'HOME'}/.ssh/pb_ecdsa" if (-s "$ENV{'HOME'}/.ssh/pb_ecdsa");
 die "Unable to find your public ssh key under $ENV{'HOME'}/.ssh" if (not defined $keyfile);
 return($keyfile);