summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2012-12-12 10:52:07 +1100
committerDamien Miller <djm@mindrot.org>2012-12-12 10:52:07 +1100
commit1a45b63d7b4fe34e18ab4cc669669003e6f8e403 (patch)
tree734a561fdb98e17a6af3f335b91016b7f4c2624f
parent74f13bdf26fc9ef29b9789d7004817ab7e7a295a (diff)
- markus@cvs.openbsd.org 2012/12/11 22:32:56
[regress/try-ciphers.sh] add etm modes
-rw-r--r--ChangeLog3
-rw-r--r--regress/try-ciphers.sh10
2 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 425f7276b..49ee0eb00 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,9 @@
15 - sthen@cvs.openbsd.org 2012/12/11 22:51:45 15 - sthen@cvs.openbsd.org 2012/12/11 22:51:45
16 [mac.c] 16 [mac.c]
17 fix typo, s/tem/etm in hmac-ripemd160-tem. ok markus@ 17 fix typo, s/tem/etm in hmac-ripemd160-tem. ok markus@
18 - markus@cvs.openbsd.org 2012/12/11 22:32:56
19 [regress/try-ciphers.sh]
20 add etm modes
18 21
1920121207 2220121207
20 - (dtucker) OpenBSD CVS Sync 23 - (dtucker) OpenBSD CVS Sync
diff --git a/regress/try-ciphers.sh b/regress/try-ciphers.sh
index cf6014297..46131f715 100644
--- a/regress/try-ciphers.sh
+++ b/regress/try-ciphers.sh
@@ -1,4 +1,4 @@
1# $OpenBSD: try-ciphers.sh,v 1.15 2012/10/05 02:20:48 dtucker Exp $ 1# $OpenBSD: try-ciphers.sh,v 1.16 2012/12/11 22:32:56 markus Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4tid="try ciphers" 4tid="try ciphers"
@@ -8,9 +8,13 @@ ciphers="aes128-cbc 3des-cbc blowfish-cbc cast128-cbc
8 aes192-cbc aes256-cbc rijndael-cbc@lysator.liu.se 8 aes192-cbc aes256-cbc rijndael-cbc@lysator.liu.se
9 aes128-ctr aes192-ctr aes256-ctr" 9 aes128-ctr aes192-ctr aes256-ctr"
10macs="hmac-sha1 hmac-md5 umac-64@openssh.com umac-128@openssh.com 10macs="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
13 umac-64-etm@openssh.com umac-128-etm@openssh.com
14 hmac-sha1-96-etm@openssh.com hmac-md5-96-etm@openssh.com"
12config_defined HAVE_EVP_SHA256 && 15config_defined HAVE_EVP_SHA256 &&
13 macs="$macs hmac-sha2-256 hmac-sha2-512" 16 macs="$macs hmac-sha2-256 hmac-sha2-512
17 hmac-sha2-256-etm@openssh.com hmac-sha2-512-etm@openssh.com"
14 18
15for c in $ciphers; do 19for c in $ciphers; do
16 for m in $macs; do 20 for m in $macs; do