diff options
Diffstat (limited to 'src/lib/libcrypto/ecdh')
| -rw-r--r-- | src/lib/libcrypto/ecdh/ecdh.h | 125 | ||||
| -rw-r--r-- | src/lib/libcrypto/ecdh/ech_err.c | 103 | ||||
| -rw-r--r-- | src/lib/libcrypto/ecdh/ech_key.c | 80 | ||||
| -rw-r--r-- | src/lib/libcrypto/ecdh/ech_lib.c | 238 | ||||
| -rw-r--r-- | src/lib/libcrypto/ecdh/ech_locl.h | 98 |
5 files changed, 0 insertions, 644 deletions
diff --git a/src/lib/libcrypto/ecdh/ecdh.h b/src/lib/libcrypto/ecdh/ecdh.h deleted file mode 100644 index c8c6920aa2..0000000000 --- a/src/lib/libcrypto/ecdh/ecdh.h +++ /dev/null | |||
| @@ -1,125 +0,0 @@ | |||
| 1 | /* $OpenBSD: ecdh.h,v 1.2 2014/06/12 15:49:29 deraadt Exp $ */ | ||
| 2 | /* ==================================================================== | ||
| 3 | * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED. | ||
| 4 | * | ||
| 5 | * The Elliptic Curve Public-Key Crypto Library (ECC Code) included | ||
| 6 | * herein is developed by SUN MICROSYSTEMS, INC., and is contributed | ||
| 7 | * to the OpenSSL project. | ||
| 8 | * | ||
| 9 | * The ECC Code is licensed pursuant to the OpenSSL open source | ||
| 10 | * license provided below. | ||
| 11 | * | ||
| 12 | * The ECDH software is originally written by Douglas Stebila of | ||
| 13 | * Sun Microsystems Laboratories. | ||
| 14 | * | ||
| 15 | */ | ||
| 16 | /* ==================================================================== | ||
| 17 | * Copyright (c) 2000-2002 The OpenSSL Project. All rights reserved. | ||
| 18 | * | ||
| 19 | * Redistribution and use in source and binary forms, with or without | ||
| 20 | * modification, are permitted provided that the following conditions | ||
| 21 | * are met: | ||
| 22 | * | ||
| 23 | * 1. Redistributions of source code must retain the above copyright | ||
| 24 | * notice, this list of conditions and the following disclaimer. | ||
| 25 | * | ||
| 26 | * 2. Redistributions in binary form must reproduce the above copyright | ||
| 27 | * notice, this list of conditions and the following disclaimer in | ||
| 28 | * the documentation and/or other materials provided with the | ||
| 29 | * distribution. | ||
| 30 | * | ||
| 31 | * 3. All advertising materials mentioning features or use of this | ||
| 32 | * software must display the following acknowledgment: | ||
| 33 | * "This product includes software developed by the OpenSSL Project | ||
| 34 | * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)" | ||
| 35 | * | ||
| 36 | * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to | ||
| 37 | * endorse or promote products derived from this software without | ||
| 38 | * prior written permission. For written permission, please contact | ||
| 39 | * licensing@OpenSSL.org. | ||
| 40 | * | ||
| 41 | * 5. Products derived from this software may not be called "OpenSSL" | ||
| 42 | * nor may "OpenSSL" appear in their names without prior written | ||
| 43 | * permission of the OpenSSL Project. | ||
| 44 | * | ||
| 45 | * 6. Redistributions of any form whatsoever must retain the following | ||
| 46 | * acknowledgment: | ||
| 47 | * "This product includes software developed by the OpenSSL Project | ||
| 48 | * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)" | ||
| 49 | * | ||
| 50 | * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY | ||
| 51 | * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| 52 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | ||
| 53 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR | ||
| 54 | * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
| 55 | * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
| 56 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
| 57 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
| 58 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, | ||
| 59 | * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
| 60 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED | ||
| 61 | * OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| 62 | * ==================================================================== | ||
| 63 | * | ||
| 64 | * This product includes cryptographic software written by Eric Young | ||
| 65 | * (eay@cryptsoft.com). This product includes software written by Tim | ||
| 66 | * Hudson (tjh@cryptsoft.com). | ||
| 67 | * | ||
| 68 | */ | ||
| 69 | #ifndef HEADER_ECDH_H | ||
| 70 | #define HEADER_ECDH_H | ||
| 71 | |||
| 72 | #include <openssl/opensslconf.h> | ||
| 73 | |||
| 74 | #ifdef OPENSSL_NO_ECDH | ||
| 75 | #error ECDH is disabled. | ||
| 76 | #endif | ||
| 77 | |||
| 78 | #include <openssl/ec.h> | ||
| 79 | #include <openssl/ossl_typ.h> | ||
| 80 | #ifndef OPENSSL_NO_DEPRECATED | ||
| 81 | #include <openssl/bn.h> | ||
| 82 | #endif | ||
| 83 | |||
| 84 | #ifdef __cplusplus | ||
| 85 | extern "C" { | ||
| 86 | #endif | ||
| 87 | |||
| 88 | const ECDH_METHOD *ECDH_OpenSSL(void); | ||
| 89 | |||
| 90 | void ECDH_set_default_method(const ECDH_METHOD *); | ||
| 91 | const ECDH_METHOD *ECDH_get_default_method(void); | ||
| 92 | int ECDH_set_method(EC_KEY *, const ECDH_METHOD *); | ||
| 93 | |||
| 94 | int ECDH_compute_key(void *out, size_t outlen, const EC_POINT *pub_key, EC_KEY *ecdh, | ||
| 95 | void *(*KDF)(const void *in, size_t inlen, void *out, size_t *outlen)); | ||
| 96 | |||
| 97 | int ECDH_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new | ||
| 98 | *new_func, CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func); | ||
| 99 | int ECDH_set_ex_data(EC_KEY *d, int idx, void *arg); | ||
| 100 | void *ECDH_get_ex_data(EC_KEY *d, int idx); | ||
| 101 | |||
| 102 | |||
| 103 | /* BEGIN ERROR CODES */ | ||
| 104 | /* The following lines are auto generated by the script mkerr.pl. Any changes | ||
| 105 | * made after this point may be overwritten when the script is next run. | ||
| 106 | */ | ||
| 107 | void ERR_load_ECDH_strings(void); | ||
| 108 | |||
| 109 | /* Error codes for the ECDH functions. */ | ||
| 110 | |||
| 111 | /* Function codes. */ | ||
| 112 | #define ECDH_F_ECDH_CHECK 102 | ||
| 113 | #define ECDH_F_ECDH_COMPUTE_KEY 100 | ||
| 114 | #define ECDH_F_ECDH_DATA_NEW_METHOD 101 | ||
| 115 | |||
| 116 | /* Reason codes. */ | ||
| 117 | #define ECDH_R_KDF_FAILED 102 | ||
| 118 | #define ECDH_R_NON_FIPS_METHOD 103 | ||
| 119 | #define ECDH_R_NO_PRIVATE_VALUE 100 | ||
| 120 | #define ECDH_R_POINT_ARITHMETIC_FAILURE 101 | ||
| 121 | |||
| 122 | #ifdef __cplusplus | ||
| 123 | } | ||
| 124 | #endif | ||
| 125 | #endif | ||
diff --git a/src/lib/libcrypto/ecdh/ech_err.c b/src/lib/libcrypto/ecdh/ech_err.c deleted file mode 100644 index 6b417a255d..0000000000 --- a/src/lib/libcrypto/ecdh/ech_err.c +++ /dev/null | |||
| @@ -1,103 +0,0 @@ | |||
| 1 | /* $OpenBSD: ech_err.c,v 1.3 2014/07/10 22:45:57 jsing Exp $ */ | ||
| 2 | /* ==================================================================== | ||
| 3 | * Copyright (c) 1999-2011 The OpenSSL Project. All rights reserved. | ||
| 4 | * | ||
| 5 | * Redistribution and use in source and binary forms, with or without | ||
| 6 | * modification, are permitted provided that the following conditions | ||
| 7 | * are met: | ||
| 8 | * | ||
| 9 | * 1. Redistributions of source code must retain the above copyright | ||
| 10 | * notice, this list of conditions and the following disclaimer. | ||
| 11 | * | ||
| 12 | * 2. Redistributions in binary form must reproduce the above copyright | ||
| 13 | * notice, this list of conditions and the following disclaimer in | ||
| 14 | * the documentation and/or other materials provided with the | ||
| 15 | * distribution. | ||
| 16 | * | ||
| 17 | * 3. All advertising materials mentioning features or use of this | ||
| 18 | * software must display the following acknowledgment: | ||
| 19 | * "This product includes software developed by the OpenSSL Project | ||
| 20 | * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)" | ||
| 21 | * | ||
| 22 | * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to | ||
| 23 | * endorse or promote products derived from this software without | ||
| 24 | * prior written permission. For written permission, please contact | ||
| 25 | * openssl-core@OpenSSL.org. | ||
| 26 | * | ||
| 27 | * 5. Products derived from this software may not be called "OpenSSL" | ||
| 28 | * nor may "OpenSSL" appear in their names without prior written | ||
| 29 | * permission of the OpenSSL Project. | ||
| 30 | * | ||
| 31 | * 6. Redistributions of any form whatsoever must retain the following | ||
| 32 | * acknowledgment: | ||
| 33 | * "This product includes software developed by the OpenSSL Project | ||
| 34 | * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)" | ||
| 35 | * | ||
| 36 | * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY | ||
| 37 | * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| 38 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | ||
| 39 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR | ||
| 40 | * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
| 41 | * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
| 42 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
| 43 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
| 44 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, | ||
| 45 | * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
| 46 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED | ||
| 47 | * OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| 48 | * ==================================================================== | ||
| 49 | * | ||
| 50 | * This product includes cryptographic software written by Eric Young | ||
| 51 | * (eay@cryptsoft.com). This product includes software written by Tim | ||
| 52 | * Hudson (tjh@cryptsoft.com). | ||
| 53 | * | ||
| 54 | */ | ||
| 55 | |||
| 56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes | ||
| 57 | * made to it will be overwritten when the script next updates this file, | ||
| 58 | * only reason strings will be preserved. | ||
| 59 | */ | ||
| 60 | |||
| 61 | #include <stdio.h> | ||
| 62 | |||
| 63 | #include <openssl/opensslconf.h> | ||
| 64 | |||
| 65 | #include <openssl/err.h> | ||
| 66 | #include <openssl/ecdh.h> | ||
| 67 | |||
| 68 | /* BEGIN ERROR CODES */ | ||
| 69 | #ifndef OPENSSL_NO_ERR | ||
| 70 | |||
| 71 | #define ERR_FUNC(func) ERR_PACK(ERR_LIB_ECDH,func,0) | ||
| 72 | #define ERR_REASON(reason) ERR_PACK(ERR_LIB_ECDH,0,reason) | ||
| 73 | |||
| 74 | static ERR_STRING_DATA ECDH_str_functs[]= | ||
| 75 | { | ||
| 76 | {ERR_FUNC(ECDH_F_ECDH_CHECK), "ECDH_CHECK"}, | ||
| 77 | {ERR_FUNC(ECDH_F_ECDH_COMPUTE_KEY), "ECDH_compute_key"}, | ||
| 78 | {ERR_FUNC(ECDH_F_ECDH_DATA_NEW_METHOD), "ECDH_DATA_new_method"}, | ||
| 79 | {0,NULL} | ||
| 80 | }; | ||
| 81 | |||
| 82 | static ERR_STRING_DATA ECDH_str_reasons[]= | ||
| 83 | { | ||
| 84 | {ERR_REASON(ECDH_R_KDF_FAILED) ,"KDF failed"}, | ||
| 85 | {ERR_REASON(ECDH_R_NON_FIPS_METHOD) ,"non fips method"}, | ||
| 86 | {ERR_REASON(ECDH_R_NO_PRIVATE_VALUE) ,"no private value"}, | ||
| 87 | {ERR_REASON(ECDH_R_POINT_ARITHMETIC_FAILURE),"point arithmetic failure"}, | ||
| 88 | {0,NULL} | ||
| 89 | }; | ||
| 90 | |||
| 91 | #endif | ||
| 92 | |||
| 93 | void ERR_load_ECDH_strings(void) | ||
| 94 | { | ||
| 95 | #ifndef OPENSSL_NO_ERR | ||
| 96 | |||
| 97 | if (ERR_func_error_string(ECDH_str_functs[0].error) == NULL) | ||
| 98 | { | ||
| 99 | ERR_load_strings(0,ECDH_str_functs); | ||
| 100 | ERR_load_strings(0,ECDH_str_reasons); | ||
| 101 | } | ||
| 102 | #endif | ||
| 103 | } | ||
diff --git a/src/lib/libcrypto/ecdh/ech_key.c b/src/lib/libcrypto/ecdh/ech_key.c deleted file mode 100644 index b0bba7f826..0000000000 --- a/src/lib/libcrypto/ecdh/ech_key.c +++ /dev/null | |||
| @@ -1,80 +0,0 @@ | |||
| 1 | /* $OpenBSD: ech_key.c,v 1.2 2014/06/12 15:49:29 deraadt Exp $ */ | ||
| 2 | /* ==================================================================== | ||
| 3 | * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED. | ||
| 4 | * | ||
| 5 | * The Elliptic Curve Public-Key Crypto Library (ECC Code) included | ||
| 6 | * herein is developed by SUN MICROSYSTEMS, INC., and is contributed | ||
| 7 | * to the OpenSSL project. | ||
| 8 | * | ||
| 9 | * The ECC Code is licensed pursuant to the OpenSSL open source | ||
| 10 | * license provided below. | ||
| 11 | * | ||
| 12 | * The ECDH software is originally written by Douglas Stebila of | ||
| 13 | * Sun Microsystems Laboratories. | ||
| 14 | * | ||
| 15 | */ | ||
| 16 | /* ==================================================================== | ||
| 17 | * Copyright (c) 1998-2003 The OpenSSL Project. All rights reserved. | ||
| 18 | * | ||
| 19 | * Redistribution and use in source and binary forms, with or without | ||
| 20 | * modification, are permitted provided that the following conditions | ||
| 21 | * are met: | ||
| 22 | * | ||
| 23 | * 1. Redistributions of source code must retain the above copyright | ||
| 24 | * notice, this list of conditions and the following disclaimer. | ||
| 25 | * | ||
| 26 | * 2. Redistributions in binary form must reproduce the above copyright | ||
| 27 | * notice, this list of conditions and the following disclaimer in | ||
| 28 | * the documentation and/or other materials provided with the | ||
| 29 | * distribution. | ||
| 30 | * | ||
| 31 | * 3. All advertising materials mentioning features or use of this | ||
| 32 | * software must display the following acknowledgment: | ||
| 33 | * "This product includes software developed by the OpenSSL Project | ||
| 34 | * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)" | ||
| 35 | * | ||
| 36 | * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to | ||
| 37 | * endorse or promote products derived from this software without | ||
| 38 | * prior written permission. For written permission, please contact | ||
| 39 | * openssl-core@OpenSSL.org. | ||
| 40 | * | ||
| 41 | * 5. Products derived from this software may not be called "OpenSSL" | ||
| 42 | * nor may "OpenSSL" appear in their names without prior written | ||
| 43 | * permission of the OpenSSL Project. | ||
| 44 | * | ||
| 45 | * 6. Redistributions of any form whatsoever must retain the following | ||
| 46 | * acknowledgment: | ||
| 47 | * "This product includes software developed by the OpenSSL Project | ||
| 48 | * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)" | ||
| 49 | * | ||
| 50 | * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY | ||
| 51 | * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| 52 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | ||
| 53 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR | ||
| 54 | * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
| 55 | * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
| 56 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
| 57 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
| 58 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, | ||
| 59 | * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
| 60 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED | ||
| 61 | * OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| 62 | * ==================================================================== | ||
| 63 | * | ||
| 64 | * This product includes cryptographic software written by Eric Young | ||
| 65 | * (eay@cryptsoft.com). This product includes software written by Tim | ||
| 66 | * Hudson (tjh@cryptsoft.com). | ||
| 67 | * | ||
| 68 | */ | ||
| 69 | |||
| 70 | #include "ech_locl.h" | ||
| 71 | |||
| 72 | int ECDH_compute_key(void *out, size_t outlen, const EC_POINT *pub_key, | ||
| 73 | EC_KEY *eckey, | ||
| 74 | void *(*KDF)(const void *in, size_t inlen, void *out, size_t *outlen)) | ||
| 75 | { | ||
| 76 | ECDH_DATA *ecdh = ecdh_check(eckey); | ||
| 77 | if (ecdh == NULL) | ||
| 78 | return 0; | ||
| 79 | return ecdh->meth->compute_key(out, outlen, pub_key, eckey, KDF); | ||
| 80 | } | ||
diff --git a/src/lib/libcrypto/ecdh/ech_lib.c b/src/lib/libcrypto/ecdh/ech_lib.c deleted file mode 100644 index 43c4f8ce31..0000000000 --- a/src/lib/libcrypto/ecdh/ech_lib.c +++ /dev/null | |||
| @@ -1,238 +0,0 @@ | |||
| 1 | /* $OpenBSD: ech_lib.c,v 1.8 2015/02/07 13:19:15 doug Exp $ */ | ||
| 2 | /* ==================================================================== | ||
| 3 | * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED. | ||
| 4 | * | ||
| 5 | * The Elliptic Curve Public-Key Crypto Library (ECC Code) included | ||
| 6 | * herein is developed by SUN MICROSYSTEMS, INC., and is contributed | ||
| 7 | * to the OpenSSL project. | ||
| 8 | * | ||
| 9 | * The ECC Code is licensed pursuant to the OpenSSL open source | ||
| 10 | * license provided below. | ||
| 11 | * | ||
| 12 | * The ECDH software is originally written by Douglas Stebila of | ||
| 13 | * Sun Microsystems Laboratories. | ||
| 14 | * | ||
| 15 | */ | ||
| 16 | /* ==================================================================== | ||
| 17 | * Copyright (c) 1998-2003 The OpenSSL Project. All rights reserved. | ||
| 18 | * | ||
| 19 | * Redistribution and use in source and binary forms, with or without | ||
| 20 | * modification, are permitted provided that the following conditions | ||
| 21 | * are met: | ||
| 22 | * | ||
| 23 | * 1. Redistributions of source code must retain the above copyright | ||
| 24 | * notice, this list of conditions and the following disclaimer. | ||
| 25 | * | ||
| 26 | * 2. Redistributions in binary form must reproduce the above copyright | ||
| 27 | * notice, this list of conditions and the following disclaimer in | ||
| 28 | * the documentation and/or other materials provided with the | ||
| 29 | * distribution. | ||
| 30 | * | ||
| 31 | * 3. All advertising materials mentioning features or use of this | ||
| 32 | * software must display the following acknowledgment: | ||
| 33 | * "This product includes software developed by the OpenSSL Project | ||
| 34 | * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)" | ||
| 35 | * | ||
| 36 | * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to | ||
| 37 | * endorse or promote products derived from this software without | ||
| 38 | * prior written permission. For written permission, please contact | ||
| 39 | * openssl-core@OpenSSL.org. | ||
| 40 | * | ||
| 41 | * 5. Products derived from this software may not be called "OpenSSL" | ||
| 42 | * nor may "OpenSSL" appear in their names without prior written | ||
| 43 | * permission of the OpenSSL Project. | ||
| 44 | * | ||
| 45 | * 6. Redistributions of any form whatsoever must retain the following | ||
| 46 | * acknowledgment: | ||
| 47 | * "This product includes software developed by the OpenSSL Project | ||
| 48 | * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)" | ||
| 49 | * | ||
| 50 | * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY | ||
| 51 | * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| 52 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | ||
| 53 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR | ||
| 54 | * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
| 55 | * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
| 56 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
| 57 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
| 58 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, | ||
| 59 | * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
| 60 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED | ||
| 61 | * OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| 62 | * ==================================================================== | ||
| 63 | * | ||
| 64 | * This product includes cryptographic software written by Eric Young | ||
| 65 | * (eay@cryptsoft.com). This product includes software written by Tim | ||
| 66 | * Hudson (tjh@cryptsoft.com). | ||
| 67 | * | ||
| 68 | */ | ||
| 69 | |||
| 70 | #include <string.h> | ||
| 71 | |||
| 72 | #include <openssl/opensslconf.h> | ||
| 73 | |||
| 74 | #include "ech_locl.h" | ||
| 75 | #ifndef OPENSSL_NO_ENGINE | ||
| 76 | #include <openssl/engine.h> | ||
| 77 | #endif | ||
| 78 | #include <openssl/err.h> | ||
| 79 | |||
| 80 | static const ECDH_METHOD *default_ECDH_method = NULL; | ||
| 81 | |||
| 82 | static void *ecdh_data_new(void); | ||
| 83 | static void *ecdh_data_dup(void *); | ||
| 84 | static void ecdh_data_free(void *); | ||
| 85 | |||
| 86 | void ECDH_set_default_method(const ECDH_METHOD *meth) | ||
| 87 | { | ||
| 88 | default_ECDH_method = meth; | ||
| 89 | } | ||
| 90 | |||
| 91 | const ECDH_METHOD *ECDH_get_default_method(void) | ||
| 92 | { | ||
| 93 | if(!default_ECDH_method) | ||
| 94 | { | ||
| 95 | default_ECDH_method = ECDH_OpenSSL(); | ||
| 96 | } | ||
| 97 | return default_ECDH_method; | ||
| 98 | } | ||
| 99 | |||
| 100 | int ECDH_set_method(EC_KEY *eckey, const ECDH_METHOD *meth) | ||
| 101 | { | ||
| 102 | ECDH_DATA *ecdh; | ||
| 103 | |||
| 104 | ecdh = ecdh_check(eckey); | ||
| 105 | |||
| 106 | if (ecdh == NULL) | ||
| 107 | return 0; | ||
| 108 | |||
| 109 | #ifndef OPENSSL_NO_ENGINE | ||
| 110 | if (ecdh->engine) | ||
| 111 | { | ||
| 112 | ENGINE_finish(ecdh->engine); | ||
| 113 | ecdh->engine = NULL; | ||
| 114 | } | ||
| 115 | #endif | ||
| 116 | ecdh->meth = meth; | ||
| 117 | return 1; | ||
| 118 | } | ||
| 119 | |||
| 120 | static ECDH_DATA *ECDH_DATA_new_method(ENGINE *engine) | ||
| 121 | { | ||
| 122 | ECDH_DATA *ret; | ||
| 123 | |||
| 124 | ret = malloc(sizeof(ECDH_DATA)); | ||
| 125 | if (ret == NULL) | ||
| 126 | { | ||
| 127 | ECDHerr(ECDH_F_ECDH_DATA_NEW_METHOD, ERR_R_MALLOC_FAILURE); | ||
| 128 | return(NULL); | ||
| 129 | } | ||
| 130 | |||
| 131 | ret->init = NULL; | ||
| 132 | |||
| 133 | ret->meth = ECDH_get_default_method(); | ||
| 134 | ret->engine = engine; | ||
| 135 | #ifndef OPENSSL_NO_ENGINE | ||
| 136 | if (!ret->engine) | ||
| 137 | ret->engine = ENGINE_get_default_ECDH(); | ||
| 138 | if (ret->engine) | ||
| 139 | { | ||
| 140 | ret->meth = ENGINE_get_ECDH(ret->engine); | ||
| 141 | if (!ret->meth) | ||
| 142 | { | ||
| 143 | ECDHerr(ECDH_F_ECDH_DATA_NEW_METHOD, ERR_R_ENGINE_LIB); | ||
| 144 | ENGINE_finish(ret->engine); | ||
| 145 | free(ret); | ||
| 146 | return NULL; | ||
| 147 | } | ||
| 148 | } | ||
| 149 | #endif | ||
| 150 | |||
| 151 | ret->flags = ret->meth->flags; | ||
| 152 | CRYPTO_new_ex_data(CRYPTO_EX_INDEX_ECDH, ret, &ret->ex_data); | ||
| 153 | return(ret); | ||
| 154 | } | ||
| 155 | |||
| 156 | static void *ecdh_data_new(void) | ||
| 157 | { | ||
| 158 | return (void *)ECDH_DATA_new_method(NULL); | ||
| 159 | } | ||
| 160 | |||
| 161 | static void *ecdh_data_dup(void *data) | ||
| 162 | { | ||
| 163 | ECDH_DATA *r = (ECDH_DATA *)data; | ||
| 164 | |||
| 165 | /* XXX: dummy operation */ | ||
| 166 | if (r == NULL) | ||
| 167 | return NULL; | ||
| 168 | |||
| 169 | return (void *)ecdh_data_new(); | ||
| 170 | } | ||
| 171 | |||
| 172 | void ecdh_data_free(void *data) | ||
| 173 | { | ||
| 174 | ECDH_DATA *r = (ECDH_DATA *)data; | ||
| 175 | |||
| 176 | #ifndef OPENSSL_NO_ENGINE | ||
| 177 | if (r->engine) | ||
| 178 | ENGINE_finish(r->engine); | ||
| 179 | #endif | ||
| 180 | |||
| 181 | CRYPTO_free_ex_data(CRYPTO_EX_INDEX_ECDH, r, &r->ex_data); | ||
| 182 | |||
| 183 | OPENSSL_cleanse((void *)r, sizeof(ECDH_DATA)); | ||
| 184 | |||
| 185 | free(r); | ||
| 186 | } | ||
| 187 | |||
| 188 | ECDH_DATA *ecdh_check(EC_KEY *key) | ||
| 189 | { | ||
| 190 | ECDH_DATA *ecdh_data; | ||
| 191 | |||
| 192 | void *data = EC_KEY_get_key_method_data(key, ecdh_data_dup, | ||
| 193 | ecdh_data_free, ecdh_data_free); | ||
| 194 | if (data == NULL) | ||
| 195 | { | ||
| 196 | ecdh_data = (ECDH_DATA *)ecdh_data_new(); | ||
| 197 | if (ecdh_data == NULL) | ||
| 198 | return NULL; | ||
| 199 | data = EC_KEY_insert_key_method_data(key, (void *)ecdh_data, | ||
| 200 | ecdh_data_dup, ecdh_data_free, ecdh_data_free); | ||
| 201 | if (data != NULL) | ||
| 202 | { | ||
| 203 | /* Another thread raced us to install the key_method | ||
| 204 | * data and won. */ | ||
| 205 | ecdh_data_free(ecdh_data); | ||
| 206 | ecdh_data = (ECDH_DATA *)data; | ||
| 207 | } | ||
| 208 | } | ||
| 209 | else | ||
| 210 | ecdh_data = (ECDH_DATA *)data; | ||
| 211 | |||
| 212 | return ecdh_data; | ||
| 213 | } | ||
| 214 | |||
| 215 | int ECDH_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func, | ||
| 216 | CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func) | ||
| 217 | { | ||
| 218 | return CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_ECDH, argl, argp, | ||
| 219 | new_func, dup_func, free_func); | ||
| 220 | } | ||
| 221 | |||
| 222 | int ECDH_set_ex_data(EC_KEY *d, int idx, void *arg) | ||
| 223 | { | ||
| 224 | ECDH_DATA *ecdh; | ||
| 225 | ecdh = ecdh_check(d); | ||
| 226 | if (ecdh == NULL) | ||
| 227 | return 0; | ||
| 228 | return(CRYPTO_set_ex_data(&ecdh->ex_data,idx,arg)); | ||
| 229 | } | ||
| 230 | |||
| 231 | void *ECDH_get_ex_data(EC_KEY *d, int idx) | ||
| 232 | { | ||
| 233 | ECDH_DATA *ecdh; | ||
| 234 | ecdh = ecdh_check(d); | ||
| 235 | if (ecdh == NULL) | ||
| 236 | return NULL; | ||
| 237 | return(CRYPTO_get_ex_data(&ecdh->ex_data,idx)); | ||
| 238 | } | ||
diff --git a/src/lib/libcrypto/ecdh/ech_locl.h b/src/lib/libcrypto/ecdh/ech_locl.h deleted file mode 100644 index 077c7dab95..0000000000 --- a/src/lib/libcrypto/ecdh/ech_locl.h +++ /dev/null | |||
| @@ -1,98 +0,0 @@ | |||
| 1 | /* $OpenBSD: ech_locl.h,v 1.3 2015/02/07 13:19:15 doug Exp $ */ | ||
| 2 | /* ==================================================================== | ||
| 3 | * Copyright (c) 2000-2005 The OpenSSL Project. All rights reserved. | ||
| 4 | * | ||
| 5 | * Redistribution and use in source and binary forms, with or without | ||
| 6 | * modification, are permitted provided that the following conditions | ||
| 7 | * are met: | ||
| 8 | * | ||
| 9 | * 1. Redistributions of source code must retain the above copyright | ||
| 10 | * notice, this list of conditions and the following disclaimer. | ||
| 11 | * | ||
| 12 | * 2. Redistributions in binary form must reproduce the above copyright | ||
| 13 | * notice, this list of conditions and the following disclaimer in | ||
| 14 | * the documentation and/or other materials provided with the | ||
| 15 | * distribution. | ||
| 16 | * | ||
| 17 | * 3. All advertising materials mentioning features or use of this | ||
| 18 | * software must display the following acknowledgment: | ||
| 19 | * "This product includes software developed by the OpenSSL Project | ||
| 20 | * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)" | ||
| 21 | * | ||
| 22 | * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to | ||
| 23 | * endorse or promote products derived from this software without | ||
| 24 | * prior written permission. For written permission, please contact | ||
| 25 | * licensing@OpenSSL.org. | ||
| 26 | * | ||
| 27 | * 5. Products derived from this software may not be called "OpenSSL" | ||
| 28 | * nor may "OpenSSL" appear in their names without prior written | ||
| 29 | * permission of the OpenSSL Project. | ||
| 30 | * | ||
| 31 | * 6. Redistributions of any form whatsoever must retain the following | ||
| 32 | * acknowledgment: | ||
| 33 | * "This product includes software developed by the OpenSSL Project | ||
| 34 | * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)" | ||
| 35 | * | ||
| 36 | * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY | ||
| 37 | * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| 38 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | ||
| 39 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR | ||
| 40 | * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
| 41 | * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
| 42 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
| 43 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
| 44 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, | ||
| 45 | * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
| 46 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED | ||
| 47 | * OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| 48 | * ==================================================================== | ||
| 49 | * | ||
| 50 | * This product includes cryptographic software written by Eric Young | ||
| 51 | * (eay@cryptsoft.com). This product includes software written by Tim | ||
| 52 | * Hudson (tjh@cryptsoft.com). | ||
| 53 | * | ||
| 54 | */ | ||
| 55 | |||
| 56 | #ifndef HEADER_ECH_LOCL_H | ||
| 57 | #define HEADER_ECH_LOCL_H | ||
| 58 | |||
| 59 | #include <openssl/ecdh.h> | ||
| 60 | |||
| 61 | #ifdef __cplusplus | ||
| 62 | extern "C" { | ||
| 63 | #endif | ||
| 64 | |||
| 65 | struct ecdh_method | ||
| 66 | { | ||
| 67 | const char *name; | ||
| 68 | int (*compute_key)(void *key, size_t outlen, const EC_POINT *pub_key, EC_KEY *ecdh, | ||
| 69 | void *(*KDF)(const void *in, size_t inlen, void *out, size_t *outlen)); | ||
| 70 | int flags; | ||
| 71 | char *app_data; | ||
| 72 | }; | ||
| 73 | |||
| 74 | /* If this flag is set the ECDH method is FIPS compliant and can be used | ||
| 75 | * in FIPS mode. This is set in the validated module method. If an | ||
| 76 | * application sets this flag in its own methods it is its responsibility | ||
| 77 | * to ensure the result is compliant. | ||
| 78 | */ | ||
| 79 | |||
| 80 | #define ECDH_FLAG_FIPS_METHOD 0x1 | ||
| 81 | |||
| 82 | typedef struct ecdh_data_st { | ||
| 83 | /* EC_KEY_METH_DATA part */ | ||
| 84 | int (*init)(EC_KEY *); | ||
| 85 | /* method specific part */ | ||
| 86 | ENGINE *engine; | ||
| 87 | int flags; | ||
| 88 | const ECDH_METHOD *meth; | ||
| 89 | CRYPTO_EX_DATA ex_data; | ||
| 90 | } ECDH_DATA; | ||
| 91 | |||
| 92 | ECDH_DATA *ecdh_check(EC_KEY *); | ||
| 93 | |||
| 94 | #ifdef __cplusplus | ||
| 95 | } | ||
| 96 | #endif | ||
| 97 | |||
| 98 | #endif /* HEADER_ECH_LOCL_H */ | ||
