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 /regress | |
| parent | efa1c950921659a0f10b9adf30625fba21b3815c (diff) | |
- (djm) [regress/cipher-speed.sh regress/integrity.sh regress/try-ciphers.sh]
check for GCM support before testing GCM ciphers.
Diffstat (limited to 'regress')
| -rw-r--r-- | regress/cipher-speed.sh | 4 | ||||
| -rw-r--r-- | regress/integrity.sh | 2 | ||||
| -rw-r--r-- | regress/try-ciphers.sh | 5 |
3 files changed, 6 insertions, 5 deletions
diff --git a/regress/cipher-speed.sh b/regress/cipher-speed.sh index ed7c6f320..114191b89 100644 --- a/regress/cipher-speed.sh +++ b/regress/cipher-speed.sh | |||
| @@ -16,11 +16,11 @@ ciphers="aes128-cbc 3des-cbc blowfish-cbc cast128-cbc | |||
| 16 | arcfour128 arcfour256 arcfour | 16 | arcfour128 arcfour256 arcfour |
| 17 | aes192-cbc aes256-cbc rijndael-cbc@lysator.liu.se | 17 | aes192-cbc aes256-cbc rijndael-cbc@lysator.liu.se |
| 18 | aes128-ctr aes192-ctr aes256-ctr" | 18 | aes128-ctr aes192-ctr aes256-ctr" |
| 19 | config_defined OPENSSL_HAVE_EVPGCM && | 19 | config_defined OPENSSL_HAVE_EVPGCM && \ |
| 20 | ciphers="$ciphers aes128-gcm@openssh.com aes256-gcm@openssh.com" | 20 | ciphers="$ciphers aes128-gcm@openssh.com aes256-gcm@openssh.com" |
| 21 | macs="hmac-sha1 hmac-md5 umac-64@openssh.com umac-128@openssh.com | 21 | macs="hmac-sha1 hmac-md5 umac-64@openssh.com umac-128@openssh.com |
| 22 | hmac-sha1-96 hmac-md5-96" | 22 | hmac-sha1-96 hmac-md5-96" |
| 23 | config_defined HAVE_EVP_SHA256 && | 23 | config_defined HAVE_EVP_SHA256 && \ |
| 24 | macs="$macs hmac-sha2-256 hmac-sha2-512" | 24 | macs="$macs hmac-sha2-256 hmac-sha2-512" |
| 25 | 25 | ||
| 26 | for c in $ciphers; do n=0; for m in $macs; do | 26 | for c in $ciphers; do n=0; for m in $macs; do |
diff --git a/regress/integrity.sh b/regress/integrity.sh index 2b4bfeacc..91168fd2e 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 | |||
| 16 | hmac-sha2-256-etm@openssh.com hmac-sha2-512-etm@openssh.com" | 16 | hmac-sha2-256-etm@openssh.com hmac-sha2-512-etm@openssh.com" |
| 17 | # The following are not MACs, but ciphers with integrated integrity. They are | 17 | # The following are not MACs, but ciphers with integrated integrity. They are |
| 18 | # handled specially below. | 18 | # handled specially below. |
| 19 | config_defined OPENSSL_HAVE_EVPGCM && | 19 | config_defined OPENSSL_HAVE_EVPGCM && \ |
| 20 | macs="$macs aes128-gcm@openssh.com aes256-gcm@openssh.com" | 20 | macs="$macs aes128-gcm@openssh.com aes256-gcm@openssh.com" |
| 21 | 21 | ||
| 22 | # sshd-command for proxy (see test-exec.sh) | 22 | # sshd-command for proxy (see test-exec.sh) |
diff --git a/regress/try-ciphers.sh b/regress/try-ciphers.sh index ca2851713..ef91085c5 100644 --- a/regress/try-ciphers.sh +++ b/regress/try-ciphers.sh | |||
| @@ -6,8 +6,9 @@ tid="try ciphers" | |||
| 6 | ciphers="aes128-cbc 3des-cbc blowfish-cbc cast128-cbc | 6 | 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 | aes128-gcm@openssh.com aes256-gcm@openssh.com" | 10 | config_defined OPENSSL_HAVE_EVPGCM && \ |
| 11 | ciphers="$ciphers aes128-gcm@openssh.com aes256-gcm@openssh.com" | ||
| 11 | macs="hmac-sha1 hmac-md5 umac-64@openssh.com umac-128@openssh.com | 12 | macs="hmac-sha1 hmac-md5 umac-64@openssh.com umac-128@openssh.com |
| 12 | hmac-sha1-96 hmac-md5-96 | 13 | hmac-sha1-96 hmac-md5-96 |
| 13 | hmac-sha1-etm@openssh.com hmac-md5-etm@openssh.com | 14 | hmac-sha1-etm@openssh.com hmac-md5-etm@openssh.com |