Merge remote-tracking branch 'origin/master' into ev/i

docs/2.0/admin-guide.md

@@ -203,12 +203,12 @@ teleport:
     # Key exchange algorithms that the server supports. This section only needs
     # to be set if you want to override the defaults.
     kex_algos:
-      - kexAlgoCurve25519SHA256
-      - kexAlgoECDH256
-      - kexAlgoECDH384
-      - kexAlgoECDH521
-      - kexAlgoDH14SHA1
-      - kexAlgoDH1SHA1
+      - curve25519-sha256@libssh.org
+      - ecdh-sha2-nistp256
+      - ecdh-sha2-nistp384
+      - ecdh-sha2-nistp521
+      - diffie-hellman-group14-sha1
+      - diffie-hellman-group1-sha1
 
     # Message authentication code (MAC) algorithms that the server supports.
     # This section only needs to be set if you want to override the defaults.

tool/tsh/main.go

@@ -17,13 +17,25 @@ limitations under the License.
 package main
 
 import (
+	"os"
+	"path"
+
 	"github.com/gravitational/teleport/tool/tsh/common"
 )
 
-import (
-	"os"
-)
-
 func main() {
-	common.Run(os.Args[1:], false)
+	cmd_line_orig := os.Args[1:]
+	cmd_line := []string{}
+
+	// lets see: if the executable name is 'ssh' or 'scp' we convert
+	// that to "tsh ssh" or "tsh scp"
+	switch path.Base(os.Args[0]) {
+	case "ssh":
+		cmd_line = append([]string{"ssh"}, cmd_line_orig...)
+	case "scp":
+		cmd_line = append([]string{"scp"}, cmd_line_orig...)
+	default:
+		cmd_line = cmd_line_orig
+	}
+	common.Run(cmd_line, false)
 }