| Index: openssl/crypto/ecdh/ech_key.c
|
| diff --git a/openssl/crypto/ecdh/ech_key.c b/openssl/crypto/ecdh/ech_key.c
|
| deleted file mode 100644
|
| index 2988899ea2ab0ec80589553e1637293f29932d14..0000000000000000000000000000000000000000
|
| --- a/openssl/crypto/ecdh/ech_key.c
|
| +++ /dev/null
|
| @@ -1,80 +0,0 @@
|
| -/* crypto/ecdh/ecdh_key.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 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 "ech_locl.h"
|
| -
|
| -int ECDH_compute_key(void *out, size_t outlen, const EC_POINT *pub_key,
|
| - EC_KEY *eckey,
|
| - void *(*KDF)(const void *in, size_t inlen, void *out, size_t *outlen))
|
| -{
|
| - ECDH_DATA *ecdh = ecdh_check(eckey);
|
| - if (ecdh == NULL)
|
| - return 0;
|
| - return ecdh->meth->compute_key(out, outlen, pub_key, eckey, KDF);
|
| -}
|
|
|