From f15cd04d37436407bfd863b507fcd73ca66e3976 Mon Sep 17 00:00:00 2001 From: tb <> Date: Fri, 28 Jul 2023 09:22:26 +0000 Subject: Excise ECDH_METHOD Unlike ECDSA_METHOD, this has been unused forever but kind of needed to stay for symmetry with ECDSA_METHOD. Now we can finally take it behind the barn and remove its tendrils into ENGINE. ok jsing --- src/lib/libcrypto/ecdh/ech_lib.c | 147 --------------------------------------- 1 file changed, 147 deletions(-) delete mode 100644 src/lib/libcrypto/ecdh/ech_lib.c (limited to 'src/lib/libcrypto/ecdh/ech_lib.c') diff --git a/src/lib/libcrypto/ecdh/ech_lib.c b/src/lib/libcrypto/ecdh/ech_lib.c deleted file mode 100644 index c8e5744c0a..0000000000 --- a/src/lib/libcrypto/ecdh/ech_lib.c +++ /dev/null @@ -1,147 +0,0 @@ -/* $OpenBSD: ech_lib.c,v 1.24 2023/07/07 13:54:45 beck 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. - * - */ -/* ==================================================================== - * 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). - * - */ - -#include - -#include - -#ifndef OPENSSL_NO_ENGINE -#include -#endif -#include - -#include "ec_local.h" - -struct ecdh_method { - const char *name; - int (*compute_key)(void *key, size_t outlen, const EC_POINT *pub_key, EC_KEY *ecdh, - void *(*KDF)(const void *in, size_t inlen, void *out, size_t *outlen)); - int flags; - char *app_data; -}; - -static const ECDH_METHOD *default_ECDH_method = NULL; - -static const ECDH_METHOD openssl_ecdh_meth = { - .name = "OpenSSL ECDH method", - .compute_key = ecdh_compute_key, -}; - -const ECDH_METHOD * -ECDH_OpenSSL(void) -{ - return &openssl_ecdh_meth; -} -LCRYPTO_ALIAS(ECDH_OpenSSL); - -void -ECDH_set_default_method(const ECDH_METHOD *meth) -{ - default_ECDH_method = meth; -} -LCRYPTO_ALIAS(ECDH_set_default_method); - -const ECDH_METHOD * -ECDH_get_default_method(void) -{ - if (!default_ECDH_method) { - default_ECDH_method = ECDH_OpenSSL(); - } - return default_ECDH_method; -} -LCRYPTO_ALIAS(ECDH_get_default_method); - -int -ECDH_set_method(EC_KEY *eckey, const ECDH_METHOD *meth) -{ - return 0; -} -LCRYPTO_ALIAS(ECDH_set_method); - -int -ECDH_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func, - CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func) -{ - return -1; -} -LCRYPTO_ALIAS(ECDH_get_ex_new_index); - -int -ECDH_set_ex_data(EC_KEY *d, int idx, void *arg) -{ - return 0; -} -LCRYPTO_ALIAS(ECDH_set_ex_data); - -void * -ECDH_get_ex_data(EC_KEY *d, int idx) -{ - return NULL; -} -LCRYPTO_ALIAS(ECDH_get_ex_data); -- cgit v1.2.3-55-g6feb