summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2011-08-17 12:10:02 +1000
committerDamien Miller <djm@mindrot.org>2011-08-17 12:10:02 +1000
commit062fa30532fdce4c2837e9d4e265595aa1cbca14 (patch)
treee3e9b7c6a68b0222f5f87364dd710cda831d67fa
parentfaf4d80420af1eb5074a1ae2ce9fc3e1bf9850c0 (diff)
- djm@cvs.openbsd.org 2011/08/02 01:23:41
[regress/cipher-speed.sh regress/try-ciphers.sh] add SHA256/SHA512 based HMAC modes
-rw-r--r--ChangeLog3
-rw-r--r--regress/cipher-speed.sh9
-rw-r--r--regress/try-ciphers.sh5
3 files changed, 12 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 85dbe0f3..441f1c31 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,9 @@
- markus@cvs.openbsd.org 2011/06/30 22:44:43
[regress/connect-privsep.sh]
test with sandbox enabled; ok djm@
+ - djm@cvs.openbsd.org 2011/08/02 01:23:41
+ [regress/cipher-speed.sh regress/try-ciphers.sh]
+ add SHA256/SHA512 based HMAC modes
20110812
- (dtucker) [openbsd-compat/port-linux.c] Bug 1924: Improve selinux context
diff --git a/regress/cipher-speed.sh b/regress/cipher-speed.sh
index 85de6d58..0cdafc09 100644
--- a/regress/cipher-speed.sh
+++ b/regress/cipher-speed.sh
@@ -1,4 +1,4 @@
-# $OpenBSD: cipher-speed.sh,v 1.3 2007/06/07 19:41:46 pvalchev Exp $
+# $OpenBSD: cipher-speed.sh,v 1.4 2011/08/02 01:23:41 djm Exp $
# Placed in the Public Domain.
tid="cipher speed"
@@ -12,9 +12,12 @@ tries="1 2"
DATA=/bin/ls
DATA=/bsd
-macs="hmac-sha1 hmac-md5 umac-64@openssh.com hmac-sha1-96 hmac-md5-96"
ciphers="aes128-cbc 3des-cbc blowfish-cbc cast128-cbc
- arcfour128 arcfour256 arcfour aes192-cbc aes256-cbc aes128-ctr"
+ arcfour128 arcfour256 arcfour
+ aes192-cbc aes256-cbc rijndael-cbc@lysator.liu.se
+ aes128-ctr aes192-ctr aes256-ctr"
+macs="hmac-sha1 hmac-md5 umac-64@openssh.com hmac-sha1-96 hmac-md5-96
+ hmac-sha2-256 hmac-sha2-256-96 hmac-sha2-512 hmac-sha2-512-96"
for c in $ciphers; do for m in $macs; do
trace "proto 2 cipher $c mac $m"
diff --git a/regress/try-ciphers.sh b/regress/try-ciphers.sh
index ef776d2e..5affb394 100644
--- a/regress/try-ciphers.sh
+++ b/regress/try-ciphers.sh
@@ -1,4 +1,4 @@
-# $OpenBSD: try-ciphers.sh,v 1.11 2007/06/07 19:41:46 pvalchev Exp $
+# $OpenBSD: try-ciphers.sh,v 1.12 2011/08/02 01:23:41 djm Exp $
# Placed in the Public Domain.
tid="try ciphers"
@@ -7,7 +7,8 @@ ciphers="aes128-cbc 3des-cbc blowfish-cbc cast128-cbc
arcfour128 arcfour256 arcfour
aes192-cbc aes256-cbc rijndael-cbc@lysator.liu.se
aes128-ctr aes192-ctr aes256-ctr"
-macs="hmac-sha1 hmac-md5 umac-64@openssh.com hmac-sha1-96 hmac-md5-96"
+macs="hmac-sha1 hmac-md5 umac-64@openssh.com hmac-sha1-96 hmac-md5-96
+ hmac-sha2-256 hmac-sha2-256-96 hmac-sha2-512 hmac-sha2-512-96"
for c in $ciphers; do
for m in $macs; do