Make the EC code available from inside the FIPS provider

[openssl.git] / crypto / ec / ec_mult.c

diff --git a/crypto/ec/ec_mult.c b/crypto/ec/ec_mult.c
index 968125f3cdc5bd066f48f3ab50006f74b484eafc..be4f23062334efbe2f942c1a059b0c4027af995c 100644 (file)
--- a/crypto/ec/ec_mult.c
+++ b/crypto/ec/ec_mult.c
@@ -815,12 +815,14 @@ int ec_wNAF_precompute_mult(EC_GROUP *group, BN_CTX *ctx)
 {
     const EC_POINT *generator;
     EC_POINT *tmp_point = NULL, *base = NULL, **var;
 {
     const EC_POINT *generator;
     EC_POINT *tmp_point = NULL, *base = NULL, **var;

-    BN_CTX *new_ctx = NULL;

     const BIGNUM *order;
     size_t i, bits, w, pre_points_per_block, blocksize, numblocks, num;
     EC_POINT **points = NULL;
     EC_PRE_COMP *pre_comp;
     int ret = 0;
     const BIGNUM *order;
     size_t i, bits, w, pre_points_per_block, blocksize, numblocks, num;
     EC_POINT **points = NULL;
     EC_PRE_COMP *pre_comp;
     int ret = 0;

+#ifndef FIPS_MODE
+    BN_CTX *new_ctx = NULL;
+#endif

 
     /* if there is an old EC_PRE_COMP object, throw it away */
     EC_pre_comp_free(group);
 
     /* if there is an old EC_PRE_COMP object, throw it away */
     EC_pre_comp_free(group);


@@ -833,11 +835,12 @@ int ec_wNAF_precompute_mult(EC_GROUP *group, BN_CTX *ctx)
         goto err;
     }
 
         goto err;
     }
 

-    if (ctx == NULL) {
+#ifndef FIPS_MODE
+    if (ctx == NULL)

         ctx = new_ctx = BN_CTX_new();
         ctx = new_ctx = BN_CTX_new();

-        if (ctx == NULL)
-            goto err;
-    }
+#endif
+    if (ctx == NULL)
+        goto err;

 
     BN_CTX_start(ctx);
 
 
     BN_CTX_start(ctx);
 


@@ -949,7 +952,9 @@ int ec_wNAF_precompute_mult(EC_GROUP *group, BN_CTX *ctx)
 
  err:
     BN_CTX_end(ctx);
 
  err:
     BN_CTX_end(ctx);

+#ifndef FIPS_MODE

     BN_CTX_free(new_ctx);
     BN_CTX_free(new_ctx);

+#endif

     EC_ec_pre_comp_free(pre_comp);
     if (points) {
         EC_POINT **p;
     EC_ec_pre_comp_free(pre_comp);
     if (points) {
         EC_POINT **p;