diff options
| author | Damien Miller <djm@mindrot.org> | 2011-08-17 12:10:02 +1000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2011-08-17 12:10:02 +1000 |
| commit | 062fa30532fdce4c2837e9d4e265595aa1cbca14 (patch) | |
| tree | e3e9b7c6a68b0222f5f87364dd710cda831d67fa /regress | |
| parent | faf4d80420af1eb5074a1ae2ce9fc3e1bf9850c0 (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
Diffstat (limited to 'regress')
| -rw-r--r-- | regress/cipher-speed.sh | 9 | ||||
| -rw-r--r-- | regress/try-ciphers.sh | 5 |
2 files changed, 9 insertions, 5 deletions
diff --git a/regress/cipher-speed.sh b/regress/cipher-speed.sh index 85de6d585..0cdafc092 100644 --- a/regress/cipher-speed.sh +++ b/regress/cipher-speed.sh | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | # $OpenBSD: cipher-speed.sh,v 1.3 2007/06/07 19:41:46 pvalchev Exp $ | 1 | # $OpenBSD: cipher-speed.sh,v 1.4 2011/08/02 01:23:41 djm Exp $ |
| 2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
| 3 | 3 | ||
| 4 | tid="cipher speed" | 4 | tid="cipher speed" |
| @@ -12,9 +12,12 @@ tries="1 2" | |||
| 12 | DATA=/bin/ls | 12 | DATA=/bin/ls |
| 13 | DATA=/bsd | 13 | DATA=/bsd |
| 14 | 14 | ||
| 15 | macs="hmac-sha1 hmac-md5 umac-64@openssh.com hmac-sha1-96 hmac-md5-96" | ||
| 16 | ciphers="aes128-cbc 3des-cbc blowfish-cbc cast128-cbc | 15 | ciphers="aes128-cbc 3des-cbc blowfish-cbc cast128-cbc |
| 17 | arcfour128 arcfour256 arcfour aes192-cbc aes256-cbc aes128-ctr" | 16 | arcfour128 arcfour256 arcfour |
| 17 | aes192-cbc aes256-cbc rijndael-cbc@lysator.liu.se | ||
| 18 | aes128-ctr aes192-ctr aes256-ctr" | ||
| 19 | macs="hmac-sha1 hmac-md5 umac-64@openssh.com hmac-sha1-96 hmac-md5-96 | ||
| 20 | hmac-sha2-256 hmac-sha2-256-96 hmac-sha2-512 hmac-sha2-512-96" | ||
| 18 | 21 | ||
| 19 | for c in $ciphers; do for m in $macs; do | 22 | for c in $ciphers; do for m in $macs; do |
| 20 | trace "proto 2 cipher $c mac $m" | 23 | trace "proto 2 cipher $c mac $m" |
diff --git a/regress/try-ciphers.sh b/regress/try-ciphers.sh index ef776d2ee..5affb3943 100644 --- a/regress/try-ciphers.sh +++ b/regress/try-ciphers.sh | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | # $OpenBSD: try-ciphers.sh,v 1.11 2007/06/07 19:41:46 pvalchev Exp $ | 1 | # $OpenBSD: try-ciphers.sh,v 1.12 2011/08/02 01:23:41 djm Exp $ |
| 2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
| 3 | 3 | ||
| 4 | tid="try ciphers" | 4 | tid="try ciphers" |
| @@ -7,7 +7,8 @@ ciphers="aes128-cbc 3des-cbc blowfish-cbc cast128-cbc | |||
| 7 | arcfour128 arcfour256 arcfour | 7 | arcfour128 arcfour256 arcfour |
| 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" |
| 10 | macs="hmac-sha1 hmac-md5 umac-64@openssh.com hmac-sha1-96 hmac-md5-96" | 10 | macs="hmac-sha1 hmac-md5 umac-64@openssh.com hmac-sha1-96 hmac-md5-96 |
| 11 | hmac-sha2-256 hmac-sha2-256-96 hmac-sha2-512 hmac-sha2-512-96" | ||
| 11 | 12 | ||
| 12 | for c in $ciphers; do | 13 | for c in $ciphers; do |
| 13 | for m in $macs; do | 14 | for m in $macs; do |