diff options
author | Damien Miller <djm@mindrot.org> | 2007-10-26 14:45:57 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2007-10-26 14:45:57 +1000 |
commit | 47d7dc8530f0b459ace5f7a98aeade204a8fbef9 (patch) | |
tree | 546820c2b467dc73c77c9f1312abc4a47287f522 | |
parent | 80ba1300e248d914512f579a9bfac1193f7ec746 (diff) |
- pvalchev@cvs.openbsd.org 2007/06/07 19:41:46
[regress/cipher-speed.sh regress/try-ciphers.sh]
test umac-64@openssh.com
ok djm@
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | regress/cipher-speed.sh | 4 | ||||
-rw-r--r-- | regress/try-ciphers.sh | 4 |
3 files changed, 9 insertions, 5 deletions
@@ -65,6 +65,10 @@ | |||
65 | - dtucker@cvs.openbsd.org 2006/12/13 08:36:36 | 65 | - dtucker@cvs.openbsd.org 2006/12/13 08:36:36 |
66 | [regress/cfgmatch.sh] | 66 | [regress/cfgmatch.sh] |
67 | Additional test for multiple PermitOpen entries. ok djm@ | 67 | Additional test for multiple PermitOpen entries. ok djm@ |
68 | - pvalchev@cvs.openbsd.org 2007/06/07 19:41:46 | ||
69 | [regress/cipher-speed.sh regress/try-ciphers.sh] | ||
70 | test umac-64@openssh.com | ||
71 | ok djm@ | ||
68 | 72 | ||
69 | 20070927 | 73 | 20070927 |
70 | - (dtucker) [configure.ac atomicio.c] Fall back to including <sys/poll.h> if | 74 | - (dtucker) [configure.ac atomicio.c] Fall back to including <sys/poll.h> if |
@@ -3336,4 +3340,4 @@ | |||
3336 | OpenServer 6 and add osr5bigcrypt support so when someone migrates | 3340 | OpenServer 6 and add osr5bigcrypt support so when someone migrates |
3337 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ | 3341 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ |
3338 | 3342 | ||
3339 | $Id: ChangeLog,v 1.4774 2007/10/26 04:45:13 djm Exp $ | 3343 | $Id: ChangeLog,v 1.4775 2007/10/26 04:45:57 djm Exp $ |
diff --git a/regress/cipher-speed.sh b/regress/cipher-speed.sh index 592511143..d39a829d4 100644 --- a/regress/cipher-speed.sh +++ b/regress/cipher-speed.sh | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: cipher-speed.sh,v 1.2 2005/05/24 04:09:54 djm Exp $ | 1 | # $OpenBSD: cipher-speed.sh,v 1.3 2007/06/07 19:41:46 pvalchev Exp $ |
2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
3 | 3 | ||
4 | tid="cipher speed" | 4 | tid="cipher speed" |
@@ -12,7 +12,7 @@ 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 hmac-sha1-96 hmac-md5-96" | 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 | 16 | ciphers="aes128-cbc 3des-cbc blowfish-cbc cast128-cbc |
17 | arcfour128 arcfour256 arcfour aes192-cbc aes256-cbc aes128-ctr" | 17 | arcfour128 arcfour256 arcfour aes192-cbc aes256-cbc aes128-ctr" |
18 | 18 | ||
diff --git a/regress/try-ciphers.sh b/regress/try-ciphers.sh index 379fe353a..ef776d2ee 100644 --- a/regress/try-ciphers.sh +++ b/regress/try-ciphers.sh | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: try-ciphers.sh,v 1.10 2005/05/24 04:10:54 djm Exp $ | 1 | # $OpenBSD: try-ciphers.sh,v 1.11 2007/06/07 19:41:46 pvalchev 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,7 @@ 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 hmac-sha1-96 hmac-md5-96" | 10 | macs="hmac-sha1 hmac-md5 umac-64@openssh.com hmac-sha1-96 hmac-md5-96" |
11 | 11 | ||
12 | for c in $ciphers; do | 12 | for c in $ciphers; do |
13 | for m in $macs; do | 13 | for m in $macs; do |