From 2567856a13ae62daeb7897c78e84dc24985e50ca Mon Sep 17 00:00:00 2001 From: tb Date: Fri, 18 Oct 2024 10:57:26 +0000 Subject: [PATCH] Move EC_GROUP_new_curve_GFp() into ec_lib.c Another single-function file goes away. --- lib/libcrypto/Makefile | 3 +- lib/libcrypto/ec/ec_cvt.c | 96 --------------------------------------- lib/libcrypto/ec/ec_lib.c | 23 +++++++++- 3 files changed, 23 insertions(+), 99 deletions(-) delete mode 100644 lib/libcrypto/ec/ec_cvt.c diff --git a/lib/libcrypto/Makefile b/lib/libcrypto/Makefile index dfbb38b8451..5d435d306d1 100644 --- a/lib/libcrypto/Makefile +++ b/lib/libcrypto/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.211 2024/08/31 15:56:09 jsing Exp $ +# $OpenBSD: Makefile,v 1.212 2024/10/18 10:57:26 tb Exp $ LIB= crypto LIBREBUILD=y @@ -284,7 +284,6 @@ SRCS+= ec_ameth.c SRCS+= ec_asn1.c SRCS+= ec_check.c SRCS+= ec_curve.c -SRCS+= ec_cvt.c SRCS+= ec_err.c SRCS+= ec_key.c SRCS+= ec_kmeth.c diff --git a/lib/libcrypto/ec/ec_cvt.c b/lib/libcrypto/ec/ec_cvt.c deleted file mode 100644 index 87ec0830e21..00000000000 --- a/lib/libcrypto/ec/ec_cvt.c +++ /dev/null @@ -1,96 +0,0 @@ -/* $OpenBSD: ec_cvt.c,v 1.13 2024/10/18 10:50:26 tb Exp $ */ -/* - * Originally 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 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 - -#include -#include "ec_local.h" - -EC_GROUP * -EC_GROUP_new_curve_GFp(const BIGNUM *p, const BIGNUM *a, const BIGNUM *b, - BN_CTX *ctx) -{ - EC_GROUP *group; - - if ((group = EC_GROUP_new(EC_GFp_mont_method())) == NULL) - goto err; - - if (!EC_GROUP_set_curve(group, p, a, b, ctx)) - goto err; - - return group; - - err: - EC_GROUP_free(group); - - return NULL; -} -LCRYPTO_ALIAS(EC_GROUP_new_curve_GFp); diff --git a/lib/libcrypto/ec/ec_lib.c b/lib/libcrypto/ec/ec_lib.c index 11d09b65cdc..0e5897da9da 100644 --- a/lib/libcrypto/ec/ec_lib.c +++ b/lib/libcrypto/ec/ec_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ec_lib.c,v 1.69 2024/10/15 17:44:43 tb Exp $ */ +/* $OpenBSD: ec_lib.c,v 1.70 2024/10/18 10:57:26 tb Exp $ */ /* * Originally written by Bodo Moeller for the OpenSSL project. */ @@ -544,6 +544,27 @@ EC_GROUP_get_curve_GFp(const EC_GROUP *group, BIGNUM *p, BIGNUM *a, BIGNUM *b, } LCRYPTO_ALIAS(EC_GROUP_get_curve_GFp); +EC_GROUP * +EC_GROUP_new_curve_GFp(const BIGNUM *p, const BIGNUM *a, const BIGNUM *b, + BN_CTX *ctx) +{ + EC_GROUP *group; + + if ((group = EC_GROUP_new(EC_GFp_mont_method())) == NULL) + goto err; + + if (!EC_GROUP_set_curve(group, p, a, b, ctx)) + goto err; + + return group; + + err: + EC_GROUP_free(group); + + return NULL; +} +LCRYPTO_ALIAS(EC_GROUP_new_curve_GFp); + int EC_GROUP_get_degree(const EC_GROUP *group) { -- 2.20.1