diff options
| author |   djm <djm@openbsd.org> | 2011-08-02 01:22:11 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2011-08-02 01:22:11 +0000 |
| commit | 9fd848c718d94e9a3925ea22606bf7f6b7d32dd9 (patch) | |
| tree | d20e17f6aa93a5353c0caf7b63f1e0d0441e3e2b /usr.bin/ssh/sshd_config.5 | |
| parent | stop using the word 'firmwares' (diff) | |
| download | wireguard-openbsd-9fd848c718d94e9a3925ea22606bf7f6b7d32dd9.tar.xz wireguard-openbsd-9fd848c718d94e9a3925ea22606bf7f6b7d32dd9.zip | |
Add new SHA256 and SHA512 based HMAC modes from
http://www.ietf.org/id/draft-dbider-sha2-mac-for-ssh-02.txt
feedback and ok markus@
Diffstat (limited to 'usr.bin/ssh/sshd_config.5')
| -rw-r--r-- | usr.bin/ssh/sshd_config.5 | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/usr.bin/ssh/sshd_config.5 b/usr.bin/ssh/sshd_config.5 index a8f46c4d256..5b0a610baeb 100644 --- a/usr.bin/ssh/sshd_config.5 +++ b/usr.bin/ssh/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.134 2011/06/22 21:57:01 djm Exp $ -.Dd $Mdocdate: June 22 2011 $ +.\" $OpenBSD: sshd_config.5,v 1.135 2011/08/02 01:22:11 djm Exp $ +.Dd $Mdocdate: August 2 2011 $ .Dt SSHD_CONFIG 5 .Os .Sh NAME @@ -656,7 +656,9 @@ 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-ripemd160,hmac-sha1-96,hmac-md5-96, +hmac-sha2-256,hmac-sha256-96,hmac-sha2-512, +hmac-sha2-512-96 .Ed .It Cm Match Introduces a conditional block. |