RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2025-02-16 22:06:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

- naddy@cvs.openbsd.org 2012/06/29 13:57:25

Browse Source 
[ssh_config.5 sshd_config.5]
     match the documented MAC order of preference to the actual one;
     ok dtucker@
This commit is contained in:
Darren Tucker 2012-07-02 18:53:37 +10:00
parent 14a9d2515b
commit ecbf14aa53
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -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 20120629
- OpenBSD CVS Sync - OpenBSD CVS Sync
- dtucker@cvs.openbsd.org 2012/06/21 00:16:07 - dtucker@cvs.openbsd.org 2012/06/21 00:16:07

8
ssh_config.5
View File

@ -33,8 +33,8 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" 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 $ .\" $OpenBSD: ssh_config.5,v 1.157 2012/06/29 13:57:25 naddy Exp $
.Dd $Mdocdate: June 28 2012 $ .Dd $Mdocdate: June 29 2012 $
.Dt SSH_CONFIG 5 .Dt SSH_CONFIG 5
.Os .Os
.Sh NAME .Sh NAME
@ -793,8 +793,8 @@ Multiple algorithms must be comma-separated.
The default is: The default is:
.Bd -literal -offset indent .Bd -literal -offset indent
hmac-md5,hmac-sha1,umac-64@openssh.com, hmac-md5,hmac-sha1,umac-64@openssh.com,
hmac-ripemd160,hmac-sha1-96,hmac-md5-96, hmac-sha2-256,hmac-sha2-512,hmac-ripemd160,
hmac-sha2-256,hmac-sha2-512 hmac-sha1-96,hmac-md5-96
.Ed .Ed
.It Cm NoHostAuthenticationForLocalhost .It Cm NoHostAuthenticationForLocalhost
This option can be used if the home directory is shared across machines. This option can be used if the home directory is shared across machines.

8
sshd_config.5
View File

@ -33,8 +33,8 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" 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 $ .\" $OpenBSD: sshd_config.5,v 1.144 2012/06/29 13:57:25 naddy Exp $
.Dd $Mdocdate: June 28 2012 $ .Dd $Mdocdate: June 29 2012 $
.Dt SSHD_CONFIG 5 .Dt SSHD_CONFIG 5
.Os .Os
.Sh NAME .Sh NAME
@ -657,8 +657,8 @@ Multiple algorithms must be comma-separated.
The default is: The default is:
.Bd -literal -offset indent .Bd -literal -offset indent
hmac-md5,hmac-sha1,umac-64@openssh.com, hmac-md5,hmac-sha1,umac-64@openssh.com,
hmac-ripemd160,hmac-sha1-96,hmac-md5-96, hmac-sha2-256,hmac-sha2-512,hmac-ripemd160,
hmac-sha2-256,hmac-sha2-512 hmac-sha1-96,hmac-md5-96
.Ed .Ed
.It Cm Match .It Cm Match
Introduces a conditional block. Introduces a conditional block.