tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (djm) [regress/integrity.sh] Skip SHA2-based MACs on configurations that 

lack support for SHA2.
This commit is contained in:
Damien Miller 2013-02-19 14:27:44 +11:00
parent b3764e1202
commit dae85cc3ad
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -8,6 +8,8 @@
[integrity.sh] [integrity.sh]
oops, forgot to increase the output of the ssh command to ensure that oops, forgot to increase the output of the ssh command to ensure that
we actually reach $offset we actually reach $offset
- (djm) [regress/integrity.sh] Skip SHA2-based MACs on configurations that
lack support for SHA2.
20130217 20130217
- OpenBSD CVS Sync - OpenBSD CVS Sync

6
regress/integrity.sh
View File

@ -9,10 +9,12 @@ tid="integrity"
tries=10 tries=10
startoffset=2900 startoffset=2900
macs="hmac-sha1 hmac-md5 umac-64@openssh.com umac-128@openssh.com macs="hmac-sha1 hmac-md5 umac-64@openssh.com umac-128@openssh.com
hmac-sha1-96 hmac-md5-96 hmac-sha2-256 hmac-sha2-512 hmac-sha1-96 hmac-md5-96
hmac-sha1-etm@openssh.com hmac-md5-etm@openssh.com hmac-sha1-etm@openssh.com hmac-md5-etm@openssh.com
umac-64-etm@openssh.com umac-128-etm@openssh.com umac-64-etm@openssh.com umac-128-etm@openssh.com
hmac-sha1-96-etm@openssh.com hmac-md5-96-etm@openssh.com hmac-sha1-96-etm@openssh.com hmac-md5-96-etm@openssh.com"
config_defined HAVE_EVP_SHA256 &&
macs="$macs hmac-sha2-256 hmac-sha2-512
hmac-sha2-256-etm@openssh.com hmac-sha2-512-etm@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 # The following are not MACs, but ciphers with integrated integrity. They are
# handled specially below. # handled specially below.