diff options
| author | Damien Miller <djm@mindrot.org> | 2013-01-17 14:31:57 +1100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2013-01-17 14:31:57 +1100 |
| commit | b26699bbadaffa1b1de2f6b0e175b77aba337de5 (patch) | |
| tree | 4088f4bb1f4c5fbe8ca3c5fc62a1eb0af60c9f05 | |
| parent | efa1c950921659a0f10b9adf30625fba21b3815c (diff) | |
- (djm) [regress/cipher-speed.sh regress/integrity.sh regress/try-ciphers.sh]
check for GCM support before testing GCM ciphers.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | regress/cipher-speed.sh | 4 | ||||
| -rw-r--r-- | regress/integrity.sh | 2 | ||||
| -rw-r--r-- | regress/try-ciphers.sh | 5 |
4 files changed, 10 insertions, 5 deletions
@@ -1,3 +1,7 @@ +20130117 + - (djm) [regress/cipher-speed.sh regress/integrity.sh regress/try-ciphers.sh] + check for GCM support before testing GCM ciphers. + 20130112 - (djm) OpenBSD CVS Sync - djm@cvs.openbsd.org 2013/01/12 11:22:04 diff --git a/regress/cipher-speed.sh b/regress/cipher-speed.sh index ed7c6f32..114191b8 100644 --- a/regress/cipher-speed.sh +++ b/regress/cipher-speed.sh @@ -16,11 +16,11 @@ 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" -config_defined OPENSSL_HAVE_EVPGCM && +config_defined OPENSSL_HAVE_EVPGCM && \ ciphers="$ciphers aes128-gcm@openssh.com aes256-gcm@openssh.com" macs="hmac-sha1 hmac-md5 umac-64@openssh.com umac-128@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-512" for c in $ciphers; do n=0; for m in $macs; do diff --git a/regress/integrity.sh b/regress/integrity.sh index 2b4bfeac..91168fd2 100644 --- a/regress/integrity.sh +++ b/regress/integrity.sh @@ -16,7 +16,7 @@ macs="hmac-sha1 hmac-md5 umac-64@openssh.com umac-128@openssh.com hmac-sha2-256-etm@openssh.com hmac-sha2-512-etm@openssh.com" # The following are not MACs, but ciphers with integrated integrity. They are # handled specially below. -config_defined OPENSSL_HAVE_EVPGCM && +config_defined OPENSSL_HAVE_EVPGCM && \ macs="$macs aes128-gcm@openssh.com aes256-gcm@openssh.com" # sshd-command for proxy (see test-exec.sh) diff --git a/regress/try-ciphers.sh b/regress/try-ciphers.sh index ca285171..ef91085c 100644 --- a/regress/try-ciphers.sh +++ b/regress/try-ciphers.sh @@ -6,8 +6,9 @@ tid="try ciphers" 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 - aes128-gcm@openssh.com aes256-gcm@openssh.com" + aes128-ctr aes192-ctr aes256-ctr" +config_defined OPENSSL_HAVE_EVPGCM && \ + ciphers="$ciphers aes128-gcm@openssh.com aes256-gcm@openssh.com" macs="hmac-sha1 hmac-md5 umac-64@openssh.com umac-128@openssh.com hmac-sha1-96 hmac-md5-96 hmac-sha1-etm@openssh.com hmac-md5-etm@openssh.com |