diff options
| author | Parménides GV <parmegv@sdf.org> | 2014-06-13 12:21:38 +0200 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2014-06-13 12:21:38 +0200 |
| commit | d09435a9d2adb0d0cafa0b1f9f6cfe326346cbc6 (patch) | |
| tree | 946278cd836aa6af639675f4eb5ec7378d783dd8 /app/openssl/crypto/ec/eck_prn.c | |
| parent | 5d47fde84a03acb1201f8650c55dc0cd981df679 (diff) | |
| parent | 3a71bc9e4aa4296f460e2e3c55de74c9852477ad (diff) | |
Merge branch 'develop' into release-0.5.2
Diffstat (limited to 'app/openssl/crypto/ec/eck_prn.c')
| -rw-r--r-- | app/openssl/crypto/ec/eck_prn.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/openssl/crypto/ec/eck_prn.c b/app/openssl/crypto/ec/eck_prn.c index 7d3e175a..06de8f39 100644 --- a/app/openssl/crypto/ec/eck_prn.c +++ b/app/openssl/crypto/ec/eck_prn.c @@ -207,7 +207,7 @@ int ECPKParameters_print(BIO *bp, const EC_GROUP *x, int off) reason = ERR_R_MALLOC_FAILURE; goto err; } - +#ifndef OPENSSL_NO_EC2M if (is_char_two) { if (!EC_GROUP_get_curve_GF2m(x, p, a, b, ctx)) @@ -217,6 +217,7 @@ int ECPKParameters_print(BIO *bp, const EC_GROUP *x, int off) } } else /* prime field */ +#endif { if (!EC_GROUP_get_curve_GFp(x, p, a, b, ctx)) { |