- dtucker@cvs.openbsd.org 2012/06/28 05:07:45
[regress/try-ciphers.sh regress/cipher-speed.sh] Remove hmac-sha2-256-96 and hmac-sha2-512-96 MACs since they were removed from draft6 of the spec and will not be in the RFC when published. Patch from mdb at juniper net via bz#2023, ok markus
This commit is contained in:
parent
2920bc145c
commit
a08c20763a
|
@ -38,6 +38,11 @@
|
||||||
- dtucker@cvs.openbsd.org 2012/06/26 12:06:59
|
- dtucker@cvs.openbsd.org 2012/06/26 12:06:59
|
||||||
[regress/connect-privsep.sh]
|
[regress/connect-privsep.sh]
|
||||||
test sandbox with every malloc option
|
test sandbox with every malloc option
|
||||||
|
- dtucker@cvs.openbsd.org 2012/06/28 05:07:45
|
||||||
|
[regress/try-ciphers.sh regress/cipher-speed.sh]
|
||||||
|
Remove hmac-sha2-256-96 and hmac-sha2-512-96 MACs since they were removed
|
||||||
|
from draft6 of the spec and will not be in the RFC when published. Patch
|
||||||
|
from mdb at juniper net via bz#2023, ok markus.
|
||||||
|
|
||||||
20120628
|
20120628
|
||||||
- (dtucker) [openbsd-compat/getrrsetbyname-ldns.c] bz #2022: prevent null
|
- (dtucker) [openbsd-compat/getrrsetbyname-ldns.c] bz #2022: prevent null
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
# $OpenBSD: cipher-speed.sh,v 1.4 2011/08/02 01:23:41 djm Exp $
|
# $OpenBSD: cipher-speed.sh,v 1.5 2012/06/28 05:07:45 dtucker Exp $
|
||||||
# Placed in the Public Domain.
|
# Placed in the Public Domain.
|
||||||
|
|
||||||
tid="cipher speed"
|
tid="cipher speed"
|
||||||
|
@ -18,7 +18,7 @@ ciphers="aes128-cbc 3des-cbc blowfish-cbc cast128-cbc
|
||||||
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"
|
||||||
config_defined HAVE_EVP_SHA256 &&
|
config_defined HAVE_EVP_SHA256 &&
|
||||||
macs="$macs hmac-sha2-256 hmac-sha2-256-96 hmac-sha2-512 hmac-sha2-512-96"
|
macs="$macs hmac-sha2-256 hmac-sha2-512"
|
||||||
|
|
||||||
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"
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
# $OpenBSD: try-ciphers.sh,v 1.12 2011/08/02 01:23:41 djm Exp $
|
# $OpenBSD: try-ciphers.sh,v 1.13 2012/06/28 05:07:45 dtucker Exp $
|
||||||
# Placed in the Public Domain.
|
# Placed in the Public Domain.
|
||||||
|
|
||||||
tid="try ciphers"
|
tid="try ciphers"
|
||||||
|
@ -9,7 +9,7 @@ ciphers="aes128-cbc 3des-cbc blowfish-cbc cast128-cbc
|
||||||
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"
|
||||||
config_defined HAVE_EVP_SHA256 &&
|
config_defined HAVE_EVP_SHA256 &&
|
||||||
macs="$macs hmac-sha2-256 hmac-sha2-256-96 hmac-sha2-512 hmac-sha2-512-96"
|
macs="$macs hmac-sha2-256 hmac-sha2-512"
|
||||||
|
|
||||||
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