From c3a4a1091a15a8739b939e798717ac97f7f2a99d Mon Sep 17 00:00:00 2001 From: tb Date: Fri, 28 Jul 2023 09:25:12 +0000 Subject: [PATCH] Merge ecdh.h into ec.h The remaining two ECDH interfaces are relocated into ec.h. ecdh.h remains. It does nothing but include ec.h. ok jsing --- lib/libcrypto/ec/ec.h | 7 ++- lib/libcrypto/ecdh/ecdh.h | 94 +---------------------------- lib/libcrypto/hidden/openssl/ec.h | 4 +- lib/libcrypto/hidden/openssl/ecdh.h | 31 ---------- 4 files changed, 12 insertions(+), 124 deletions(-) delete mode 100644 lib/libcrypto/hidden/openssl/ecdh.h diff --git a/lib/libcrypto/ec/ec.h b/lib/libcrypto/ec/ec.h index aac3537655a..686f018a9d1 100644 --- a/lib/libcrypto/ec/ec.h +++ b/lib/libcrypto/ec/ec.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ec.h,v 1.43 2023/07/28 09:16:17 tb Exp $ */ +/* $OpenBSD: ec.h,v 1.44 2023/07/28 09:25:12 tb Exp $ */ /* * Originally written by Bodo Moeller for the OpenSSL project. */ @@ -327,6 +327,11 @@ const EC_KEY_METHOD *EC_KEY_get_method(const EC_KEY *key); int EC_KEY_set_method(EC_KEY *key, const EC_KEY_METHOD *meth); EC_KEY *EC_KEY_new_method(ENGINE *engine); +int ECDH_size(const EC_KEY *ecdh); +int ECDH_compute_key(void *out, size_t outlen, const EC_POINT *pub_key, + EC_KEY *ecdh, + void *(*KDF)(const void *in, size_t inlen, void *out, size_t *outlen)); + typedef struct ECDSA_SIG_st ECDSA_SIG; ECDSA_SIG *ECDSA_SIG_new(void); diff --git a/lib/libcrypto/ecdh/ecdh.h b/lib/libcrypto/ecdh/ecdh.h index 3163b9ea2e5..0149d5cdf62 100644 --- a/lib/libcrypto/ecdh/ecdh.h +++ b/lib/libcrypto/ecdh/ecdh.h @@ -1,94 +1,6 @@ -/* $OpenBSD: ecdh.h,v 1.9 2023/07/28 09:22:26 tb Exp $ */ -/* ==================================================================== - * 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 ECDH software is originally written by Douglas Stebila of - * Sun Microsystems Laboratories. - * +/* $OpenBSD: ecdh.h,v 1.10 2023/07/28 09:25:12 tb Exp $ */ +/* + * Public domain. */ -/* ==================================================================== - * Copyright (c) 2000-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 - * licensing@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). - * - */ -#ifndef HEADER_ECDH_H -#define HEADER_ECDH_H - -#include - -#ifdef OPENSSL_NO_ECDH -#error ECDH is disabled. -#endif #include -#include -#include - -#ifdef __cplusplus -extern "C" { -#endif - -int ECDH_size(const EC_KEY *ecdh); -int ECDH_compute_key(void *out, size_t outlen, const EC_POINT *pub_key, - EC_KEY *ecdh, - void *(*KDF)(const void *in, size_t inlen, void *out, size_t *outlen)); - -#ifdef __cplusplus -} -#endif -#endif diff --git a/lib/libcrypto/hidden/openssl/ec.h b/lib/libcrypto/hidden/openssl/ec.h index d2d65945e5d..4e82f4846ce 100644 --- a/lib/libcrypto/hidden/openssl/ec.h +++ b/lib/libcrypto/hidden/openssl/ec.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ec.h,v 1.3 2023/07/28 09:16:17 tb Exp $ */ +/* $OpenBSD: ec.h,v 1.4 2023/07/28 09:25:12 tb Exp $ */ /* * Copyright (c) 2023 Bob Beck * @@ -132,6 +132,8 @@ LCRYPTO_USED(EC_KEY_set_default_method); LCRYPTO_USED(EC_KEY_get_method); LCRYPTO_USED(EC_KEY_set_method); LCRYPTO_USED(EC_KEY_new_method); +LCRYPTO_USED(ECDH_size); +LCRYPTO_USED(ECDH_compute_key); LCRYPTO_USED(ECDSA_SIG_new); LCRYPTO_USED(ECDSA_SIG_free); LCRYPTO_USED(i2d_ECDSA_SIG); diff --git a/lib/libcrypto/hidden/openssl/ecdh.h b/lib/libcrypto/hidden/openssl/ecdh.h deleted file mode 100644 index aff95893f07..00000000000 --- a/lib/libcrypto/hidden/openssl/ecdh.h +++ /dev/null @@ -1,31 +0,0 @@ -/* $OpenBSD: ecdh.h,v 1.2 2023/07/28 09:22:26 tb Exp $ */ -/* - * Copyright (c) 2023 Bob Beck - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -#ifndef _LIBCRYPTO_ECDH_H -#define _LIBCRYPTO_ECDH_H - -#ifndef _MSC_VER -#include_next -#else -#include "../include/openssl/ecdh.h" -#endif -#include "crypto_namespace.h" - -LCRYPTO_USED(ECDH_size); -LCRYPTO_USED(ECDH_compute_key); - -#endif /* _LIBCRYPTO_ECDH_H */ -- 2.20.1