From: Dr. Stephen Henson <steve@openssl.org>
Date: Sat, 12 Feb 2011 17:38:06 +0000 (+0000)
Subject: Disable some functions in headers with no-ec2m
X-Git-Tag: OpenSSL-fips-2_0-rc1~756
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c9a90645a5bd683e4f26895101e7a57a79a81058;p=oweals%2Fopenssl.git

Disable some functions in headers with no-ec2m
---

diff --git a/crypto/bn/bn.h b/crypto/bn/bn.h
index 7fe78bb774..5897d2b314 100644
--- a/crypto/bn/bn.h
+++ b/crypto/bn/bn.h
@@ -605,6 +605,8 @@ int	BN_mod_exp_recp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
 int	BN_div_recp(BIGNUM *dv, BIGNUM *rem, const BIGNUM *m,
 	BN_RECP_CTX *recp, BN_CTX *ctx);
 
+#ifndef OPENSSL_NO_EC2M
+
 /* Functions for arithmetic over binary polynomials represented by BIGNUMs. 
  *
  * The BIGNUM::neg property of BIGNUMs representing binary polynomials is
@@ -656,6 +658,8 @@ int	BN_GF2m_mod_solve_quad_arr(BIGNUM *r, const BIGNUM *a,
 int	BN_GF2m_poly2arr(const BIGNUM *a, int p[], int max);
 int	BN_GF2m_arr2poly(const int p[], BIGNUM *a);
 
+#endif
+
 /* faster mod functions for the 'NIST primes' 
  * 0 <= a < p^2 */
 int BN_nist_mod_192(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx);
diff --git a/crypto/ec/ec.h b/crypto/ec/ec.h
index 2bb033aaae..3ea033356e 100644
--- a/crypto/ec/ec.h
+++ b/crypto/ec/ec.h
@@ -665,9 +665,11 @@ int EC_GROUP_have_precompute_mult(const EC_GROUP *group);
 /* EC_GROUP_get_basis_type() returns the NID of the basis type
  * used to represent the field elements */
 int EC_GROUP_get_basis_type(const EC_GROUP *);
+#ifndef OPENSSL_NO_EC2M
 int EC_GROUP_get_trinomial_basis(const EC_GROUP *, unsigned int *k);
 int EC_GROUP_get_pentanomial_basis(const EC_GROUP *, unsigned int *k1, 
 	unsigned int *k2, unsigned int *k3);
+#endif
 
 #define OPENSSL_EC_NAMED_CURVE	0x001