diff options
author | Darren Tucker <dtucker@zip.com.au> | 2015-02-23 05:04:21 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2015-02-23 05:04:21 +1100 |
commit | f2004cd1adf34492eae0a44b1ef84e0e31b06088 (patch) | |
tree | c8173512b60c3b9719df735b9b6752bd58613fde /opacket.c | |
parent | 37f9220db8d1a52c75894c3de1e5f2ae5bd71b6f (diff) |
Repair for non-ECC OpenSSL.
Ifdef out the ECC parts when building with an OpenSSL that doesn't have
it.
Diffstat (limited to 'opacket.c')
-rw-r--r-- | opacket.c | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -93,6 +93,7 @@ ssh_packet_put_bignum2(struct ssh *ssh, BIGNUM * value) | |||
93 | fatal("%s: %s", __func__, ssh_err(r)); | 93 | fatal("%s: %s", __func__, ssh_err(r)); |
94 | } | 94 | } |
95 | 95 | ||
96 | # ifdef OPENSSL_HAS_ECC | ||
96 | void | 97 | void |
97 | ssh_packet_put_ecpoint(struct ssh *ssh, const EC_GROUP *curve, | 98 | ssh_packet_put_ecpoint(struct ssh *ssh, const EC_GROUP *curve, |
98 | const EC_POINT *point) | 99 | const EC_POINT *point) |
@@ -102,6 +103,7 @@ ssh_packet_put_ecpoint(struct ssh *ssh, const EC_GROUP *curve, | |||
102 | if ((r = sshpkt_put_ec(ssh, point, curve)) != 0) | 103 | if ((r = sshpkt_put_ec(ssh, point, curve)) != 0) |
103 | fatal("%s: %s", __func__, ssh_err(r)); | 104 | fatal("%s: %s", __func__, ssh_err(r)); |
104 | } | 105 | } |
106 | # endif | ||
105 | #endif /* WITH_OPENSSL */ | 107 | #endif /* WITH_OPENSSL */ |
106 | 108 | ||
107 | void | 109 | void |
@@ -165,6 +167,7 @@ ssh_packet_get_bignum2(struct ssh *ssh, BIGNUM * value) | |||
165 | fatal("%s: %s", __func__, ssh_err(r)); | 167 | fatal("%s: %s", __func__, ssh_err(r)); |
166 | } | 168 | } |
167 | 169 | ||
170 | # ifdef OPENSSL_HAS_ECC | ||
168 | void | 171 | void |
169 | ssh_packet_get_ecpoint(struct ssh *ssh, const EC_GROUP *curve, EC_POINT *point) | 172 | ssh_packet_get_ecpoint(struct ssh *ssh, const EC_GROUP *curve, EC_POINT *point) |
170 | { | 173 | { |
@@ -173,6 +176,7 @@ ssh_packet_get_ecpoint(struct ssh *ssh, const EC_GROUP *curve, EC_POINT *point) | |||
173 | if ((r = sshpkt_get_ec(ssh, point, curve)) != 0) | 176 | if ((r = sshpkt_get_ec(ssh, point, curve)) != 0) |
174 | fatal("%s: %s", __func__, ssh_err(r)); | 177 | fatal("%s: %s", __func__, ssh_err(r)); |
175 | } | 178 | } |
179 | # endif | ||
176 | #endif /* WITH_OPENSSL */ | 180 | #endif /* WITH_OPENSSL */ |
177 | 181 | ||
178 | void * | 182 | void * |