diff options
author | Darren Tucker <dtucker@zip.com.au> | 2012-10-05 11:02:39 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2012-10-05 11:02:39 +1000 |
commit | 427e409e99d465118fbc2f7c1ca2c5d44365f5a8 (patch) | |
tree | 13b60a8b85469f596ffef7f57f086b24ec1f4551 /sshd.8 | |
parent | 0dc283b13acdd4926dec1289b94badc3bbc7f321 (diff) |
- markus@cvs.openbsd.org 2012/10/04 13:21:50
[myproposal.h ssh_config.5 umac.h sshd_config.5 ssh.1 sshd.8 mac.c]
add umac128 variant; ok djm@ at n2k12
(note: further Makefile work is required)
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. |