Remove crypto/ecdh update Makefile.org
Reviewed-by: Richard Levitte <levitte@openssl.org>
This commit is contained in:
Dr. Stephen Henson
parent
f517ffbb83
commit
d3bcab845e
@ -140,7 +140,7 @@ SDIRS= \
|
|||||||
objects \
|
objects \
|
||||||
md2 md4 md5 sha mdc2 hmac ripemd whrlpool \
|
md2 md4 md5 sha mdc2 hmac ripemd whrlpool \
|
||||||
des aes rc2 rc4 rc5 idea bf cast camellia seed modes \
|
des aes rc2 rc4 rc5 idea bf cast camellia seed modes \
|
||||||
bn ec rsa dsa ecdsa dh ecdh dso engine \
|
bn ec rsa dsa ecdsa dh dso engine \
|
||||||
buffer bio stack lhash rand err \
|
buffer bio stack lhash rand err \
|
||||||
evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp ocsp ui \
|
evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp ocsp ui \
|
||||||
cms pqueue ts jpake srp store cmac ct async
|
cms pqueue ts jpake srp store cmac ct async
|
||||||
|
|||||||
@ -1,91 +0,0 @@
|
|||||||
#
|
|
||||||
# crypto/ecdh/Makefile
|
|
||||||
#
|
|
||||||
|
|
||||||
DIR= ecdh
|
|
||||||
TOP= ../..
|
|
||||||
CC= cc
|
|
||||||
INCLUDES= -I.. -I$(TOP) -I../../include
|
|
||||||
CFLAG=-g -Wall
|
|
||||||
MAKEFILE= Makefile
|
|
||||||
AR= ar r
|
|
||||||
|
|
||||||
CFLAGS= $(INCLUDES) $(CFLAG)
|
|
||||||
|
|
||||||
GENERAL=Makefile
|
|
||||||
|
|
||||||
LIB=$(TOP)/libcrypto.a
|
|
||||||
LIBSRC= ech_lib.c ech_key.c ech_err.c
|
|
||||||
|
|
||||||
LIBOBJ= ech_lib.o ech_key.o ech_err.o
|
|
||||||
|
|
||||||
SRC= $(LIBSRC)
|
|
||||||
|
|
||||||
HEADER= ech_locl.h
|
|
||||||
|
|
||||||
ALL= $(GENERAL) $(SRC) $(HEADER)
|
|
||||||
|
|
||||||
top:
|
|
||||||
(cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all)
|
|
||||||
|
|
||||||
all: lib
|
|
||||||
|
|
||||||
lib: $(LIBOBJ)
|
|
||||||
$(AR) $(LIB) $(LIBOBJ)
|
|
||||||
$(RANLIB) $(LIB) || echo Never mind.
|
|
||||||
@touch lib
|
|
||||||
|
|
||||||
files:
|
|
||||||
$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
|
|
||||||
|
|
||||||
tags:
|
|
||||||
ctags $(SRC)
|
|
||||||
|
|
||||||
tests:
|
|
||||||
|
|
||||||
lint:
|
|
||||||
lint -DLINT $(INCLUDES) $(SRC)>fluff
|
|
||||||
|
|
||||||
update: depend
|
|
||||||
|
|
||||||
depend:
|
|
||||||
@[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
|
|
||||||
$(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
|
|
||||||
|
|
||||||
dclean:
|
|
||||||
$(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
|
|
||||||
mv -f Makefile.new $(MAKEFILE)
|
|
||||||
|
|
||||||
clean:
|
|
||||||
rm -f *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
|
|
||||||
|
|
||||||
# DO NOT DELETE THIS LINE -- make depend depends on it.
|
|
||||||
|
|
||||||
ech_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
|
|
||||||
ech_err.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
|
|
||||||
ech_err.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
|
|
||||||
ech_err.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
|
|
||||||
ech_err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
|
|
||||||
ech_err.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
|
|
||||||
ech_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
|
|
||||||
ech_err.o: ech_err.c
|
|
||||||
ech_key.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
|
|
||||||
ech_key.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
|
|
||||||
ech_key.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
|
|
||||||
ech_key.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
|
|
||||||
ech_key.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
|
|
||||||
ech_key.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
|
|
||||||
ech_key.o: ech_key.c ech_locl.h
|
|
||||||
ech_lib.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
|
|
||||||
ech_lib.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
|
|
||||||
ech_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
|
|
||||||
ech_lib.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
|
|
||||||
ech_lib.o: ../../include/openssl/engine.h ../../include/openssl/err.h
|
|
||||||
ech_lib.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
|
|
||||||
ech_lib.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
|
|
||||||
ech_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
|
|
||||||
ech_lib.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
|
|
||||||
ech_lib.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
|
|
||||||
ech_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
|
|
||||||
ech_lib.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
|
|
||||||
ech_lib.o: ech_lib.c ech_locl.h
|
|
||||||
@ -1,96 +0,0 @@
|
|||||||
/* crypto/ecdh/ech_err.c */
|
|
||||||
/* ====================================================================
|
|
||||||
* Copyright (c) 1999-2015 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).
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
/*
|
|
||||||
* NOTE: this file was auto generated by the mkerr.pl script: any changes
|
|
||||||
* made to it will be overwritten when the script next updates this file,
|
|
||||||
* only reason strings will be preserved.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <openssl/err.h>
|
|
||||||
#include <openssl/ecdh.h>
|
|
||||||
|
|
||||||
/* BEGIN ERROR CODES */
|
|
||||||
#ifndef OPENSSL_NO_ERR
|
|
||||||
|
|
||||||
# define ERR_FUNC(func) ERR_PACK(ERR_LIB_ECDH,func,0)
|
|
||||||
# define ERR_REASON(reason) ERR_PACK(ERR_LIB_ECDH,0,reason)
|
|
||||||
|
|
||||||
static ERR_STRING_DATA ECDH_str_functs[] = {
|
|
||||||
{ERR_FUNC(ECDH_F_ECDH_COMPUTE_KEY), "ECDH_compute_key"},
|
|
||||||
{ERR_FUNC(ECDH_F_ECDH_DATA_NEW_METHOD), "ECDH_DATA_new_method"},
|
|
||||||
{0, NULL}
|
|
||||||
};
|
|
||||||
|
|
||||||
static ERR_STRING_DATA ECDH_str_reasons[] = {
|
|
||||||
{ERR_REASON(ECDH_R_KDF_FAILED), "KDF failed"},
|
|
||||||
{ERR_REASON(ECDH_R_NO_PRIVATE_VALUE), "no private value"},
|
|
||||||
{ERR_REASON(ECDH_R_POINT_ARITHMETIC_FAILURE), "point arithmetic failure"},
|
|
||||||
{0, NULL}
|
|
||||||
};
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
void ERR_load_ECDH_strings(void)
|
|
||||||
{
|
|
||||||
#ifndef OPENSSL_NO_ERR
|
|
||||||
|
|
||||||
if (ERR_func_error_string(ECDH_str_functs[0].error) == NULL) {
|
|
||||||
ERR_load_strings(0, ECDH_str_functs);
|
|
||||||
ERR_load_strings(0, ECDH_str_reasons);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
@ -1,81 +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);
|
|
||||||
}
|
|
||||||
@ -1,219 +0,0 @@
|
|||||||
/* crypto/ecdh/ech_lib.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"
|
|
||||||
#include <string.h>
|
|
||||||
#ifndef OPENSSL_NO_ENGINE
|
|
||||||
# include <openssl/engine.h>
|
|
||||||
#endif
|
|
||||||
#include <openssl/err.h>
|
|
||||||
|
|
||||||
static const ECDH_METHOD *default_ECDH_method = NULL;
|
|
||||||
|
|
||||||
static void *ecdh_data_new(void);
|
|
||||||
static void *ecdh_data_dup(void *);
|
|
||||||
static void ecdh_data_free(void *);
|
|
||||||
|
|
||||||
void ECDH_set_default_method(const ECDH_METHOD *meth)
|
|
||||||
{
|
|
||||||
default_ECDH_method = meth;
|
|
||||||
}
|
|
||||||
|
|
||||||
const ECDH_METHOD *ECDH_get_default_method(void)
|
|
||||||
{
|
|
||||||
if (!default_ECDH_method)
|
|
||||||
default_ECDH_method = ECDH_OpenSSL();
|
|
||||||
return default_ECDH_method;
|
|
||||||
}
|
|
||||||
|
|
||||||
int ECDH_set_method(EC_KEY *eckey, const ECDH_METHOD *meth)
|
|
||||||
{
|
|
||||||
ECDH_DATA *ecdh;
|
|
||||||
|
|
||||||
ecdh = ecdh_check(eckey);
|
|
||||||
|
|
||||||
if (ecdh == NULL)
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
#ifndef OPENSSL_NO_ENGINE
|
|
||||||
if (ecdh->engine) {
|
|
||||||
ENGINE_finish(ecdh->engine);
|
|
||||||
ecdh->engine = NULL;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
ecdh->meth = meth;
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
static ECDH_DATA *ECDH_DATA_new_method(ENGINE *engine)
|
|
||||||
{
|
|
||||||
ECDH_DATA *ret;
|
|
||||||
|
|
||||||
ret = OPENSSL_malloc(sizeof(*ret));
|
|
||||||
if (ret == NULL) {
|
|
||||||
ECDHerr(ECDH_F_ECDH_DATA_NEW_METHOD, ERR_R_MALLOC_FAILURE);
|
|
||||||
return (NULL);
|
|
||||||
}
|
|
||||||
|
|
||||||
ret->init = NULL;
|
|
||||||
|
|
||||||
ret->meth = ECDH_get_default_method();
|
|
||||||
ret->engine = engine;
|
|
||||||
#ifndef OPENSSL_NO_ENGINE
|
|
||||||
if (!ret->engine)
|
|
||||||
ret->engine = ENGINE_get_default_ECDH();
|
|
||||||
if (ret->engine) {
|
|
||||||
ret->meth = ENGINE_get_ECDH(ret->engine);
|
|
||||||
if (!ret->meth) {
|
|
||||||
ECDHerr(ECDH_F_ECDH_DATA_NEW_METHOD, ERR_R_ENGINE_LIB);
|
|
||||||
ENGINE_finish(ret->engine);
|
|
||||||
OPENSSL_free(ret);
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
ret->flags = ret->meth->flags;
|
|
||||||
CRYPTO_new_ex_data(CRYPTO_EX_INDEX_ECDH, ret, &ret->ex_data);
|
|
||||||
return (ret);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void *ecdh_data_new(void)
|
|
||||||
{
|
|
||||||
return (void *)ECDH_DATA_new_method(NULL);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void *ecdh_data_dup(void *data)
|
|
||||||
{
|
|
||||||
ECDH_DATA *r = (ECDH_DATA *)data;
|
|
||||||
|
|
||||||
/* XXX: dummy operation */
|
|
||||||
if (r == NULL)
|
|
||||||
return NULL;
|
|
||||||
|
|
||||||
return (void *)ecdh_data_new();
|
|
||||||
}
|
|
||||||
|
|
||||||
void ecdh_data_free(void *data)
|
|
||||||
{
|
|
||||||
ECDH_DATA *r = (ECDH_DATA *)data;
|
|
||||||
|
|
||||||
#ifndef OPENSSL_NO_ENGINE
|
|
||||||
if (r->engine)
|
|
||||||
ENGINE_finish(r->engine);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
CRYPTO_free_ex_data(CRYPTO_EX_INDEX_ECDH, r, &r->ex_data);
|
|
||||||
OPENSSL_clear_free((void *)r, sizeof(ECDH_DATA));
|
|
||||||
}
|
|
||||||
|
|
||||||
ECDH_DATA *ecdh_check(EC_KEY *key)
|
|
||||||
{
|
|
||||||
ECDH_DATA *ecdh_data;
|
|
||||||
|
|
||||||
void *data = EC_KEY_get_key_method_data(key, ecdh_data_dup,
|
|
||||||
ecdh_data_free, ecdh_data_free);
|
|
||||||
if (data == NULL) {
|
|
||||||
ecdh_data = (ECDH_DATA *)ecdh_data_new();
|
|
||||||
if (ecdh_data == NULL)
|
|
||||||
return NULL;
|
|
||||||
data = EC_KEY_insert_key_method_data(key, (void *)ecdh_data,
|
|
||||||
ecdh_data_dup, ecdh_data_free,
|
|
||||||
ecdh_data_free);
|
|
||||||
if (data != NULL) {
|
|
||||||
/*
|
|
||||||
* Another thread raced us to install the key_method data and
|
|
||||||
* won.
|
|
||||||
*/
|
|
||||||
ecdh_data_free(ecdh_data);
|
|
||||||
ecdh_data = (ECDH_DATA *)data;
|
|
||||||
}
|
|
||||||
} else
|
|
||||||
ecdh_data = (ECDH_DATA *)data;
|
|
||||||
|
|
||||||
return ecdh_data;
|
|
||||||
}
|
|
||||||
|
|
||||||
int ECDH_set_ex_data(EC_KEY *d, int idx, void *arg)
|
|
||||||
{
|
|
||||||
ECDH_DATA *ecdh;
|
|
||||||
ecdh = ecdh_check(d);
|
|
||||||
if (ecdh == NULL)
|
|
||||||
return 0;
|
|
||||||
return (CRYPTO_set_ex_data(&ecdh->ex_data, idx, arg));
|
|
||||||
}
|
|
||||||
|
|
||||||
void *ECDH_get_ex_data(EC_KEY *d, int idx)
|
|
||||||
{
|
|
||||||
ECDH_DATA *ecdh;
|
|
||||||
ecdh = ecdh_check(d);
|
|
||||||
if (ecdh == NULL)
|
|
||||||
return NULL;
|
|
||||||
return (CRYPTO_get_ex_data(&ecdh->ex_data, idx));
|
|
||||||
}
|
|
||||||
@ -1,100 +0,0 @@
|
|||||||
/* crypto/ecdh/ech_locl.h */
|
|
||||||
/* ====================================================================
|
|
||||||
* Copyright (c) 2000-2005 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_ECH_LOCL_H
|
|
||||||
# define HEADER_ECH_LOCL_H
|
|
||||||
|
|
||||||
# include <openssl/ecdh.h>
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C" {
|
|
||||||
#endif
|
|
||||||
|
|
||||||
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;
|
|
||||||
};
|
|
||||||
|
|
||||||
/*
|
|
||||||
* If this flag is set the ECDH method is FIPS compliant and can be used in
|
|
||||||
* FIPS mode. This is set in the validated module method. If an application
|
|
||||||
* sets this flag in its own methods it is its responsibility to ensure the
|
|
||||||
* result is compliant.
|
|
||||||
*/
|
|
||||||
|
|
||||||
# define ECDH_FLAG_FIPS_METHOD 0x1
|
|
||||||
|
|
||||||
typedef struct ecdh_data_st {
|
|
||||||
/* EC_KEY_METH_DATA part */
|
|
||||||
int (*init) (EC_KEY *);
|
|
||||||
/* method specific part */
|
|
||||||
ENGINE *engine;
|
|
||||||
int flags;
|
|
||||||
const ECDH_METHOD *meth;
|
|
||||||
CRYPTO_EX_DATA ex_data;
|
|
||||||
} ECDH_DATA;
|
|
||||||
|
|
||||||
ECDH_DATA *ecdh_check(EC_KEY *);
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif /* HEADER_ECH_LOCL_H */
|
|
||||||
Loading…
x
Reference in New Issue
Block a user