From 7ec6e26ec26d9376a7e9b83eb15bacb60edf279e Mon Sep 17 00:00:00 2001 From: tb <> Date: Wed, 30 Oct 2024 18:21:12 +0000 Subject: Move the point2bn and point2hex API to ec_convert.c discussed with jsing --- src/lib/libcrypto/Makefile | 3 +- src/lib/libcrypto/ec/ec_convert.c | 84 +++++++++++++++++++++- src/lib/libcrypto/ec/ec_print.c | 143 -------------------------------------- 3 files changed, 84 insertions(+), 146 deletions(-) delete mode 100644 src/lib/libcrypto/ec/ec_print.c (limited to 'src/lib') diff --git a/src/lib/libcrypto/Makefile b/src/lib/libcrypto/Makefile index 652d74ee92..e5e757ff39 100644 --- a/src/lib/libcrypto/Makefile +++ b/src/lib/libcrypto/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.215 2024/10/30 18:14:49 tb Exp $ +# $OpenBSD: Makefile,v 1.216 2024/10/30 18:21:12 tb Exp $ LIB= crypto LIBREBUILD=y @@ -290,7 +290,6 @@ SRCS+= ec_lib.c SRCS+= ec_mult.c SRCS+= ec_oct.c SRCS+= ec_pmeth.c -SRCS+= ec_print.c SRCS+= eck_prn.c SRCS+= ecp_mont.c SRCS+= ecp_oct.c diff --git a/src/lib/libcrypto/ec/ec_convert.c b/src/lib/libcrypto/ec/ec_convert.c index f6ee1f9702..e8f8605c10 100644 --- a/src/lib/libcrypto/ec/ec_convert.c +++ b/src/lib/libcrypto/ec/ec_convert.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ec_convert.c,v 1.3 2024/10/30 18:18:35 tb Exp $ */ +/* $OpenBSD: ec_convert.c,v 1.4 2024/10/30 18:21:12 tb Exp $ */ /* * Originally written by Bodo Moeller for the OpenSSL project. */ @@ -491,3 +491,85 @@ EC_POINT_oct2point(const EC_GROUP *group, EC_POINT *point, return ret; } LCRYPTO_ALIAS(EC_POINT_oct2point); + +BIGNUM * +EC_POINT_point2bn(const EC_GROUP *group, const EC_POINT *point, + point_conversion_form_t form, BIGNUM *in_bn, BN_CTX *ctx) +{ + BIGNUM *bn = NULL; + unsigned char *buf = NULL; + size_t buf_len = 0; + + if (!ec_point_to_octets(group, point, form, &buf, &buf_len, ctx)) + goto err; + if ((bn = BN_bin2bn(buf, buf_len, in_bn)) == NULL) + goto err; + + err: + freezero(buf, buf_len); + + return bn; +} +LCRYPTO_ALIAS(EC_POINT_point2bn); + +EC_POINT * +EC_POINT_bn2point(const EC_GROUP *group, + const BIGNUM *bn, EC_POINT *point, BN_CTX *ctx) +{ + unsigned char *buf = NULL; + size_t buf_len = 0; + + /* Of course BN_bn2bin() is in no way symmetric to BN_bin2bn()... */ + if ((buf_len = BN_num_bytes(bn)) == 0) + goto err; + if ((buf = calloc(1, buf_len)) == NULL) + goto err; + if (!BN_bn2bin(bn, buf)) + goto err; + if (!ec_point_from_octets(group, buf, buf_len, &point, NULL, ctx)) + goto err; + + err: + freezero(buf, buf_len); + + return point; +} +LCRYPTO_ALIAS(EC_POINT_bn2point); + +char * +EC_POINT_point2hex(const EC_GROUP *group, const EC_POINT *point, + point_conversion_form_t form, BN_CTX *ctx) +{ + BIGNUM *bn; + char *hex = NULL; + + if ((bn = EC_POINT_point2bn(group, point, form, NULL, ctx)) == NULL) + goto err; + if ((hex = BN_bn2hex(bn)) == NULL) + goto err; + + err: + BN_free(bn); + + return hex; +} +LCRYPTO_ALIAS(EC_POINT_point2hex); + +EC_POINT * +EC_POINT_hex2point(const EC_GROUP *group, const char *hex, + EC_POINT *in_point, BN_CTX *ctx) +{ + EC_POINT *point = NULL; + BIGNUM *bn = NULL; + + if (BN_hex2bn(&bn, hex) == 0) + goto err; + if ((point = EC_POINT_bn2point(group, bn, in_point, ctx)) == NULL) + goto err; + + err: + BN_free(bn); + + return point; +} +LCRYPTO_ALIAS(EC_POINT_hex2point); diff --git a/src/lib/libcrypto/ec/ec_print.c b/src/lib/libcrypto/ec/ec_print.c deleted file mode 100644 index 7a479a3ddc..0000000000 --- a/src/lib/libcrypto/ec/ec_print.c +++ /dev/null @@ -1,143 +0,0 @@ -/* $OpenBSD: ec_print.c,v 1.19 2024/10/30 18:01:52 tb Exp $ */ -/* ==================================================================== - * 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). - * - */ - -#include - -#include -#include - -#include "ec_local.h" - -BIGNUM * -EC_POINT_point2bn(const EC_GROUP *group, const EC_POINT *point, - point_conversion_form_t form, BIGNUM *in_bn, BN_CTX *ctx) -{ - BIGNUM *bn = NULL; - unsigned char *buf = NULL; - size_t buf_len = 0; - - if (!ec_point_to_octets(group, point, form, &buf, &buf_len, ctx)) - goto err; - if ((bn = BN_bin2bn(buf, buf_len, in_bn)) == NULL) - goto err; - - err: - freezero(buf, buf_len); - - return bn; -} -LCRYPTO_ALIAS(EC_POINT_point2bn); - -EC_POINT * -EC_POINT_bn2point(const EC_GROUP *group, - const BIGNUM *bn, EC_POINT *point, BN_CTX *ctx) -{ - unsigned char *buf = NULL; - size_t buf_len = 0; - - /* Of course BN_bn2bin() is in no way symmetric to BN_bin2bn()... */ - if ((buf_len = BN_num_bytes(bn)) == 0) - goto err; - if ((buf = calloc(1, buf_len)) == NULL) - goto err; - if (!BN_bn2bin(bn, buf)) - goto err; - if (!ec_point_from_octets(group, buf, buf_len, &point, NULL, ctx)) - goto err; - - err: - freezero(buf, buf_len); - - return point; -} -LCRYPTO_ALIAS(EC_POINT_bn2point); - -char * -EC_POINT_point2hex(const EC_GROUP *group, const EC_POINT *point, - point_conversion_form_t form, BN_CTX *ctx) -{ - BIGNUM *bn; - char *hex = NULL; - - if ((bn = EC_POINT_point2bn(group, point, form, NULL, ctx)) == NULL) - goto err; - if ((hex = BN_bn2hex(bn)) == NULL) - goto err; - - err: - BN_free(bn); - - return hex; -} -LCRYPTO_ALIAS(EC_POINT_point2hex); - -EC_POINT * -EC_POINT_hex2point(const EC_GROUP *group, const char *hex, - EC_POINT *in_point, BN_CTX *ctx) -{ - EC_POINT *point = NULL; - BIGNUM *bn = NULL; - - if (BN_hex2bn(&bn, hex) == 0) - goto err; - if ((point = EC_POINT_bn2point(group, bn, in_point, ctx)) == NULL) - goto err; - - err: - BN_free(bn); - - return point; -} -LCRYPTO_ALIAS(EC_POINT_hex2point); -- cgit v1.2.3-55-g6feb