diff options
author | djm <> | 2012-10-13 21:23:57 +0000 |
---|---|---|
committer | djm <> | 2012-10-13 21:23:57 +0000 |
commit | 5bb3399db864c8865e0df73bd1564407bac5d182 (patch) | |
tree | 51d00d308f46148b4b341133936e44706703ad8b /src/lib/libcrypto/ecdh/ech_ossl.c | |
parent | 7aa3571aba92d82f8dd3caabe48fad636f05a0fd (diff) | |
download | openbsd-5bb3399db864c8865e0df73bd1564407bac5d182.tar.gz openbsd-5bb3399db864c8865e0df73bd1564407bac5d182.tar.bz2 openbsd-5bb3399db864c8865e0df73bd1564407bac5d182.zip |
import OpenSSL-1.0.1c
Diffstat (limited to 'src/lib/libcrypto/ecdh/ech_ossl.c')
-rw-r--r-- | src/lib/libcrypto/ecdh/ech_ossl.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/lib/libcrypto/ecdh/ech_ossl.c b/src/lib/libcrypto/ecdh/ech_ossl.c index 2a40ff12df..4a30628fbc 100644 --- a/src/lib/libcrypto/ecdh/ech_ossl.c +++ b/src/lib/libcrypto/ecdh/ech_ossl.c | |||
@@ -157,6 +157,7 @@ static int ecdh_compute_key(void *out, size_t outlen, const EC_POINT *pub_key, | |||
157 | goto err; | 157 | goto err; |
158 | } | 158 | } |
159 | } | 159 | } |
160 | #ifndef OPENSSL_NO_EC2M | ||
160 | else | 161 | else |
161 | { | 162 | { |
162 | if (!EC_POINT_get_affine_coordinates_GF2m(group, tmp, x, y, ctx)) | 163 | if (!EC_POINT_get_affine_coordinates_GF2m(group, tmp, x, y, ctx)) |
@@ -165,6 +166,7 @@ static int ecdh_compute_key(void *out, size_t outlen, const EC_POINT *pub_key, | |||
165 | goto err; | 166 | goto err; |
166 | } | 167 | } |
167 | } | 168 | } |
169 | #endif | ||
168 | 170 | ||
169 | buflen = (EC_GROUP_get_degree(group) + 7)/8; | 171 | buflen = (EC_GROUP_get_degree(group) + 7)/8; |
170 | len = BN_num_bytes(x); | 172 | len = BN_num_bytes(x); |