mirror of git://anongit.mindrot.org/openssh.git
- (djm) [regress/cipher-speed.sh regress/try-ciphers.sh] disable HMAC-SHA2
MAC tests for platforms that hack EVP_SHA2 support
This commit is contained in:
parent
062fa30532
commit
2df1bec086
|
@ -17,6 +17,8 @@
|
||||||
- djm@cvs.openbsd.org 2011/08/02 01:23:41
|
- djm@cvs.openbsd.org 2011/08/02 01:23:41
|
||||||
[regress/cipher-speed.sh regress/try-ciphers.sh]
|
[regress/cipher-speed.sh regress/try-ciphers.sh]
|
||||||
add SHA256/SHA512 based HMAC modes
|
add SHA256/SHA512 based HMAC modes
|
||||||
|
- (djm) [regress/cipher-speed.sh regress/try-ciphers.sh] disable HMAC-SHA2
|
||||||
|
MAC tests for platforms that hack EVP_SHA2 support
|
||||||
|
|
||||||
20110812
|
20110812
|
||||||
- (dtucker) [openbsd-compat/port-linux.c] Bug 1924: Improve selinux context
|
- (dtucker) [openbsd-compat/port-linux.c] Bug 1924: Improve selinux context
|
||||||
|
|
|
@ -16,8 +16,9 @@ ciphers="aes128-cbc 3des-cbc blowfish-cbc cast128-cbc
|
||||||
arcfour128 arcfour256 arcfour
|
arcfour128 arcfour256 arcfour
|
||||||
aes192-cbc aes256-cbc rijndael-cbc@lysator.liu.se
|
aes192-cbc aes256-cbc rijndael-cbc@lysator.liu.se
|
||||||
aes128-ctr aes192-ctr aes256-ctr"
|
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"
|
config_defined HAVE_EVP_SHA256 &&
|
||||||
|
macs="$macs hmac-sha2-256 hmac-sha2-256-96 hmac-sha2-512 hmac-sha2-512-96"
|
||||||
|
|
||||||
for c in $ciphers; do for m in $macs; do
|
for c in $ciphers; do for m in $macs; do
|
||||||
trace "proto 2 cipher $c mac $m"
|
trace "proto 2 cipher $c mac $m"
|
||||||
|
|
|
@ -7,8 +7,9 @@ ciphers="aes128-cbc 3des-cbc blowfish-cbc cast128-cbc
|
||||||
arcfour128 arcfour256 arcfour
|
arcfour128 arcfour256 arcfour
|
||||||
aes192-cbc aes256-cbc rijndael-cbc@lysator.liu.se
|
aes192-cbc aes256-cbc rijndael-cbc@lysator.liu.se
|
||||||
aes128-ctr aes192-ctr aes256-ctr"
|
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"
|
config_defined HAVE_EVP_SHA256 &&
|
||||||
|
macs="$macs hmac-sha2-256 hmac-sha2-256-96 hmac-sha2-512 hmac-sha2-512-96"
|
||||||
|
|
||||||
for c in $ciphers; do
|
for c in $ciphers; do
|
||||||
for m in $macs; do
|
for m in $macs; do
|
||||||
|
|
Loading…
Reference in New Issue