diff options
author | Colin Watson <cjwatson@debian.org> | 2013-05-07 10:06:42 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2013-05-07 10:06:42 +0100 |
commit | ecebda56da46a03dafff923d91c382f31faa9eec (patch) | |
tree | 449614b6c06a2622c74a609b31fcc46c60037c56 /sshd.8 | |
parent | c6a2c0334e45419875687d250aed9bea78480f2e (diff) | |
parent | ffc06452028ba78cd693d4ed43df8b60a10d6163 (diff) |
merge 6.2p1; reorder additions to monitor.h for easier merging in future
Diffstat (limited to 'sshd.8')
-rw-r--r-- | sshd.8 | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -33,8 +33,8 @@ | |||
33 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 33 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
34 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 34 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
35 | .\" | 35 | .\" |
36 | .\" $OpenBSD: sshd.8,v 1.266 2012/06/18 12:07:07 dtucker Exp $ | 36 | .\" $OpenBSD: sshd.8,v 1.267 2012/10/04 13:21:50 markus Exp $ |
37 | .Dd $Mdocdate: June 18 2012 $ | 37 | .Dd $Mdocdate: October 4 2012 $ |
38 | .Dt SSHD 8 | 38 | .Dt SSHD 8 |
39 | .Os | 39 | .Os |
40 | .Sh NAME | 40 | .Sh NAME |
@@ -316,7 +316,7 @@ The client selects the encryption algorithm | |||
316 | to use from those offered by the server. | 316 | to use from those offered by the server. |
317 | Additionally, session integrity is provided | 317 | Additionally, session integrity is provided |
318 | through a cryptographic message authentication code | 318 | through a cryptographic message authentication code |
319 | (hmac-md5, hmac-sha1, umac-64, hmac-ripemd160, | 319 | (hmac-md5, hmac-sha1, umac-64, umac-128, hmac-ripemd160, |
320 | hmac-sha2-256 or hmac-sha2-512). | 320 | hmac-sha2-256 or hmac-sha2-512). |
321 | .Pp | 321 | .Pp |
322 | Finally, the server and the client enter an authentication dialog. | 322 | Finally, the server and the client enter an authentication dialog. |