Reorganise ECC code for inclusion in FIPS module.
authorDr. Stephen Henson <steve@openssl.org>
Mon, 14 Feb 2011 16:52:12 +0000 (16:52 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Mon, 14 Feb 2011 16:52:12 +0000 (16:52 +0000)
Move compression, point2oct and oct2point functions into separate files.

Add a flags field to EC_METHOD.

Add a flag EC_FLAGS_DEFAULT_OCT to use the default compession and oct
functions (all existing methods do this). This removes dependencies from
EC_METHOD while keeping original functionality.

14 files changed:
crypto/ec/Makefile
crypto/ec/ec2_mult.c
crypto/ec/ec2_oct.c [new file with mode: 0644]
crypto/ec/ec2_smpl.c
crypto/ec/ec_curve.c
crypto/ec/ec_key.c
crypto/ec/ec_lcl.h
crypto/ec/ec_lib.c
crypto/ec/ec_mult.c
crypto/ec/ec_oct.c [new file with mode: 0644]
crypto/ec/ecp_mont.c
crypto/ec/ecp_nist.c
crypto/ec/ecp_oct.c [new file with mode: 0644]
crypto/ec/ecp_smpl.c

index 13c1345..31d4714 100644 (file)
@@ -19,11 +19,13 @@ APPS=
 LIB=$(TOP)/libcrypto.a
 LIBSRC=        ec_lib.c ecp_smpl.c ecp_mont.c ecp_nist.c ec_cvt.c ec_mult.c\
        ec_err.c ec_curve.c ec_check.c ec_print.c ec_asn1.c ec_key.c\
-       ec2_smpl.c ec2_mult.c ec_ameth.c ec_pmeth.c eck_prn.c ecp_nistp224.c
+       ec2_smpl.c ec2_mult.c ec_ameth.c ec_pmeth.c eck_prn.c \
+       ecp_nistp224.c ecp_oct.c ec2_oct.c ec_oct.c
 
 LIBOBJ=        ec_lib.o ecp_smpl.o ecp_mont.o ecp_nist.o ec_cvt.o ec_mult.o\
        ec_err.o ec_curve.o ec_check.o ec_print.o ec_asn1.o ec_key.o\
-       ec2_smpl.o ec2_mult.o ec_ameth.o ec_pmeth.o eck_prn.o ecp_nistp224.o
+       ec2_smpl.o ec2_mult.o ec_ameth.o ec_pmeth.o eck_prn.o \
+       ecp_nistp224.o ecp_oct.o ec2_oct.o ec_oct.o
 
 SRC= $(LIBSRC)
 
index 26f4a78..f41665a 100644 (file)
@@ -67,6 +67,8 @@
  *
  */
 
+#define OPENSSL_FIPSAPI
+
 #include <openssl/err.h>
 
 #include "ec_lcl.h"
diff --git a/crypto/ec/ec2_oct.c b/crypto/ec/ec2_oct.c
new file mode 100644 (file)
index 0000000..f245fb5
--- /dev/null
@@ -0,0 +1,409 @@
+/* crypto/ec/ec2_oct.c */
+/* ====================================================================
+ * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
+ *
+ * The Elliptic Curve Public-Key Crypto Library (ECC Code) included
+ * herein is developed by SUN MICROSYSTEMS, INC., and is contributed
+ * to the OpenSSL project.
+ *
+ * The ECC Code is licensed pursuant to the OpenSSL open source
+ * license provided below.
+ *
+ * The software is originally written by Sheueling Chang Shantz and
+ * Douglas Stebila of Sun Microsystems Laboratories.
+ *
+ */
+/* ====================================================================
+ * Copyright (c) 1998-2005 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+#define OPENSSL_FIPSAPI
+
+#include <openssl/err.h>
+
+#include "ec_lcl.h"
+
+#ifndef OPENSSL_NO_EC2M
+
+/* Calculates and sets the affine coordinates of an EC_POINT from the given
+ * compressed coordinates.  Uses algorithm 2.3.4 of SEC 1. 
+ * Note that the simple implementation only uses affine coordinates.
+ *
+ * The method is from the following publication:
+ * 
+ *     Harper, Menezes, Vanstone:
+ *     "Public-Key Cryptosystems with Very Small Key Lengths",
+ *     EUROCRYPT '92, Springer-Verlag LNCS 658,
+ *     published February 1993
+ *
+ * US Patents 6,141,420 and 6,618,483 (Vanstone, Mullin, Agnew) describe
+ * the same method, but claim no priority date earlier than July 29, 1994
+ * (and additionally fail to cite the EUROCRYPT '92 publication as prior art).
+ */
+int ec_GF2m_simple_set_compressed_coordinates(const EC_GROUP *group, EC_POINT *point,
+       const BIGNUM *x_, int y_bit, BN_CTX *ctx)
+       {
+       BN_CTX *new_ctx = NULL;
+       BIGNUM *tmp, *x, *y, *z;
+       int ret = 0, z0;
+
+       /* clear error queue */
+       ERR_clear_error();
+
+       if (ctx == NULL)
+               {
+               ctx = new_ctx = BN_CTX_new();
+               if (ctx == NULL)
+                       return 0;
+               }
+
+       y_bit = (y_bit != 0) ? 1 : 0;
+
+       BN_CTX_start(ctx);
+       tmp = BN_CTX_get(ctx);
+       x = BN_CTX_get(ctx);
+       y = BN_CTX_get(ctx);
+       z = BN_CTX_get(ctx);
+       if (z == NULL) goto err;
+
+       if (!BN_GF2m_mod_arr(x, x_, group->poly)) goto err;
+       if (BN_is_zero(x))
+               {
+               if (!BN_GF2m_mod_sqrt_arr(y, &group->b, group->poly, ctx)) goto err;
+               }
+       else
+               {
+               if (!group->meth->field_sqr(group, tmp, x, ctx)) goto err;
+               if (!group->meth->field_div(group, tmp, &group->b, tmp, ctx)) goto err;
+               if (!BN_GF2m_add(tmp, &group->a, tmp)) goto err;
+               if (!BN_GF2m_add(tmp, x, tmp)) goto err;
+               if (!BN_GF2m_mod_solve_quad_arr(z, tmp, group->poly, ctx))
+                       {
+                       unsigned long err = ERR_peek_last_error();
+                       
+                       if (ERR_GET_LIB(err) == ERR_LIB_BN && ERR_GET_REASON(err) == BN_R_NO_SOLUTION)
+                               {
+                               ERR_clear_error();
+                               ECerr(EC_F_EC_GF2M_SIMPLE_SET_COMPRESSED_COORDINATES, EC_R_INVALID_COMPRESSED_POINT);
+                               }
+                       else
+                               ECerr(EC_F_EC_GF2M_SIMPLE_SET_COMPRESSED_COORDINATES, ERR_R_BN_LIB);
+                       goto err;
+                       }
+               z0 = (BN_is_odd(z)) ? 1 : 0;
+               if (!group->meth->field_mul(group, y, x, z, ctx)) goto err;
+               if (z0 != y_bit)
+                       {
+                       if (!BN_GF2m_add(y, y, x)) goto err;
+                       }
+               }
+
+       if (!EC_POINT_set_affine_coordinates_GF2m(group, point, x, y, ctx)) goto err;
+
+       ret = 1;
+
+ err:
+       BN_CTX_end(ctx);
+       if (new_ctx != NULL)
+               BN_CTX_free(new_ctx);
+       return ret;
+       }
+
+
+/* Converts an EC_POINT to an octet string.  
+ * If buf is NULL, the encoded length will be returned.
+ * If the length len of buf is smaller than required an error will be returned.
+ */
+size_t ec_GF2m_simple_point2oct(const EC_GROUP *group, const EC_POINT *point, point_conversion_form_t form,
+       unsigned char *buf, size_t len, BN_CTX *ctx)
+       {
+       size_t ret;
+       BN_CTX *new_ctx = NULL;
+       int used_ctx = 0;
+       BIGNUM *x, *y, *yxi;
+       size_t field_len, i, skip;
+
+       if ((form != POINT_CONVERSION_COMPRESSED)
+               && (form != POINT_CONVERSION_UNCOMPRESSED)
+               && (form != POINT_CONVERSION_HYBRID))
+               {
+               ECerr(EC_F_EC_GF2M_SIMPLE_POINT2OCT, EC_R_INVALID_FORM);
+               goto err;
+               }
+
+       if (EC_POINT_is_at_infinity(group, point))
+               {
+               /* encodes to a single 0 octet */
+               if (buf != NULL)
+                       {
+                       if (len < 1)
+                               {
+                               ECerr(EC_F_EC_GF2M_SIMPLE_POINT2OCT, EC_R_BUFFER_TOO_SMALL);
+                               return 0;
+                               }
+                       buf[0] = 0;
+                       }
+               return 1;
+               }
+
+
+       /* ret := required output buffer length */
+       field_len = (EC_GROUP_get_degree(group) + 7) / 8;
+       ret = (form == POINT_CONVERSION_COMPRESSED) ? 1 + field_len : 1 + 2*field_len;
+
+       /* if 'buf' is NULL, just return required length */
+       if (buf != NULL)
+               {
+               if (len < ret)
+                       {
+                       ECerr(EC_F_EC_GF2M_SIMPLE_POINT2OCT, EC_R_BUFFER_TOO_SMALL);
+                       goto err;
+                       }
+
+               if (ctx == NULL)
+                       {
+                       ctx = new_ctx = BN_CTX_new();
+                       if (ctx == NULL)
+                               return 0;
+                       }
+
+               BN_CTX_start(ctx);
+               used_ctx = 1;
+               x = BN_CTX_get(ctx);
+               y = BN_CTX_get(ctx);
+               yxi = BN_CTX_get(ctx);
+               if (yxi == NULL) goto err;
+
+               if (!EC_POINT_get_affine_coordinates_GF2m(group, point, x, y, ctx)) goto err;
+
+               buf[0] = form;
+               if ((form != POINT_CONVERSION_UNCOMPRESSED) && !BN_is_zero(x))
+                       {
+                       if (!group->meth->field_div(group, yxi, y, x, ctx)) goto err;
+                       if (BN_is_odd(yxi)) buf[0]++;
+                       }
+
+               i = 1;
+               
+               skip = field_len - BN_num_bytes(x);
+               if (skip > field_len)
+                       {
+                       ECerr(EC_F_EC_GF2M_SIMPLE_POINT2OCT, ERR_R_INTERNAL_ERROR);
+                       goto err;
+                       }
+               while (skip > 0)
+                       {
+                       buf[i++] = 0;
+                       skip--;
+                       }
+               skip = BN_bn2bin(x, buf + i);
+               i += skip;
+               if (i != 1 + field_len)
+                       {
+                       ECerr(EC_F_EC_GF2M_SIMPLE_POINT2OCT, ERR_R_INTERNAL_ERROR);
+                       goto err;
+                       }
+
+               if (form == POINT_CONVERSION_UNCOMPRESSED || form == POINT_CONVERSION_HYBRID)
+                       {
+                       skip = field_len - BN_num_bytes(y);
+                       if (skip > field_len)
+                               {
+                               ECerr(EC_F_EC_GF2M_SIMPLE_POINT2OCT, ERR_R_INTERNAL_ERROR);
+                               goto err;
+                               }
+                       while (skip > 0)
+                               {
+                               buf[i++] = 0;
+                               skip--;
+                               }
+                       skip = BN_bn2bin(y, buf + i);
+                       i += skip;
+                       }
+
+               if (i != ret)
+                       {
+                       ECerr(EC_F_EC_GF2M_SIMPLE_POINT2OCT, ERR_R_INTERNAL_ERROR);
+                       goto err;
+                       }
+               }
+       
+       if (used_ctx)
+               BN_CTX_end(ctx);
+       if (new_ctx != NULL)
+               BN_CTX_free(new_ctx);
+       return ret;
+
+ err:
+       if (used_ctx)
+               BN_CTX_end(ctx);
+       if (new_ctx != NULL)
+               BN_CTX_free(new_ctx);
+       return 0;
+       }
+
+
+/* Converts an octet string representation to an EC_POINT. 
+ * Note that the simple implementation only uses affine coordinates.
+ */
+int ec_GF2m_simple_oct2point(const EC_GROUP *group, EC_POINT *point,
+       const unsigned char *buf, size_t len, BN_CTX *ctx)
+       {
+       point_conversion_form_t form;
+       int y_bit;
+       BN_CTX *new_ctx = NULL;
+       BIGNUM *x, *y, *yxi;
+       size_t field_len, enc_len;
+       int ret = 0;
+
+       if (len == 0)
+               {
+               ECerr(EC_F_EC_GF2M_SIMPLE_OCT2POINT, EC_R_BUFFER_TOO_SMALL);
+               return 0;
+               }
+       form = buf[0];
+       y_bit = form & 1;
+       form = form & ~1U;
+       if ((form != 0) && (form != POINT_CONVERSION_COMPRESSED)
+               && (form != POINT_CONVERSION_UNCOMPRESSED)
+               && (form != POINT_CONVERSION_HYBRID))
+               {
+               ECerr(EC_F_EC_GF2M_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);
+               return 0;
+               }
+       if ((form == 0 || form == POINT_CONVERSION_UNCOMPRESSED) && y_bit)
+               {
+               ECerr(EC_F_EC_GF2M_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);
+               return 0;
+               }
+
+       if (form == 0)
+               {
+               if (len != 1)
+                       {
+                       ECerr(EC_F_EC_GF2M_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);
+                       return 0;
+                       }
+
+               return EC_POINT_set_to_infinity(group, point);
+               }
+       
+       field_len = (EC_GROUP_get_degree(group) + 7) / 8;
+       enc_len = (form == POINT_CONVERSION_COMPRESSED) ? 1 + field_len : 1 + 2*field_len;
+
+       if (len != enc_len)
+               {
+               ECerr(EC_F_EC_GF2M_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);
+               return 0;
+               }
+
+       if (ctx == NULL)
+               {
+               ctx = new_ctx = BN_CTX_new();
+               if (ctx == NULL)
+                       return 0;
+               }
+
+       BN_CTX_start(ctx);
+       x = BN_CTX_get(ctx);
+       y = BN_CTX_get(ctx);
+       yxi = BN_CTX_get(ctx);
+       if (yxi == NULL) goto err;
+
+       if (!BN_bin2bn(buf + 1, field_len, x)) goto err;
+       if (BN_ucmp(x, &group->field) >= 0)
+               {
+               ECerr(EC_F_EC_GF2M_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);
+               goto err;
+               }
+
+       if (form == POINT_CONVERSION_COMPRESSED)
+               {
+               if (!EC_POINT_set_compressed_coordinates_GF2m(group, point, x, y_bit, ctx)) goto err;
+               }
+       else
+               {
+               if (!BN_bin2bn(buf + 1 + field_len, field_len, y)) goto err;
+               if (BN_ucmp(y, &group->field) >= 0)
+                       {
+                       ECerr(EC_F_EC_GF2M_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);
+                       goto err;
+                       }
+               if (form == POINT_CONVERSION_HYBRID)
+                       {
+                       if (!group->meth->field_div(group, yxi, y, x, ctx)) goto err;
+                       if (y_bit != BN_is_odd(yxi))
+                               {
+                               ECerr(EC_F_EC_GF2M_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);
+                               goto err;
+                               }
+                       }
+
+               if (!EC_POINT_set_affine_coordinates_GF2m(group, point, x, y, ctx)) goto err;
+               }
+       
+       if (!EC_POINT_is_on_curve(group, point, ctx)) /* test required by X9.62 */
+               {
+               ECerr(EC_F_EC_GF2M_SIMPLE_OCT2POINT, EC_R_POINT_IS_NOT_ON_CURVE);
+               goto err;
+               }
+
+       ret = 1;
+       
+ err:
+       BN_CTX_end(ctx);
+       if (new_ctx != NULL)
+               BN_CTX_free(new_ctx);
+       return ret;
+       }
+#endif
index a379c9b..f37347b 100644 (file)
@@ -67,6 +67,8 @@
  *
  */
 
+#define OPENSSL_FIPSAPI
+
 #include <openssl/err.h>
 
 #include "ec_lcl.h"
@@ -77,6 +79,7 @@
 const EC_METHOD *EC_GF2m_simple_method(void)
        {
        static const EC_METHOD ret = {
+               EC_FLAGS_DEFAULT_OCT,
                NID_X9_62_characteristic_two_field,
                ec_GF2m_simple_group_init,
                ec_GF2m_simple_group_finish,
@@ -95,9 +98,7 @@ const EC_METHOD *EC_GF2m_simple_method(void)
                0 /* get_Jprojective_coordinates_GFp */,
                ec_GF2m_simple_point_set_affine_coordinates,
                ec_GF2m_simple_point_get_affine_coordinates,
-               ec_GF2m_simple_set_compressed_coordinates,
-               ec_GF2m_simple_point2oct,
-               ec_GF2m_simple_oct2point,
+               0,0,0,
                ec_GF2m_simple_add,
                ec_GF2m_simple_dbl,
                ec_GF2m_simple_invert,
@@ -407,340 +408,6 @@ int ec_GF2m_simple_point_get_affine_coordinates(const EC_GROUP *group, const EC_
        return ret;
        }
 
-
-/* Calculates and sets the affine coordinates of an EC_POINT from the given
- * compressed coordinates.  Uses algorithm 2.3.4 of SEC 1. 
- * Note that the simple implementation only uses affine coordinates.
- *
- * The method is from the following publication:
- * 
- *     Harper, Menezes, Vanstone:
- *     "Public-Key Cryptosystems with Very Small Key Lengths",
- *     EUROCRYPT '92, Springer-Verlag LNCS 658,
- *     published February 1993
- *
- * US Patents 6,141,420 and 6,618,483 (Vanstone, Mullin, Agnew) describe
- * the same method, but claim no priority date earlier than July 29, 1994
- * (and additionally fail to cite the EUROCRYPT '92 publication as prior art).
- */
-int ec_GF2m_simple_set_compressed_coordinates(const EC_GROUP *group, EC_POINT *point,
-       const BIGNUM *x_, int y_bit, BN_CTX *ctx)
-       {
-       BN_CTX *new_ctx = NULL;
-       BIGNUM *tmp, *x, *y, *z;
-       int ret = 0, z0;
-
-       /* clear error queue */
-       ERR_clear_error();
-
-       if (ctx == NULL)
-               {
-               ctx = new_ctx = BN_CTX_new();
-               if (ctx == NULL)
-                       return 0;
-               }
-
-       y_bit = (y_bit != 0) ? 1 : 0;
-
-       BN_CTX_start(ctx);
-       tmp = BN_CTX_get(ctx);
-       x = BN_CTX_get(ctx);
-       y = BN_CTX_get(ctx);
-       z = BN_CTX_get(ctx);
-       if (z == NULL) goto err;
-
-       if (!BN_GF2m_mod_arr(x, x_, group->poly)) goto err;
-       if (BN_is_zero(x))
-               {
-               if (!BN_GF2m_mod_sqrt_arr(y, &group->b, group->poly, ctx)) goto err;
-               }
-       else
-               {
-               if (!group->meth->field_sqr(group, tmp, x, ctx)) goto err;
-               if (!group->meth->field_div(group, tmp, &group->b, tmp, ctx)) goto err;
-               if (!BN_GF2m_add(tmp, &group->a, tmp)) goto err;
-               if (!BN_GF2m_add(tmp, x, tmp)) goto err;
-               if (!BN_GF2m_mod_solve_quad_arr(z, tmp, group->poly, ctx))
-                       {
-                       unsigned long err = ERR_peek_last_error();
-                       
-                       if (ERR_GET_LIB(err) == ERR_LIB_BN && ERR_GET_REASON(err) == BN_R_NO_SOLUTION)
-                               {
-                               ERR_clear_error();
-                               ECerr(EC_F_EC_GF2M_SIMPLE_SET_COMPRESSED_COORDINATES, EC_R_INVALID_COMPRESSED_POINT);
-                               }
-                       else
-                               ECerr(EC_F_EC_GF2M_SIMPLE_SET_COMPRESSED_COORDINATES, ERR_R_BN_LIB);
-                       goto err;
-                       }
-               z0 = (BN_is_odd(z)) ? 1 : 0;
-               if (!group->meth->field_mul(group, y, x, z, ctx)) goto err;
-               if (z0 != y_bit)
-                       {
-                       if (!BN_GF2m_add(y, y, x)) goto err;
-                       }
-               }
-
-       if (!EC_POINT_set_affine_coordinates_GF2m(group, point, x, y, ctx)) goto err;
-
-       ret = 1;
-
- err:
-       BN_CTX_end(ctx);
-       if (new_ctx != NULL)
-               BN_CTX_free(new_ctx);
-       return ret;
-       }
-
-
-/* Converts an EC_POINT to an octet string.  
- * If buf is NULL, the encoded length will be returned.
- * If the length len of buf is smaller than required an error will be returned.
- */
-size_t ec_GF2m_simple_point2oct(const EC_GROUP *group, const EC_POINT *point, point_conversion_form_t form,
-       unsigned char *buf, size_t len, BN_CTX *ctx)
-       {
-       size_t ret;
-       BN_CTX *new_ctx = NULL;
-       int used_ctx = 0;
-       BIGNUM *x, *y, *yxi;
-       size_t field_len, i, skip;
-
-       if ((form != POINT_CONVERSION_COMPRESSED)
-               && (form != POINT_CONVERSION_UNCOMPRESSED)
-               && (form != POINT_CONVERSION_HYBRID))
-               {
-               ECerr(EC_F_EC_GF2M_SIMPLE_POINT2OCT, EC_R_INVALID_FORM);
-               goto err;
-               }
-
-       if (EC_POINT_is_at_infinity(group, point))
-               {
-               /* encodes to a single 0 octet */
-               if (buf != NULL)
-                       {
-                       if (len < 1)
-                               {
-                               ECerr(EC_F_EC_GF2M_SIMPLE_POINT2OCT, EC_R_BUFFER_TOO_SMALL);
-                               return 0;
-                               }
-                       buf[0] = 0;
-                       }
-               return 1;
-               }
-
-
-       /* ret := required output buffer length */
-       field_len = (EC_GROUP_get_degree(group) + 7) / 8;
-       ret = (form == POINT_CONVERSION_COMPRESSED) ? 1 + field_len : 1 + 2*field_len;
-
-       /* if 'buf' is NULL, just return required length */
-       if (buf != NULL)
-               {
-               if (len < ret)
-                       {
-                       ECerr(EC_F_EC_GF2M_SIMPLE_POINT2OCT, EC_R_BUFFER_TOO_SMALL);
-                       goto err;
-                       }
-
-               if (ctx == NULL)
-                       {
-                       ctx = new_ctx = BN_CTX_new();
-                       if (ctx == NULL)
-                               return 0;
-                       }
-
-               BN_CTX_start(ctx);
-               used_ctx = 1;
-               x = BN_CTX_get(ctx);
-               y = BN_CTX_get(ctx);
-               yxi = BN_CTX_get(ctx);
-               if (yxi == NULL) goto err;
-
-               if (!EC_POINT_get_affine_coordinates_GF2m(group, point, x, y, ctx)) goto err;
-
-               buf[0] = form;
-               if ((form != POINT_CONVERSION_UNCOMPRESSED) && !BN_is_zero(x))
-                       {
-                       if (!group->meth->field_div(group, yxi, y, x, ctx)) goto err;
-                       if (BN_is_odd(yxi)) buf[0]++;
-                       }
-
-               i = 1;
-               
-               skip = field_len - BN_num_bytes(x);
-               if (skip > field_len)
-                       {
-                       ECerr(EC_F_EC_GF2M_SIMPLE_POINT2OCT, ERR_R_INTERNAL_ERROR);
-                       goto err;
-                       }
-               while (skip > 0)
-                       {
-                       buf[i++] = 0;
-                       skip--;
-                       }
-               skip = BN_bn2bin(x, buf + i);
-               i += skip;
-               if (i != 1 + field_len)
-                       {
-                       ECerr(EC_F_EC_GF2M_SIMPLE_POINT2OCT, ERR_R_INTERNAL_ERROR);
-                       goto err;
-                       }
-
-               if (form == POINT_CONVERSION_UNCOMPRESSED || form == POINT_CONVERSION_HYBRID)
-                       {
-                       skip = field_len - BN_num_bytes(y);
-                       if (skip > field_len)
-                               {
-                               ECerr(EC_F_EC_GF2M_SIMPLE_POINT2OCT, ERR_R_INTERNAL_ERROR);
-                               goto err;
-                               }
-                       while (skip > 0)
-                               {
-                               buf[i++] = 0;
-                               skip--;
-                               }
-                       skip = BN_bn2bin(y, buf + i);
-                       i += skip;
-                       }
-
-               if (i != ret)
-                       {
-                       ECerr(EC_F_EC_GF2M_SIMPLE_POINT2OCT, ERR_R_INTERNAL_ERROR);
-                       goto err;
-                       }
-               }
-       
-       if (used_ctx)
-               BN_CTX_end(ctx);
-       if (new_ctx != NULL)
-               BN_CTX_free(new_ctx);
-       return ret;
-
- err:
-       if (used_ctx)
-               BN_CTX_end(ctx);
-       if (new_ctx != NULL)
-               BN_CTX_free(new_ctx);
-       return 0;
-       }
-
-
-/* Converts an octet string representation to an EC_POINT. 
- * Note that the simple implementation only uses affine coordinates.
- */
-int ec_GF2m_simple_oct2point(const EC_GROUP *group, EC_POINT *point,
-       const unsigned char *buf, size_t len, BN_CTX *ctx)
-       {
-       point_conversion_form_t form;
-       int y_bit;
-       BN_CTX *new_ctx = NULL;
-       BIGNUM *x, *y, *yxi;
-       size_t field_len, enc_len;
-       int ret = 0;
-
-       if (len == 0)
-               {
-               ECerr(EC_F_EC_GF2M_SIMPLE_OCT2POINT, EC_R_BUFFER_TOO_SMALL);
-               return 0;
-               }
-       form = buf[0];
-       y_bit = form & 1;
-       form = form & ~1U;
-       if ((form != 0) && (form != POINT_CONVERSION_COMPRESSED)
-               && (form != POINT_CONVERSION_UNCOMPRESSED)
-               && (form != POINT_CONVERSION_HYBRID))
-               {
-               ECerr(EC_F_EC_GF2M_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);
-               return 0;
-               }
-       if ((form == 0 || form == POINT_CONVERSION_UNCOMPRESSED) && y_bit)
-               {
-               ECerr(EC_F_EC_GF2M_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);
-               return 0;
-               }
-
-       if (form == 0)
-               {
-               if (len != 1)
-                       {
-                       ECerr(EC_F_EC_GF2M_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);
-                       return 0;
-                       }
-
-               return EC_POINT_set_to_infinity(group, point);
-               }
-       
-       field_len = (EC_GROUP_get_degree(group) + 7) / 8;
-       enc_len = (form == POINT_CONVERSION_COMPRESSED) ? 1 + field_len : 1 + 2*field_len;
-
-       if (len != enc_len)
-               {
-               ECerr(EC_F_EC_GF2M_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);
-               return 0;
-               }
-
-       if (ctx == NULL)
-               {
-               ctx = new_ctx = BN_CTX_new();
-               if (ctx == NULL)
-                       return 0;
-               }
-
-       BN_CTX_start(ctx);
-       x = BN_CTX_get(ctx);
-       y = BN_CTX_get(ctx);
-       yxi = BN_CTX_get(ctx);
-       if (yxi == NULL) goto err;
-
-       if (!BN_bin2bn(buf + 1, field_len, x)) goto err;
-       if (BN_ucmp(x, &group->field) >= 0)
-               {
-               ECerr(EC_F_EC_GF2M_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);
-               goto err;
-               }
-
-       if (form == POINT_CONVERSION_COMPRESSED)
-               {
-               if (!EC_POINT_set_compressed_coordinates_GF2m(group, point, x, y_bit, ctx)) goto err;
-               }
-       else
-               {
-               if (!BN_bin2bn(buf + 1 + field_len, field_len, y)) goto err;
-               if (BN_ucmp(y, &group->field) >= 0)
-                       {
-                       ECerr(EC_F_EC_GF2M_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);
-                       goto err;
-                       }
-               if (form == POINT_CONVERSION_HYBRID)
-                       {
-                       if (!group->meth->field_div(group, yxi, y, x, ctx)) goto err;
-                       if (y_bit != BN_is_odd(yxi))
-                               {
-                               ECerr(EC_F_EC_GF2M_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);
-                               goto err;
-                               }
-                       }
-
-               if (!EC_POINT_set_affine_coordinates_GF2m(group, point, x, y, ctx)) goto err;
-               }
-       
-       if (!EC_POINT_is_on_curve(group, point, ctx)) /* test required by X9.62 */
-               {
-               ECerr(EC_F_EC_GF2M_SIMPLE_OCT2POINT, EC_R_POINT_IS_NOT_ON_CURVE);
-               goto err;
-               }
-
-       ret = 1;
-       
- err:
-       BN_CTX_end(ctx);
-       if (new_ctx != NULL)
-               BN_CTX_free(new_ctx);
-       return ret;
-       }
-
-
 /* Computes a + b and stores the result in r.  r could be a or b, a could be b.
  * Uses algorithm A.10.2 of IEEE P1363.
  */
index 85cd3b6..7d56dfc 100644 (file)
@@ -69,6 +69,8 @@
  *
  */
 
+#define OPENSSL_FIPSAPI
+
 #include "ec_lcl.h"
 #include <openssl/err.h>
 #include <openssl/obj_mac.h>
index 2e91b54..7126cd6 100644 (file)
@@ -61,6 +61,8 @@
  * contributed to the OpenSSL project.
  */
 
+#define OPENSSL_FIPSAPI
+
 #include <string.h>
 #include "ec_lcl.h"
 #include <openssl/err.h>
index fd751e5..2e97818 100644 (file)
 # endif
 #endif
 
+/* Use default functions for poin2oct, oct2point and compressed coordinates */
+#define EC_FLAGS_DEFAULT_OCT   0x1
+
 /* Structure details are not part of the exported interface,
  * so all this may change in future versions. */
 
 struct ec_method_st {
+       /* Various method flags */
+       int flags;
        /* used by EC_METHOD_get_field_type: */
        int field_type; /* a NID */
 
index e0f0afc..c955f6e 100644 (file)
@@ -61,6 +61,8 @@
  * SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project.
  */
 
+#define OPENSSL_FIPSAPI
+
 #include <string.h>
 
 #include <openssl/err.h>
@@ -908,74 +910,6 @@ int EC_POINT_get_affine_coordinates_GF2m(const EC_GROUP *group, const EC_POINT *
        }
 #endif
 
-int EC_POINT_set_compressed_coordinates_GFp(const EC_GROUP *group, EC_POINT *point,
-       const BIGNUM *x, int y_bit, BN_CTX *ctx)
-       {
-       if (group->meth->point_set_compressed_coordinates == 0)
-               {
-               ECerr(EC_F_EC_POINT_SET_COMPRESSED_COORDINATES_GFP, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
-               return 0;
-               }
-       if (group->meth != point->meth)
-               {
-               ECerr(EC_F_EC_POINT_SET_COMPRESSED_COORDINATES_GFP, EC_R_INCOMPATIBLE_OBJECTS);
-               return 0;
-               }
-       return group->meth->point_set_compressed_coordinates(group, point, x, y_bit, ctx);
-       }
-
-#ifndef OPENSSL_NO_EC2M
-int EC_POINT_set_compressed_coordinates_GF2m(const EC_GROUP *group, EC_POINT *point,
-       const BIGNUM *x, int y_bit, BN_CTX *ctx)
-       {
-       if (group->meth->point_set_compressed_coordinates == 0)
-               {
-               ECerr(EC_F_EC_POINT_SET_COMPRESSED_COORDINATES_GF2M, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
-               return 0;
-               }
-       if (group->meth != point->meth)
-               {
-               ECerr(EC_F_EC_POINT_SET_COMPRESSED_COORDINATES_GF2M, EC_R_INCOMPATIBLE_OBJECTS);
-               return 0;
-               }
-       return group->meth->point_set_compressed_coordinates(group, point, x, y_bit, ctx);
-       }
-#endif
-
-size_t EC_POINT_point2oct(const EC_GROUP *group, const EC_POINT *point, point_conversion_form_t form,
-        unsigned char *buf, size_t len, BN_CTX *ctx)
-       {
-       if (group->meth->point2oct == 0)
-               {
-               ECerr(EC_F_EC_POINT_POINT2OCT, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
-               return 0;
-               }
-       if (group->meth != point->meth)
-               {
-               ECerr(EC_F_EC_POINT_POINT2OCT, EC_R_INCOMPATIBLE_OBJECTS);
-               return 0;
-               }
-       return group->meth->point2oct(group, point, form, buf, len, ctx);
-       }
-
-
-int EC_POINT_oct2point(const EC_GROUP *group, EC_POINT *point,
-        const unsigned char *buf, size_t len, BN_CTX *ctx)
-       {
-       if (group->meth->oct2point == 0)
-               {
-               ECerr(EC_F_EC_POINT_OCT2POINT, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
-               return 0;
-               }
-       if (group->meth != point->meth)
-               {
-               ECerr(EC_F_EC_POINT_OCT2POINT, EC_R_INCOMPATIBLE_OBJECTS);
-               return 0;
-               }
-       return group->meth->oct2point(group, point, buf, len, ctx);
-       }
-
-
 int EC_POINT_add(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a, const EC_POINT *b, BN_CTX *ctx)
        {
        if (group->meth->add == 0)
index 19f2167..fb693c3 100644 (file)
@@ -61,6 +61,8 @@
  * and contributed to the OpenSSL project.
  */
 
+#define OPENSSL_FIPSAPI
+
 #include <string.h>
 
 #include <openssl/err.h>
diff --git a/crypto/ec/ec_oct.c b/crypto/ec/ec_oct.c
new file mode 100644 (file)
index 0000000..606e094
--- /dev/null
@@ -0,0 +1,178 @@
+/* crypto/ec/ec_lib.c */
+/*
+ * Originally written by Bodo Moeller for the OpenSSL project.
+ */
+/* ====================================================================
+ * Copyright (c) 1998-2003 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+/* ====================================================================
+ * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
+ * Binary polynomial ECC support in OpenSSL originally developed by 
+ * SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project.
+ */
+
+#include <string.h>
+
+#include <openssl/err.h>
+#include <openssl/opensslv.h>
+
+#include "ec_lcl.h"
+
+int EC_POINT_set_compressed_coordinates_GFp(const EC_GROUP *group, EC_POINT *point,
+       const BIGNUM *x, int y_bit, BN_CTX *ctx)
+       {
+       if (group->meth->point_set_compressed_coordinates == 0
+               && !(group->meth->flags & EC_FLAGS_DEFAULT_OCT))
+               {
+               ECerr(EC_F_EC_POINT_SET_COMPRESSED_COORDINATES_GFP, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
+               return 0;
+               }
+       if (group->meth != point->meth)
+               {
+               ECerr(EC_F_EC_POINT_SET_COMPRESSED_COORDINATES_GFP, EC_R_INCOMPATIBLE_OBJECTS);
+               return 0;
+               }
+       if(group->meth->flags & EC_FLAGS_DEFAULT_OCT)
+               {
+               if (group->meth->field_type == NID_X9_62_prime_field)
+                       return ec_GFp_simple_set_compressed_coordinates(
+                                       group, point, x, y_bit, ctx);
+               else
+                       return ec_GF2m_simple_set_compressed_coordinates(
+                                       group, point, x, y_bit, ctx);
+               }
+       return group->meth->point_set_compressed_coordinates(group, point, x, y_bit, ctx);
+       }
+
+#ifndef OPENSSL_NO_EC2M
+int EC_POINT_set_compressed_coordinates_GF2m(const EC_GROUP *group, EC_POINT *point,
+       const BIGNUM *x, int y_bit, BN_CTX *ctx)
+       {
+       if (group->meth->point_set_compressed_coordinates == 0
+               && !(group->meth->flags & EC_FLAGS_DEFAULT_OCT))
+               {
+               ECerr(EC_F_EC_POINT_SET_COMPRESSED_COORDINATES_GF2M, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
+               return 0;
+               }
+       if (group->meth != point->meth)
+               {
+               ECerr(EC_F_EC_POINT_SET_COMPRESSED_COORDINATES_GF2M, EC_R_INCOMPATIBLE_OBJECTS);
+               return 0;
+               }
+       if(group->meth->flags & EC_FLAGS_DEFAULT_OCT)
+               {
+               if (group->meth->field_type == NID_X9_62_prime_field)
+                       return ec_GFp_simple_set_compressed_coordinates(
+                                       group, point, x, y_bit, ctx);
+               else
+                       return ec_GF2m_simple_set_compressed_coordinates(
+                                       group, point, x, y_bit, ctx);
+               }
+       return group->meth->point_set_compressed_coordinates(group, point, x, y_bit, ctx);
+       }
+#endif
+
+size_t EC_POINT_point2oct(const EC_GROUP *group, const EC_POINT *point, point_conversion_form_t form,
+        unsigned char *buf, size_t len, BN_CTX *ctx)
+       {
+       if (group->meth->point2oct == 0
+               && !(group->meth->flags & EC_FLAGS_DEFAULT_OCT))
+               {
+               ECerr(EC_F_EC_POINT_POINT2OCT, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
+               return 0;
+               }
+       if (group->meth != point->meth)
+               {
+               ECerr(EC_F_EC_POINT_POINT2OCT, EC_R_INCOMPATIBLE_OBJECTS);
+               return 0;
+               }
+       if(group->meth->flags & EC_FLAGS_DEFAULT_OCT)
+               {
+               if (group->meth->field_type == NID_X9_62_prime_field)
+                       return ec_GFp_simple_point2oct(group, point,
+                                                       form, buf, len, ctx);
+               else
+                       return ec_GF2m_simple_point2oct(group, point,
+                                                       form, buf, len, ctx);
+               }
+                       
+       return group->meth->point2oct(group, point, form, buf, len, ctx);
+       }
+
+
+int EC_POINT_oct2point(const EC_GROUP *group, EC_POINT *point,
+        const unsigned char *buf, size_t len, BN_CTX *ctx)
+       {
+       if (group->meth->oct2point == 0
+               && !(group->meth->flags & EC_FLAGS_DEFAULT_OCT))
+               {
+               ECerr(EC_F_EC_POINT_OCT2POINT, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
+               return 0;
+               }
+       if (group->meth != point->meth)
+               {
+               ECerr(EC_F_EC_POINT_OCT2POINT, EC_R_INCOMPATIBLE_OBJECTS);
+               return 0;
+               }
+       if(group->meth->flags & EC_FLAGS_DEFAULT_OCT)
+               {
+               if (group->meth->field_type == NID_X9_62_prime_field)
+                       return ec_GFp_simple_oct2point(group, point,
+                                                       buf, len, ctx);
+               else
+                       return ec_GF2m_simple_oct2point(group, point,
+                                                       buf, len, ctx);
+               }
+       return group->meth->oct2point(group, point, buf, len, ctx);
+       }
+
index 9fc4a46..232ae34 100644 (file)
@@ -61,6 +61,8 @@
  * and contributed to the OpenSSL project.
  */
 
+#define OPENSSL_FIPSAPI
+
 #include <openssl/err.h>
 
 #include "ec_lcl.h"
@@ -69,6 +71,7 @@
 const EC_METHOD *EC_GFp_mont_method(void)
        {
        static const EC_METHOD ret = {
+               EC_FLAGS_DEFAULT_OCT,
                NID_X9_62_prime_field,
                ec_GFp_mont_group_init,
                ec_GFp_mont_group_finish,
@@ -87,9 +90,7 @@ const EC_METHOD *EC_GFp_mont_method(void)
                ec_GFp_simple_get_Jprojective_coordinates_GFp,
                ec_GFp_simple_point_set_affine_coordinates,
                ec_GFp_simple_point_get_affine_coordinates,
-               ec_GFp_simple_set_compressed_coordinates,
-               ec_GFp_simple_point2oct,
-               ec_GFp_simple_oct2point,
+               0,0,0,
                ec_GFp_simple_add,
                ec_GFp_simple_dbl,
                ec_GFp_simple_invert,
index 2a5682e..ad9bb70 100644 (file)
@@ -61,6 +61,8 @@
  * and contributed to the OpenSSL project.
  */
 
+#define OPENSSL_FIPSAPI
+
 #include <limits.h>
 
 #include <openssl/err.h>
@@ -70,6 +72,7 @@
 const EC_METHOD *EC_GFp_nist_method(void)
        {
        static const EC_METHOD ret = {
+               EC_FLAGS_DEFAULT_OCT,
                NID_X9_62_prime_field,
                ec_GFp_simple_group_init,
                ec_GFp_simple_group_finish,
@@ -88,9 +91,7 @@ const EC_METHOD *EC_GFp_nist_method(void)
                ec_GFp_simple_get_Jprojective_coordinates_GFp,
                ec_GFp_simple_point_set_affine_coordinates,
                ec_GFp_simple_point_get_affine_coordinates,
-               ec_GFp_simple_set_compressed_coordinates,
-               ec_GFp_simple_point2oct,
-               ec_GFp_simple_oct2point,
+               0,0,0,
                ec_GFp_simple_add,
                ec_GFp_simple_dbl,
                ec_GFp_simple_invert,
diff --git a/crypto/ec/ecp_oct.c b/crypto/ec/ecp_oct.c
new file mode 100644 (file)
index 0000000..374a0ee
--- /dev/null
@@ -0,0 +1,433 @@
+/* crypto/ec/ecp_oct.c */
+/* Includes code written by Lenka Fibikova <fibikova@exp-math.uni-essen.de>
+ * for the OpenSSL project. 
+ * Includes code written by Bodo Moeller for the OpenSSL project.
+*/
+/* ====================================================================
+ * 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+/* ====================================================================
+ * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
+ * Portions of this software developed by SUN MICROSYSTEMS, INC.,
+ * and contributed to the OpenSSL project.
+ */
+
+#include <openssl/err.h>
+#include <openssl/symhacks.h>
+
+#include "ec_lcl.h"
+
+int ec_GFp_simple_set_compressed_coordinates(const EC_GROUP *group, EC_POINT *point,
+       const BIGNUM *x_, int y_bit, BN_CTX *ctx)
+       {
+       BN_CTX *new_ctx = NULL;
+       BIGNUM *tmp1, *tmp2, *x, *y;
+       int ret = 0;
+
+       /* clear error queue*/
+       ERR_clear_error();
+
+       if (ctx == NULL)
+               {
+               ctx = new_ctx = BN_CTX_new();
+               if (ctx == NULL)
+                       return 0;
+               }
+
+       y_bit = (y_bit != 0);
+
+       BN_CTX_start(ctx);
+       tmp1 = BN_CTX_get(ctx);
+       tmp2 = BN_CTX_get(ctx);
+       x = BN_CTX_get(ctx);
+       y = BN_CTX_get(ctx);
+       if (y == NULL) goto err;
+
+       /* Recover y.  We have a Weierstrass equation
+        *     y^2 = x^3 + a*x + b,
+        * so  y  is one of the square roots of  x^3 + a*x + b.
+        */
+
+       /* tmp1 := x^3 */
+       if (!BN_nnmod(x, x_, &group->field,ctx)) goto err;
+       if (group->meth->field_decode == 0)
+               {
+               /* field_{sqr,mul} work on standard representation */
+               if (!group->meth->field_sqr(group, tmp2, x_, ctx)) goto err;
+               if (!group->meth->field_mul(group, tmp1, tmp2, x_, ctx)) goto err;
+               }
+       else
+               {
+               if (!BN_mod_sqr(tmp2, x_, &group->field, ctx)) goto err;
+               if (!BN_mod_mul(tmp1, tmp2, x_, &group->field, ctx)) goto err;
+               }
+       
+       /* tmp1 := tmp1 + a*x */
+       if (group->a_is_minus3)
+               {
+               if (!BN_mod_lshift1_quick(tmp2, x, &group->field)) goto err;
+               if (!BN_mod_add_quick(tmp2, tmp2, x, &group->field)) goto err;
+               if (!BN_mod_sub_quick(tmp1, tmp1, tmp2, &group->field)) goto err;
+               }
+       else
+               {
+               if (group->meth->field_decode)
+                       {
+                       if (!group->meth->field_decode(group, tmp2, &group->a, ctx)) goto err;
+                       if (!BN_mod_mul(tmp2, tmp2, x, &group->field, ctx)) goto err;
+                       }
+               else
+                       {
+                       /* field_mul works on standard representation */
+                       if (!group->meth->field_mul(group, tmp2, &group->a, x, ctx)) goto err;
+                       }
+               
+               if (!BN_mod_add_quick(tmp1, tmp1, tmp2, &group->field)) goto err;
+               }
+       
+       /* tmp1 := tmp1 + b */
+       if (group->meth->field_decode)
+               {
+               if (!group->meth->field_decode(group, tmp2, &group->b, ctx)) goto err;
+               if (!BN_mod_add_quick(tmp1, tmp1, tmp2, &group->field)) goto err;
+               }
+       else
+               {
+               if (!BN_mod_add_quick(tmp1, tmp1, &group->b, &group->field)) goto err;
+               }
+       
+       if (!BN_mod_sqrt(y, tmp1, &group->field, ctx))
+               {
+               unsigned long err = ERR_peek_last_error();
+               
+               if (ERR_GET_LIB(err) == ERR_LIB_BN && ERR_GET_REASON(err) == BN_R_NOT_A_SQUARE)
+                       {
+                       ERR_clear_error();
+                       ECerr(EC_F_EC_GFP_SIMPLE_SET_COMPRESSED_COORDINATES, EC_R_INVALID_COMPRESSED_POINT);
+                       }
+               else
+                       ECerr(EC_F_EC_GFP_SIMPLE_SET_COMPRESSED_COORDINATES, ERR_R_BN_LIB);
+               goto err;
+               }
+
+       if (y_bit != BN_is_odd(y))
+               {
+               if (BN_is_zero(y))
+                       {
+                       int kron;
+
+                       kron = BN_kronecker(x, &group->field, ctx);
+                       if (kron == -2) goto err;
+
+                       if (kron == 1)
+                               ECerr(EC_F_EC_GFP_SIMPLE_SET_COMPRESSED_COORDINATES, EC_R_INVALID_COMPRESSION_BIT);
+                       else
+                               /* BN_mod_sqrt() should have cought this error (not a square) */
+                               ECerr(EC_F_EC_GFP_SIMPLE_SET_COMPRESSED_COORDINATES, EC_R_INVALID_COMPRESSED_POINT);
+                       goto err;
+                       }
+               if (!BN_usub(y, &group->field, y)) goto err;
+               }
+       if (y_bit != BN_is_odd(y))
+               {
+               ECerr(EC_F_EC_GFP_SIMPLE_SET_COMPRESSED_COORDINATES, ERR_R_INTERNAL_ERROR);
+               goto err;
+               }
+
+       if (!EC_POINT_set_affine_coordinates_GFp(group, point, x, y, ctx)) goto err;
+
+       ret = 1;
+
+ err:
+       BN_CTX_end(ctx);
+       if (new_ctx != NULL)
+               BN_CTX_free(new_ctx);
+       return ret;
+       }
+
+
+size_t ec_GFp_simple_point2oct(const EC_GROUP *group, const EC_POINT *point, point_conversion_form_t form,
+       unsigned char *buf, size_t len, BN_CTX *ctx)
+       {
+       size_t ret;
+       BN_CTX *new_ctx = NULL;
+       int used_ctx = 0;
+       BIGNUM *x, *y;
+       size_t field_len, i, skip;
+
+       if ((form != POINT_CONVERSION_COMPRESSED)
+               && (form != POINT_CONVERSION_UNCOMPRESSED)
+               && (form != POINT_CONVERSION_HYBRID))
+               {
+               ECerr(EC_F_EC_GFP_SIMPLE_POINT2OCT, EC_R_INVALID_FORM);
+               goto err;
+               }
+
+       if (EC_POINT_is_at_infinity(group, point))
+               {
+               /* encodes to a single 0 octet */
+               if (buf != NULL)
+                       {
+                       if (len < 1)
+                               {
+                               ECerr(EC_F_EC_GFP_SIMPLE_POINT2OCT, EC_R_BUFFER_TOO_SMALL);
+                               return 0;
+                               }
+                       buf[0] = 0;
+                       }
+               return 1;
+               }
+
+
+       /* ret := required output buffer length */
+       field_len = BN_num_bytes(&group->field);
+       ret = (form == POINT_CONVERSION_COMPRESSED) ? 1 + field_len : 1 + 2*field_len;
+
+       /* if 'buf' is NULL, just return required length */
+       if (buf != NULL)
+               {
+               if (len < ret)
+                       {
+                       ECerr(EC_F_EC_GFP_SIMPLE_POINT2OCT, EC_R_BUFFER_TOO_SMALL);
+                       goto err;
+                       }
+
+               if (ctx == NULL)
+                       {
+                       ctx = new_ctx = BN_CTX_new();
+                       if (ctx == NULL)
+                               return 0;
+                       }
+
+               BN_CTX_start(ctx);
+               used_ctx = 1;
+               x = BN_CTX_get(ctx);
+               y = BN_CTX_get(ctx);
+               if (y == NULL) goto err;
+
+               if (!EC_POINT_get_affine_coordinates_GFp(group, point, x, y, ctx)) goto err;
+
+               if ((form == POINT_CONVERSION_COMPRESSED || form == POINT_CONVERSION_HYBRID) && BN_is_odd(y))
+                       buf[0] = form + 1;
+               else
+                       buf[0] = form;
+       
+               i = 1;
+               
+               skip = field_len - BN_num_bytes(x);
+               if (skip > field_len)
+                       {
+                       ECerr(EC_F_EC_GFP_SIMPLE_POINT2OCT, ERR_R_INTERNAL_ERROR);
+                       goto err;
+                       }
+               while (skip > 0)
+                       {
+                       buf[i++] = 0;
+                       skip--;
+                       }
+               skip = BN_bn2bin(x, buf + i);
+               i += skip;
+               if (i != 1 + field_len)
+                       {
+                       ECerr(EC_F_EC_GFP_SIMPLE_POINT2OCT, ERR_R_INTERNAL_ERROR);
+                       goto err;
+                       }
+
+               if (form == POINT_CONVERSION_UNCOMPRESSED || form == POINT_CONVERSION_HYBRID)
+                       {
+                       skip = field_len - BN_num_bytes(y);
+                       if (skip > field_len)
+                               {
+                               ECerr(EC_F_EC_GFP_SIMPLE_POINT2OCT, ERR_R_INTERNAL_ERROR);
+                               goto err;
+                               }
+                       while (skip > 0)
+                               {
+                               buf[i++] = 0;
+                               skip--;
+                               }
+                       skip = BN_bn2bin(y, buf + i);
+                       i += skip;
+                       }
+
+               if (i != ret)
+                       {
+                       ECerr(EC_F_EC_GFP_SIMPLE_POINT2OCT, ERR_R_INTERNAL_ERROR);
+                       goto err;
+                       }
+               }
+       
+       if (used_ctx)
+               BN_CTX_end(ctx);
+       if (new_ctx != NULL)
+               BN_CTX_free(new_ctx);
+       return ret;
+
+ err:
+       if (used_ctx)
+               BN_CTX_end(ctx);
+       if (new_ctx != NULL)
+               BN_CTX_free(new_ctx);
+       return 0;
+       }
+
+
+int ec_GFp_simple_oct2point(const EC_GROUP *group, EC_POINT *point,
+       const unsigned char *buf, size_t len, BN_CTX *ctx)
+       {
+       point_conversion_form_t form;
+       int y_bit;
+       BN_CTX *new_ctx = NULL;
+       BIGNUM *x, *y;
+       size_t field_len, enc_len;
+       int ret = 0;
+
+       if (len == 0)
+               {
+               ECerr(EC_F_EC_GFP_SIMPLE_OCT2POINT, EC_R_BUFFER_TOO_SMALL);
+               return 0;
+               }
+       form = buf[0];
+       y_bit = form & 1;
+       form = form & ~1U;
+       if ((form != 0) && (form != POINT_CONVERSION_COMPRESSED)
+               && (form != POINT_CONVERSION_UNCOMPRESSED)
+               && (form != POINT_CONVERSION_HYBRID))
+               {
+               ECerr(EC_F_EC_GFP_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);
+               return 0;
+               }
+       if ((form == 0 || form == POINT_CONVERSION_UNCOMPRESSED) && y_bit)
+               {
+               ECerr(EC_F_EC_GFP_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);
+               return 0;
+               }
+
+       if (form == 0)
+               {
+               if (len != 1)
+                       {
+                       ECerr(EC_F_EC_GFP_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);
+                       return 0;
+                       }
+
+               return EC_POINT_set_to_infinity(group, point);
+               }
+       
+       field_len = BN_num_bytes(&group->field);
+       enc_len = (form == POINT_CONVERSION_COMPRESSED) ? 1 + field_len : 1 + 2*field_len;
+
+       if (len != enc_len)
+               {
+               ECerr(EC_F_EC_GFP_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);
+               return 0;
+               }
+
+       if (ctx == NULL)
+               {
+               ctx = new_ctx = BN_CTX_new();
+               if (ctx == NULL)
+                       return 0;
+               }
+
+       BN_CTX_start(ctx);
+       x = BN_CTX_get(ctx);
+       y = BN_CTX_get(ctx);
+       if (y == NULL) goto err;
+
+       if (!BN_bin2bn(buf + 1, field_len, x)) goto err;
+       if (BN_ucmp(x, &group->field) >= 0)
+               {
+               ECerr(EC_F_EC_GFP_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);
+               goto err;
+               }
+
+       if (form == POINT_CONVERSION_COMPRESSED)
+               {
+               if (!EC_POINT_set_compressed_coordinates_GFp(group, point, x, y_bit, ctx)) goto err;
+               }
+       else
+               {
+               if (!BN_bin2bn(buf + 1 + field_len, field_len, y)) goto err;
+               if (BN_ucmp(y, &group->field) >= 0)
+                       {
+                       ECerr(EC_F_EC_GFP_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);
+                       goto err;
+                       }
+               if (form == POINT_CONVERSION_HYBRID)
+                       {
+                       if (y_bit != BN_is_odd(y))
+                               {
+                               ECerr(EC_F_EC_GFP_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);
+                               goto err;
+                               }
+                       }
+
+               if (!EC_POINT_set_affine_coordinates_GFp(group, point, x, y, ctx)) goto err;
+               }
+       
+       if (!EC_POINT_is_on_curve(group, point, ctx)) /* test required by X9.62 */
+               {
+               ECerr(EC_F_EC_GFP_SIMPLE_OCT2POINT, EC_R_POINT_IS_NOT_ON_CURVE);
+               goto err;
+               }
+
+       ret = 1;
+       
+ err:
+       BN_CTX_end(ctx);
+       if (new_ctx != NULL)
+               BN_CTX_free(new_ctx);
+       return ret;
+       }
+
index 66a92e2..16371e3 100644 (file)
@@ -62,6 +62,8 @@
  * and contributed to the OpenSSL project.
  */
 
+#define OPENSSL_FIPSAPI
+
 #include <openssl/err.h>
 #include <openssl/symhacks.h>
 
@@ -70,6 +72,7 @@
 const EC_METHOD *EC_GFp_simple_method(void)
        {
        static const EC_METHOD ret = {
+               EC_FLAGS_DEFAULT_OCT,
                NID_X9_62_prime_field,
                ec_GFp_simple_group_init,
                ec_GFp_simple_group_finish,
@@ -88,9 +91,7 @@ const EC_METHOD *EC_GFp_simple_method(void)
                ec_GFp_simple_get_Jprojective_coordinates_GFp,
                ec_GFp_simple_point_set_affine_coordinates,
                ec_GFp_simple_point_get_affine_coordinates,
-               ec_GFp_simple_set_compressed_coordinates,
-               ec_GFp_simple_point2oct,
-               ec_GFp_simple_oct2point,
+               0,0,0,
                ec_GFp_simple_add,
                ec_GFp_simple_dbl,
                ec_GFp_simple_invert,
@@ -633,372 +634,6 @@ int ec_GFp_simple_point_get_affine_coordinates(const EC_GROUP *group, const EC_P
        return ret;
        }
 
-
-int ec_GFp_simple_set_compressed_coordinates(const EC_GROUP *group, EC_POINT *point,
-       const BIGNUM *x_, int y_bit, BN_CTX *ctx)
-       {
-       BN_CTX *new_ctx = NULL;
-       BIGNUM *tmp1, *tmp2, *x, *y;
-       int ret = 0;
-
-       /* clear error queue*/
-       ERR_clear_error();
-
-       if (ctx == NULL)
-               {
-               ctx = new_ctx = BN_CTX_new();
-               if (ctx == NULL)
-                       return 0;
-               }
-
-       y_bit = (y_bit != 0);
-
-       BN_CTX_start(ctx);
-       tmp1 = BN_CTX_get(ctx);
-       tmp2 = BN_CTX_get(ctx);
-       x = BN_CTX_get(ctx);
-       y = BN_CTX_get(ctx);
-       if (y == NULL) goto err;
-
-       /* Recover y.  We have a Weierstrass equation
-        *     y^2 = x^3 + a*x + b,
-        * so  y  is one of the square roots of  x^3 + a*x + b.
-        */
-
-       /* tmp1 := x^3 */
-       if (!BN_nnmod(x, x_, &group->field,ctx)) goto err;
-       if (group->meth->field_decode == 0)
-               {
-               /* field_{sqr,mul} work on standard representation */
-               if (!group->meth->field_sqr(group, tmp2, x_, ctx)) goto err;
-               if (!group->meth->field_mul(group, tmp1, tmp2, x_, ctx)) goto err;
-               }
-       else
-               {
-               if (!BN_mod_sqr(tmp2, x_, &group->field, ctx)) goto err;
-               if (!BN_mod_mul(tmp1, tmp2, x_, &group->field, ctx)) goto err;
-               }
-       
-       /* tmp1 := tmp1 + a*x */
-       if (group->a_is_minus3)
-               {
-               if (!BN_mod_lshift1_quick(tmp2, x, &group->field)) goto err;
-               if (!BN_mod_add_quick(tmp2, tmp2, x, &group->field)) goto err;
-               if (!BN_mod_sub_quick(tmp1, tmp1, tmp2, &group->field)) goto err;
-               }
-       else
-               {
-               if (group->meth->field_decode)
-                       {
-                       if (!group->meth->field_decode(group, tmp2, &group->a, ctx)) goto err;
-                       if (!BN_mod_mul(tmp2, tmp2, x, &group->field, ctx)) goto err;
-                       }
-               else
-                       {
-                       /* field_mul works on standard representation */
-                       if (!group->meth->field_mul(group, tmp2, &group->a, x, ctx)) goto err;
-                       }
-               
-               if (!BN_mod_add_quick(tmp1, tmp1, tmp2, &group->field)) goto err;
-               }
-       
-       /* tmp1 := tmp1 + b */
-       if (group->meth->field_decode)
-               {
-               if (!group->meth->field_decode(group, tmp2, &group->b, ctx)) goto err;
-               if (!BN_mod_add_quick(tmp1, tmp1, tmp2, &group->field)) goto err;
-               }
-       else
-               {
-               if (!BN_mod_add_quick(tmp1, tmp1, &group->b, &group->field)) goto err;
-               }
-       
-       if (!BN_mod_sqrt(y, tmp1, &group->field, ctx))
-               {
-               unsigned long err = ERR_peek_last_error();
-               
-               if (ERR_GET_LIB(err) == ERR_LIB_BN && ERR_GET_REASON(err) == BN_R_NOT_A_SQUARE)
-                       {
-                       ERR_clear_error();
-                       ECerr(EC_F_EC_GFP_SIMPLE_SET_COMPRESSED_COORDINATES, EC_R_INVALID_COMPRESSED_POINT);
-                       }
-               else
-                       ECerr(EC_F_EC_GFP_SIMPLE_SET_COMPRESSED_COORDINATES, ERR_R_BN_LIB);
-               goto err;
-               }
-
-       if (y_bit != BN_is_odd(y))
-               {
-               if (BN_is_zero(y))
-                       {
-                       int kron;
-
-                       kron = BN_kronecker(x, &group->field, ctx);
-                       if (kron == -2) goto err;
-
-                       if (kron == 1)
-                               ECerr(EC_F_EC_GFP_SIMPLE_SET_COMPRESSED_COORDINATES, EC_R_INVALID_COMPRESSION_BIT);
-                       else
-                               /* BN_mod_sqrt() should have cought this error (not a square) */
-                               ECerr(EC_F_EC_GFP_SIMPLE_SET_COMPRESSED_COORDINATES, EC_R_INVALID_COMPRESSED_POINT);
-                       goto err;
-                       }
-               if (!BN_usub(y, &group->field, y)) goto err;
-               }
-       if (y_bit != BN_is_odd(y))
-               {
-               ECerr(EC_F_EC_GFP_SIMPLE_SET_COMPRESSED_COORDINATES, ERR_R_INTERNAL_ERROR);
-               goto err;
-               }
-
-       if (!EC_POINT_set_affine_coordinates_GFp(group, point, x, y, ctx)) goto err;
-
-       ret = 1;
-
- err:
-       BN_CTX_end(ctx);
-       if (new_ctx != NULL)
-               BN_CTX_free(new_ctx);
-       return ret;
-       }
-
-
-size_t ec_GFp_simple_point2oct(const EC_GROUP *group, const EC_POINT *point, point_conversion_form_t form,
-       unsigned char *buf, size_t len, BN_CTX *ctx)
-       {
-       size_t ret;
-       BN_CTX *new_ctx = NULL;
-       int used_ctx = 0;
-       BIGNUM *x, *y;
-       size_t field_len, i, skip;
-
-       if ((form != POINT_CONVERSION_COMPRESSED)
-               && (form != POINT_CONVERSION_UNCOMPRESSED)
-               && (form != POINT_CONVERSION_HYBRID))
-               {
-               ECerr(EC_F_EC_GFP_SIMPLE_POINT2OCT, EC_R_INVALID_FORM);
-               goto err;
-               }
-
-       if (EC_POINT_is_at_infinity(group, point))
-               {
-               /* encodes to a single 0 octet */
-               if (buf != NULL)
-                       {
-                       if (len < 1)
-                               {
-                               ECerr(EC_F_EC_GFP_SIMPLE_POINT2OCT, EC_R_BUFFER_TOO_SMALL);
-                               return 0;
-                               }
-                       buf[0] = 0;
-                       }
-               return 1;
-               }
-
-
-       /* ret := required output buffer length */
-       field_len = BN_num_bytes(&group->field);
-       ret = (form == POINT_CONVERSION_COMPRESSED) ? 1 + field_len : 1 + 2*field_len;
-
-       /* if 'buf' is NULL, just return required length */
-       if (buf != NULL)
-               {
-               if (len < ret)
-                       {
-                       ECerr(EC_F_EC_GFP_SIMPLE_POINT2OCT, EC_R_BUFFER_TOO_SMALL);
-                       goto err;
-                       }
-
-               if (ctx == NULL)
-                       {
-                       ctx = new_ctx = BN_CTX_new();
-                       if (ctx == NULL)
-                               return 0;
-                       }
-
-               BN_CTX_start(ctx);
-               used_ctx = 1;
-               x = BN_CTX_get(ctx);
-               y = BN_CTX_get(ctx);
-               if (y == NULL) goto err;
-
-               if (!EC_POINT_get_affine_coordinates_GFp(group, point, x, y, ctx)) goto err;
-
-               if ((form == POINT_CONVERSION_COMPRESSED || form == POINT_CONVERSION_HYBRID) && BN_is_odd(y))
-                       buf[0] = form + 1;
-               else
-                       buf[0] = form;
-       
-               i = 1;
-               
-               skip = field_len - BN_num_bytes(x);
-               if (skip > field_len)
-                       {
-                       ECerr(EC_F_EC_GFP_SIMPLE_POINT2OCT, ERR_R_INTERNAL_ERROR);
-                       goto err;
-                       }
-               while (skip > 0)
-                       {
-                       buf[i++] = 0;
-                       skip--;
-                       }
-               skip = BN_bn2bin(x, buf + i);
-               i += skip;
-               if (i != 1 + field_len)
-                       {
-                       ECerr(EC_F_EC_GFP_SIMPLE_POINT2OCT, ERR_R_INTERNAL_ERROR);
-                       goto err;
-                       }
-
-               if (form == POINT_CONVERSION_UNCOMPRESSED || form == POINT_CONVERSION_HYBRID)
-                       {
-                       skip = field_len - BN_num_bytes(y);
-                       if (skip > field_len)
-                               {
-                               ECerr(EC_F_EC_GFP_SIMPLE_POINT2OCT, ERR_R_INTERNAL_ERROR);
-                               goto err;
-                               }
-                       while (skip > 0)
-                               {
-                               buf[i++] = 0;
-                               skip--;
-                               }
-                       skip = BN_bn2bin(y, buf + i);
-                       i += skip;
-                       }
-
-               if (i != ret)
-                       {
-                       ECerr(EC_F_EC_GFP_SIMPLE_POINT2OCT, ERR_R_INTERNAL_ERROR);
-                       goto err;
-                       }
-               }
-       
-       if (used_ctx)
-               BN_CTX_end(ctx);
-       if (new_ctx != NULL)
-               BN_CTX_free(new_ctx);
-       return ret;
-
- err:
-       if (used_ctx)
-               BN_CTX_end(ctx);
-       if (new_ctx != NULL)
-               BN_CTX_free(new_ctx);
-       return 0;
-       }
-
-
-int ec_GFp_simple_oct2point(const EC_GROUP *group, EC_POINT *point,
-       const unsigned char *buf, size_t len, BN_CTX *ctx)
-       {
-       point_conversion_form_t form;
-       int y_bit;
-       BN_CTX *new_ctx = NULL;
-       BIGNUM *x, *y;
-       size_t field_len, enc_len;
-       int ret = 0;
-
-       if (len == 0)
-               {
-               ECerr(EC_F_EC_GFP_SIMPLE_OCT2POINT, EC_R_BUFFER_TOO_SMALL);
-               return 0;
-               }
-       form = buf[0];
-       y_bit = form & 1;
-       form = form & ~1U;
-       if ((form != 0) && (form != POINT_CONVERSION_COMPRESSED)
-               && (form != POINT_CONVERSION_UNCOMPRESSED)
-               && (form != POINT_CONVERSION_HYBRID))
-               {
-               ECerr(EC_F_EC_GFP_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);
-               return 0;
-               }
-       if ((form == 0 || form == POINT_CONVERSION_UNCOMPRESSED) && y_bit)
-               {
-               ECerr(EC_F_EC_GFP_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);
-               return 0;
-               }
-
-       if (form == 0)
-               {
-               if (len != 1)
-                       {
-                       ECerr(EC_F_EC_GFP_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);
-                       return 0;
-                       }
-
-               return EC_POINT_set_to_infinity(group, point);
-               }
-       
-       field_len = BN_num_bytes(&group->field);
-       enc_len = (form == POINT_CONVERSION_COMPRESSED) ? 1 + field_len : 1 + 2*field_len;
-
-       if (len != enc_len)
-               {
-               ECerr(EC_F_EC_GFP_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);
-               return 0;
-               }
-
-       if (ctx == NULL)
-               {
-               ctx = new_ctx = BN_CTX_new();
-               if (ctx == NULL)
-                       return 0;
-               }
-
-       BN_CTX_start(ctx);
-       x = BN_CTX_get(ctx);
-       y = BN_CTX_get(ctx);
-       if (y == NULL) goto err;
-
-       if (!BN_bin2bn(buf + 1, field_len, x)) goto err;
-       if (BN_ucmp(x, &group->field) >= 0)
-               {
-               ECerr(EC_F_EC_GFP_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);
-               goto err;
-               }
-
-       if (form == POINT_CONVERSION_COMPRESSED)
-               {
-               if (!EC_POINT_set_compressed_coordinates_GFp(group, point, x, y_bit, ctx)) goto err;
-               }
-       else
-               {
-               if (!BN_bin2bn(buf + 1 + field_len, field_len, y)) goto err;
-               if (BN_ucmp(y, &group->field) >= 0)
-                       {
-                       ECerr(EC_F_EC_GFP_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);
-                       goto err;
-                       }
-               if (form == POINT_CONVERSION_HYBRID)
-                       {
-                       if (y_bit != BN_is_odd(y))
-                               {
-                               ECerr(EC_F_EC_GFP_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);
-                               goto err;
-                               }
-                       }
-
-               if (!EC_POINT_set_affine_coordinates_GFp(group, point, x, y, ctx)) goto err;
-               }
-       
-       if (!EC_POINT_is_on_curve(group, point, ctx)) /* test required by X9.62 */
-               {
-               ECerr(EC_F_EC_GFP_SIMPLE_OCT2POINT, EC_R_POINT_IS_NOT_ON_CURVE);
-               goto err;
-               }
-
-       ret = 1;
-       
- err:
-       BN_CTX_end(ctx);
-       if (new_ctx != NULL)
-               BN_CTX_free(new_ctx);
-       return ret;
-       }
-
-
 int ec_GFp_simple_add(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a, const EC_POINT *b, BN_CTX *ctx)
        {
        int (*field_mul)(const EC_GROUP *, BIGNUM *, const BIGNUM *, const BIGNUM *, BN_CTX *);