ec_cvt.c: ARM comparison results were wrong, clarify the background.

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

diff --git a/crypto/ec/ec_cvt.c b/crypto/ec/ec_cvt.c
index 989f366053b9cc5d7812132982dfa2c5a372c724..dffd70521a37164a3740ea828353ff3fee2df94e 100644 (file)
--- a/crypto/ec/ec_cvt.c
+++ b/crypto/ec/ec_cvt.c
@@ -1,7 +1,9 @@
-/* TODO */
 /* crypto/ec/ec_cvt.c */
+/*
+ * Originally written by Bodo Moeller for the OpenSSL project.
+ */
 /* ====================================================================
- * Copyright (c) 1998-2001 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -53,7 +55,92 @@
  * Hudson (tjh@cryptsoft.com).
  *
  */
+/* ====================================================================
+ * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
+ *
+ * Portions of the attached software ("Contribution") are developed by 
+ * SUN MICROSYSTEMS, INC., and are contributed to the OpenSSL project.
+ *
+ * The Contribution is licensed pursuant to the OpenSSL open source
+ * license provided above.
+ *
+ * The elliptic curve binary polynomial software is originally written by
+ * Sheueling Chang Shantz and Douglas Stebila of Sun Microsystems Laboratories.
+ *
+ */
 
-#include <openssl/ec.h>
+#define OPENSSL_FIPSAPI
 
+#include <openssl/err.h>
 #include "ec_lcl.h"
+
+
+EC_GROUP *EC_GROUP_new_curve_GFp(const BIGNUM *p, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
+       {
+       const EC_METHOD *meth;
+       EC_GROUP *ret;
+
+#if defined(OPENSSL_BN_ASM_MONT) && !defined(__sparc)
+       /*
+        * This might appear controversial, but the fact is that generic
+        * prime method was observed to deliver better performance even
+        * for NIST primes on a range of platforms, e.g.: 60%-15%
+        * improvement on IA-64, ~25% on ARM, 30%-90% on P4, 20%-25%
+        * in 32-bit build and 35%--12% in 64-bit build on Core2...
+        * Coefficients are relative to optimized bn_nist.c for most
+        * intensive ECDSA verify and ECDH operations for 192- and 521-
+        * bit keys respectively. Choice of these boundary values is
+        * arguable, because the dependency of improvement coefficient
+        * from key length is not a "monotone" curve. For example while
+        * 571-bit result is 23% on ARM, 384-bit one is -1%. But it's
+        * generally faster, sometimes "respectfully" faster, or
+        * "tolerably" slower... What effectively happens is that loop
+        * with bn_mul_add_words is put against bn_mul_mont, and the
+        * latter "wins" on short vectors. Correct solution should be
+        * implementing dedicated NxN multiplication subroutines for
+        * small N. But till it materializes, let's stick to generic
+        * prime method...
+        *                                              <appro>
+        */
+       meth = EC_GFp_mont_method();
+#else
+       if (BN_nist_mod_func(p))
+               meth = EC_GFp_nist_method();
+       else
+               meth = EC_GFp_mont_method();
+#endif
+       
+       ret = EC_GROUP_new(meth);
+       if (ret == NULL)
+               return NULL;
+
+       if (!EC_GROUP_set_curve_GFp(ret, p, a, b, ctx))
+               {
+               EC_GROUP_clear_free(ret);
+               return NULL;
+               }
+
+       return ret;
+       }
+
+#ifndef OPENSSL_NO_EC2M
+EC_GROUP *EC_GROUP_new_curve_GF2m(const BIGNUM *p, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
+       {
+       const EC_METHOD *meth;
+       EC_GROUP *ret;
+       
+       meth = EC_GF2m_simple_method();
+       
+       ret = EC_GROUP_new(meth);
+       if (ret == NULL)
+               return NULL;
+
+       if (!EC_GROUP_set_curve_GF2m(ret, p, a, b, ctx))
+               {
+               EC_GROUP_clear_free(ret);
+               return NULL;
+               }
+
+       return ret;
+       }
+#endif