remove superfluous code

Submitted by: Nils Larsch

diff --git a/crypto/ec/ec2_smpl.c b/crypto/ec/ec2_smpl.c
index b218c5639ac80aa7de91fce7575d3aad7b232a53..2f2e7b7f1bf7afb957ab9d5dc822f1946deb26b0 100644 (file)
--- a/crypto/ec/ec2_smpl.c
+++ b/crypto/ec/ec2_smpl.c
@@ -234,16 +234,14 @@ int ec_GF2m_simple_group_get_curve(const EC_GROUP *group, BIGNUM *p, BIGNUM *a,
                if (!BN_copy(p, &group->field)) return 0;
                }
 
                if (!BN_copy(p, &group->field)) return 0;
                }
 

-       if (a != NULL || b != NULL)
+       if (a != NULL)

                {
                {

-               if (a != NULL)
-                       {
-                       if (!BN_copy(a, &group->a)) goto err;
-                       }
-               if (b != NULL)
-                       {
-                       if (!BN_copy(b, &group->b)) goto err;
-                       }
+               if (!BN_copy(a, &group->a)) goto err;
+               }
+
+       if (b != NULL)
+               {
+               if (!BN_copy(b, &group->b)) goto err;

                }
        
        ret = 1;
                }
        
        ret = 1;

diff --git a/crypto/ec/ec_lcl.h b/crypto/ec/ec_lcl.h
index ae67ccfdc24bf9c62ef6453f2ef68886f38fe722..247c985a236d85c3afff0146f175b3f93aaafb60 100644 (file)
--- a/crypto/ec/ec_lcl.h
+++ b/crypto/ec/ec_lcl.h
@@ -89,11 +89,6 @@
 #include <openssl/ec.h>
 
 
 #include <openssl/ec.h>
 
 

-/* internal function: ec_group_index2nid() returns the NID of curve
- * with the given index i from the internal curve list */
-int ec_group_index2nid(int i);
-
-

 /* Structure details are not part of the exported interface,
  * so all this may change in future versions. */
 
 /* Structure details are not part of the exported interface,
  * so all this may change in future versions. */