Fix bug in DSA, EC methods.

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

diff --git a/crypto/ec/ec_cvt.c b/crypto/ec/ec_cvt.c
index 20782569a9faddf1332869e3e624b60ab379c3c4..d45640bab902fb6ce28f5302ed2d9c1cb8259649 100644 (file)
--- a/crypto/ec/ec_cvt.c
+++ b/crypto/ec/ec_cvt.c
@@ -64,19 +64,6 @@
  * The Contribution is licensed pursuant to the OpenSSL open source
  * license provided above.
  *
- * In addition, Sun covenants to all licensees who provide a reciprocal
- * covenant with respect to their own patents if any, not to sue under
- * current and future patent claims necessarily infringed by the making,
- * using, practicing, selling, offering for sale and/or otherwise
- * disposing of the Contribution as delivered hereunder 
- * (or portions thereof), provided that such covenant shall not apply:
- *  1) for code that a licensee deletes from the Contribution;
- *  2) separates from the Contribution; or
- *  3) for infringements caused by:
- *       i) the modification of the Contribution or
- *      ii) the combination of the Contribution with other software or
- *          devices where such combination causes the infringement.
- *
  * The elliptic curve binary polynomial software is originally written by
  * Sheueling Chang Shantz and Douglas Stebila of Sun Microsystems Laboratories.
  *
@@ -99,9 +86,25 @@ EC_GROUP *EC_GROUP_new_curve_GFp(const BIGNUM *p, const BIGNUM *a, const BIGNUM
 
        if (!EC_GROUP_set_curve_GFp(ret, p, a, b, ctx))
                {
-               /* remove the last error code form the error queue */
-               ERR_get_error();
-               /* try the normal mont method */
+               unsigned long err;
+                 
+               err = ERR_peek_last_error();
+
+               if (!(ERR_GET_LIB(err) == ERR_LIB_EC &&
+                       ((ERR_GET_REASON(err) == EC_R_NOT_A_NIST_PRIME) ||
+                        (ERR_GET_REASON(err) == EC_R_NOT_A_SUPPORTED_NIST_PRIME))))
+                       {
+                       /* real error */
+                       
+                       EC_GROUP_clear_free(ret);
+                       return NULL;
+                       }
+                       
+               
+               /* not an actual error, we just cannot use EC_GFp_nist_method */
+
+               ERR_clear_error();
+
                EC_GROUP_clear_free(ret);
                meth = EC_GFp_mont_method();
 
@@ -119,6 +122,7 @@ EC_GROUP *EC_GROUP_new_curve_GFp(const BIGNUM *p, const BIGNUM *a, const BIGNUM
        return ret;
        }
 
+
 EC_GROUP *EC_GROUP_new_curve_GF2m(const BIGNUM *p, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
        {
        const EC_METHOD *meth;