Skip to content

Commit e5ed643

Browse files
committed
Release v1.301
2 parents c2380bb + 732bb8a commit e5ed643

File tree

2 files changed

+15
-2
lines changed

2 files changed

+15
-2
lines changed

README.pod

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,13 @@ L<the commit log|https://github.com/dolmen/github-keygen/commits/release>.
256256

257257
=over 4
258258

259+
=item v1.301
260+
261+
Remove C<UseRoaming> option if OpenSSH >= 7.3
262+
(Mac OS X Sierra,
263+
L<issue #31|https://github.com/dolmen/github-keygen/issues/31>):
264+
this option has been removed from OpenSSH.
265+
259266
=item v1.300
260267

261268
Keys registered in F<~/.ssh/config> are now compared with keys registered on

github-keygen

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9088,7 +9088,7 @@ use Sys::Hostname;
90889088

90899089
use constant HAS_TEXT_DIFF => eval { require Text::Diff; 1 };
90909090

9091-
our $VERSION = '1.300';
9091+
our $VERSION = '1.301';
90929092

90939093
use constant {
90949094
PROG => (File::Spec->splitpath($0))[2],
@@ -9714,7 +9714,7 @@ EOF
97149714
# UseRoaming was an undocumented option that is a security issue
97159715
# if enabled when connecting to a malicious server.
97169716
# http://www.openssh.com/txt/release-7.1p2
9717-
$supported_options{useroaming}++ if $SSH_VERSION >= 0x5400;
9717+
$supported_options{useroaming}++ if $SSH_VERSION >= 0x5400 && $SSH_VERSION < 0x7300;
97189718
while (<$fh>) {
97199719
$supported_options{lc $1}++ if /^\.It Cm ([A-Z]\S+)/
97209720
}
@@ -9741,6 +9741,12 @@ EOF
97419741
if ($SSH_VERSION < 0x5000) {
97429742
s/^(KexAlgorithms|MACs|Control(?:Persist|Path)) /##$1 / for @ghkg_config_lines;
97439743
}
9744+
# Option UseRoaming appeared in 5.4 (but undocumented), is deprecated in 7.2 and
9745+
# removed in 7.3
9746+
if ($SSH_VERSION >= 0x7300) {
9747+
# option is deprecated in 7.2, but removed in 7.3
9748+
@ghkg_config_lines = grep !/^UseRoaming /, @ghkg_config_lines;
9749+
}
97449750
if ($SSH_VERSION < 0x5400) {
97459751
s/^(UseRoaming )/##$1/ for @ghkg_config_lines;
97469752
}

0 commit comments

Comments
 (0)