diff options
| author | dtucker <dtucker> | 2012-07-02 08:53:37 +0000 |
|---|---|---|
| committer | dtucker <dtucker> | 2012-07-02 08:53:37 +0000 |
| commit | e473eee669909006f0c487d4a65d2e2753137b26 (patch) | |
| tree | a1ced9762b4b36dceabf60c1100c822657780c97 | |
| parent | d0556a4c93ad6caa9d4e4b1ed11522988d6c631f (diff) | |
| download | openssh-e473eee669909006f0c487d4a65d2e2753137b26.tar.gz | |
- naddy@cvs.openbsd.org 2012/06/29 13:57:25
[ssh_config.5 sshd_config.5]
match the documented MAC order of preference to the actual one;
ok dtucker@
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ssh_config.5 | 8 | ||||
| -rw-r--r-- | sshd_config.5 | 8 |
3 files changed, 15 insertions, 8 deletions
@@ -1,3 +1,10 @@ +20120702 +- (dtucker) OpenBSD CVS Sync + - naddy@cvs.openbsd.org 2012/06/29 13:57:25 + [ssh_config.5 sshd_config.5] + match the documented MAC order of preference to the actual one; + ok dtucker@ + 20120629 - OpenBSD CVS Sync - dtucker@cvs.openbsd.org 2012/06/21 00:16:07 diff --git a/ssh_config.5 b/ssh_config.5 index db7ea5cd..36b1af19 100644 --- a/ssh_config.5 +++ b/ssh_config.5 @@ -33,8 +33,8 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $OpenBSD: ssh_config.5,v 1.156 2012/06/28 05:07:45 dtucker Exp $ -.Dd $Mdocdate: June 28 2012 $ +.\" $OpenBSD: ssh_config.5,v 1.157 2012/06/29 13:57:25 naddy Exp $ +.Dd $Mdocdate: June 29 2012 $ .Dt SSH_CONFIG 5 .Os .Sh NAME @@ -793,8 +793,8 @@ Multiple algorithms must be comma-separated. The default is: .Bd -literal -offset indent hmac-md5,hmac-sha1,umac-64@openssh.com, -hmac-ripemd160,hmac-sha1-96,hmac-md5-96, -hmac-sha2-256,hmac-sha2-512 +hmac-sha2-256,hmac-sha2-512,hmac-ripemd160, +hmac-sha1-96,hmac-md5-96 .Ed .It Cm NoHostAuthenticationForLocalhost This option can be used if the home directory is shared across machines. diff --git a/sshd_config.5 b/sshd_config.5 index 897b8a41..314ecfb0 100644 --- a/sshd_config.5 +++ b/sshd_config.5 @@ -33,8 +33,8 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $OpenBSD: sshd_config.5,v 1.143 2012/06/28 05:07:45 dtucker Exp $ -.Dd $Mdocdate: June 28 2012 $ +.\" $OpenBSD: sshd_config.5,v 1.144 2012/06/29 13:57:25 naddy Exp $ +.Dd $Mdocdate: June 29 2012 $ .Dt SSHD_CONFIG 5 .Os .Sh NAME @@ -657,8 +657,8 @@ Multiple algorithms must be comma-separated. The default is: .Bd -literal -offset indent hmac-md5,hmac-sha1,umac-64@openssh.com, -hmac-ripemd160,hmac-sha1-96,hmac-md5-96, -hmac-sha2-256,hmac-sha2-512 +hmac-sha2-256,hmac-sha2-512,hmac-ripemd160, +hmac-sha1-96,hmac-md5-96 .Ed .It Cm Match Introduces a conditional block. |