diff options
| author | dtucker <dtucker> | 2012-10-05 01:02:39 +0000 |
|---|---|---|
| committer | dtucker <dtucker> | 2012-10-05 01:02:39 +0000 |
| commit | f4a3e9e60f8ab3996eb8636e8994f500ab0adcf3 (patch) | |
| tree | b0621d2df50328534fbfba1652d055009bf297c7 /ssh_config.5 | |
| parent | d108efd707127411634cf77909db7b03b12efe37 (diff) | |
| download | openssh-f4a3e9e60f8ab3996eb8636e8994f500ab0adcf3.tar.gz | |
- 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 'ssh_config.5')
| -rw-r--r-- | ssh_config.5 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ssh_config.5 b/ssh_config.5 index 36b1af19..d3e801df 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.157 2012/06/29 13:57:25 naddy Exp $ -.Dd $Mdocdate: June 29 2012 $ +.\" $OpenBSD: ssh_config.5,v 1.158 2012/10/04 13:21:50 markus Exp $ +.Dd $Mdocdate: October 4 2012 $ .Dt SSH_CONFIG 5 .Os .Sh NAME @@ -792,7 +792,7 @@ for data integrity protection. Multiple algorithms must be comma-separated. The default is: .Bd -literal -offset indent -hmac-md5,hmac-sha1,umac-64@openssh.com, +hmac-md5,hmac-sha1,umac-64@openssh.com,umac-128@openssh.com, hmac-sha2-256,hmac-sha2-512,hmac-ripemd160, hmac-sha1-96,hmac-md5-96 .Ed |