summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2012-12-12 10:55:32 +1100
committerDamien Miller <djm@mindrot.org>2012-12-12 10:55:32 +1100
commitec7ce9ace470aad20aeea0769ddc998dea307830 (patch)
tree763e78c49e4ee1e3012489a62ef756a097777361
parent1fb593a3f198b75787c5c5974fe256122427d1d3 (diff)
- markus@cvs.openbsd.org 2012/12/11 23:12:13
[try-ciphers.sh] add hmac-ripemd160-etm@openssh.com
-rw-r--r--ChangeLog3
-rw-r--r--regress/try-ciphers.sh5
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 2fe093dad..05a3b078d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,6 +21,9 @@
21 - markus@cvs.openbsd.org 2012/12/11 22:42:11 21 - markus@cvs.openbsd.org 2012/12/11 22:42:11
22 [regress/Makefile regress/modpipe.c regress/integrity.sh] 22 [regress/Makefile regress/modpipe.c regress/integrity.sh]
23 test the integrity of the packets; with djm@ 23 test the integrity of the packets; with djm@
24 - markus@cvs.openbsd.org 2012/12/11 23:12:13
25 [try-ciphers.sh]
26 add hmac-ripemd160-etm@openssh.com
24 27
2520121207 2820121207
26 - (dtucker) OpenBSD CVS Sync 29 - (dtucker) OpenBSD CVS Sync
diff --git a/regress/try-ciphers.sh b/regress/try-ciphers.sh
index 46131f715..2b11b59ea 100644
--- a/regress/try-ciphers.sh
+++ b/regress/try-ciphers.sh
@@ -1,4 +1,4 @@
1# $OpenBSD: try-ciphers.sh,v 1.16 2012/12/11 22:32:56 markus Exp $ 1# $OpenBSD: try-ciphers.sh,v 1.17 2012/12/11 23:12:13 markus Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4tid="try ciphers" 4tid="try ciphers"
@@ -11,7 +11,8 @@ macs="hmac-sha1 hmac-md5 umac-64@openssh.com umac-128@openssh.com
11 hmac-sha1-96 hmac-md5-96 11 hmac-sha1-96 hmac-md5-96
12 hmac-sha1-etm@openssh.com hmac-md5-etm@openssh.com 12 hmac-sha1-etm@openssh.com hmac-md5-etm@openssh.com
13 umac-64-etm@openssh.com umac-128-etm@openssh.com 13 umac-64-etm@openssh.com umac-128-etm@openssh.com
14 hmac-sha1-96-etm@openssh.com hmac-md5-96-etm@openssh.com" 14 hmac-sha1-96-etm@openssh.com hmac-md5-96-etm@openssh.com
15 hmac-ripemd160-etm@openssh.com"
15config_defined HAVE_EVP_SHA256 && 16config_defined HAVE_EVP_SHA256 &&
16 macs="$macs hmac-sha2-256 hmac-sha2-512 17 macs="$macs hmac-sha2-256 hmac-sha2-512
17 hmac-sha2-256-etm@openssh.com hmac-sha2-512-etm@openssh.com" 18 hmac-sha2-256-etm@openssh.com hmac-sha2-512-etm@openssh.com"