diff options
| author | Tim Rice <tim@multitalents.net> | 2011-08-17 02:29:01 +0200 |
|---|---|---|
| committer | Tim Rice <tim@multitalents.net> | 2011-08-17 02:29:01 +0200 |
| commit | a1226828add427f4ff29462b3153b1549d3b46a8 (patch) | |
| tree | b4b3b3638c6ffffe8f95dd8f37f517341d9b5175 /myproposal.h | |
| parent | - (djm) [contrib/ssh-copy-id] Fix failure for cases where the path to the (diff) | |
| download | openssh-a1226828add427f4ff29462b3153b1549d3b46a8.tar.xz openssh-a1226828add427f4ff29462b3153b1549d3b46a8.zip | |
- (tim) [mac.c myproposal.h] Wrap SHA256 and SHA512 in ifdefs for
OpenSSL 0.9.7. ok djm
Diffstat (limited to 'myproposal.h')
| -rw-r--r-- | myproposal.h | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/myproposal.h b/myproposal.h index aeb5201dc..0bc1c778c 100644 --- a/myproposal.h +++ b/myproposal.h @@ -75,14 +75,20 @@ "arcfour256,arcfour128," \ "aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc," \ "aes192-cbc,aes256-cbc,arcfour,rijndael-cbc@lysator.liu.se" +#ifdef HAVE_EVP_SHA256 +#define SHA2_HMAC_MODES \ + "hmac-sha2-256," \ + "hmac-sha2-256-96," \ + "hmac-sha2-512," \ + "hmac-sha2-512-96," +#else +# define SHA2_HMAC_MODES +#endif #define KEX_DEFAULT_MAC \ "hmac-md5," \ "hmac-sha1," \ "umac-64@openssh.com," \ - "hmac-sha2-256," \ - "hmac-sha2-256-96," \ - "hmac-sha2-512," \ - "hmac-sha2-512-96," \ + SHA2_HMAC_MODES \ "hmac-ripemd160," \ "hmac-ripemd160@openssh.com," \ "hmac-sha1-96," \ |