diff options
author | Darren Tucker <dtucker@zip.com.au> | 2016-10-28 14:26:58 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2016-10-28 14:26:58 +1100 |
commit | a9ff3950b8e80ff971b4d44bbce96df27aed28af (patch) | |
tree | 0977bdbbd81c1f072c89181bc9696ff04d6802e4 /mac.c | |
parent | bce58885160e5db2adda3054c3b81fe770f7285a (diff) |
Move OPENSSL_NO_RIPEMD160 to compat.
Move OPENSSL_NO_RIPEMD160 to compat and add ifdefs to mac.c around the
ripemd160 MACs.
Diffstat (limited to 'mac.c')
-rw-r--r-- | mac.c | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -64,8 +64,10 @@ static const struct macalg macs[] = { | |||
64 | #endif | 64 | #endif |
65 | { "hmac-md5", SSH_DIGEST, SSH_DIGEST_MD5, 0, 0, 0, 0 }, | 65 | { "hmac-md5", SSH_DIGEST, SSH_DIGEST_MD5, 0, 0, 0, 0 }, |
66 | { "hmac-md5-96", SSH_DIGEST, SSH_DIGEST_MD5, 96, 0, 0, 0 }, | 66 | { "hmac-md5-96", SSH_DIGEST, SSH_DIGEST_MD5, 96, 0, 0, 0 }, |
67 | #ifdef HAVE_EVP_RIPEMD160 | ||
67 | { "hmac-ripemd160", SSH_DIGEST, SSH_DIGEST_RIPEMD160, 0, 0, 0, 0 }, | 68 | { "hmac-ripemd160", SSH_DIGEST, SSH_DIGEST_RIPEMD160, 0, 0, 0, 0 }, |
68 | { "hmac-ripemd160@openssh.com", SSH_DIGEST, SSH_DIGEST_RIPEMD160, 0, 0, 0, 0 }, | 69 | { "hmac-ripemd160@openssh.com", SSH_DIGEST, SSH_DIGEST_RIPEMD160, 0, 0, 0, 0 }, |
70 | #endif | ||
69 | { "umac-64@openssh.com", SSH_UMAC, 0, 0, 128, 64, 0 }, | 71 | { "umac-64@openssh.com", SSH_UMAC, 0, 0, 128, 64, 0 }, |
70 | { "umac-128@openssh.com", SSH_UMAC128, 0, 0, 128, 128, 0 }, | 72 | { "umac-128@openssh.com", SSH_UMAC128, 0, 0, 128, 128, 0 }, |
71 | 73 | ||
@@ -78,7 +80,9 @@ static const struct macalg macs[] = { | |||
78 | #endif | 80 | #endif |
79 | { "hmac-md5-etm@openssh.com", SSH_DIGEST, SSH_DIGEST_MD5, 0, 0, 0, 1 }, | 81 | { "hmac-md5-etm@openssh.com", SSH_DIGEST, SSH_DIGEST_MD5, 0, 0, 0, 1 }, |
80 | { "hmac-md5-96-etm@openssh.com", SSH_DIGEST, SSH_DIGEST_MD5, 96, 0, 0, 1 }, | 82 | { "hmac-md5-96-etm@openssh.com", SSH_DIGEST, SSH_DIGEST_MD5, 96, 0, 0, 1 }, |
83 | #ifdef HAVE_EVP_RIPEMD160 | ||
81 | { "hmac-ripemd160-etm@openssh.com", SSH_DIGEST, SSH_DIGEST_RIPEMD160, 0, 0, 0, 1 }, | 84 | { "hmac-ripemd160-etm@openssh.com", SSH_DIGEST, SSH_DIGEST_RIPEMD160, 0, 0, 0, 1 }, |
85 | #endif | ||
82 | { "umac-64-etm@openssh.com", SSH_UMAC, 0, 0, 128, 64, 1 }, | 86 | { "umac-64-etm@openssh.com", SSH_UMAC, 0, 0, 128, 64, 1 }, |
83 | { "umac-128-etm@openssh.com", SSH_UMAC128, 0, 0, 128, 128, 1 }, | 87 | { "umac-128-etm@openssh.com", SSH_UMAC128, 0, 0, 128, 128, 1 }, |
84 | 88 | ||