summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/ecdh
diff options
context:
space:
mode:
authorcvs2svn <admin@example.com>2016-07-23 19:31:36 +0000
committercvs2svn <admin@example.com>2016-07-23 19:31:36 +0000
commit86c49b31af735796dfde37aa29473a30d36367db (patch)
treee9a354a92a348338fe2b361e2eda703cae23cfab /src/lib/libcrypto/ecdh
parent19d5fe348e8926bac4521c5807aa64c45b8f7a41 (diff)
downloadopenbsd-OPENBSD_6_0_BASE.tar.gz
openbsd-OPENBSD_6_0_BASE.tar.bz2
openbsd-OPENBSD_6_0_BASE.zip
This commit was manufactured by cvs2git to create tag 'OPENBSD_6_0_BASE'.OPENBSD_6_0_BASE
Diffstat (limited to '')
-rw-r--r--src/lib/libcrypto/ecdh/ecdh.h128
-rw-r--r--src/lib/libcrypto/ecdh/ech_err.c101
-rw-r--r--src/lib/libcrypto/ecdh/ech_key.c226
-rw-r--r--src/lib/libcrypto/ecdh/ech_lib.c247
-rw-r--r--src/lib/libcrypto/ecdh/ech_locl.h97
5 files changed, 0 insertions, 799 deletions
diff --git a/src/lib/libcrypto/ecdh/ecdh.h b/src/lib/libcrypto/ecdh/ecdh.h
deleted file mode 100644
index ccc1312fd8..0000000000
--- a/src/lib/libcrypto/ecdh/ecdh.h
+++ /dev/null
@@ -1,128 +0,0 @@
1/* $OpenBSD: ecdh.h,v 1.5 2015/09/13 12:03:07 jsing 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
85extern "C" {
86#endif
87
88const ECDH_METHOD *ECDH_OpenSSL(void);
89
90void ECDH_set_default_method(const ECDH_METHOD *);
91const ECDH_METHOD *ECDH_get_default_method(void);
92int ECDH_set_method(EC_KEY *, const ECDH_METHOD *);
93
94int ECDH_size(const EC_KEY *ecdh);
95int ECDH_compute_key(void *out, size_t outlen, const EC_POINT *pub_key,
96 EC_KEY *ecdh,
97 void *(*KDF)(const void *in, size_t inlen, void *out, size_t *outlen));
98
99int ECDH_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new
100*new_func, CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func);
101int ECDH_set_ex_data(EC_KEY *d, int idx, void *arg);
102void *ECDH_get_ex_data(EC_KEY *d, int idx);
103
104
105/* BEGIN ERROR CODES */
106/* The following lines are auto generated by the script mkerr.pl. Any changes
107 * made after this point may be overwritten when the script is next run.
108 */
109void ERR_load_ECDH_strings(void);
110
111/* Error codes for the ECDH functions. */
112
113/* Function codes. */
114#define ECDH_F_ECDH_CHECK 102
115#define ECDH_F_ECDH_COMPUTE_KEY 100
116#define ECDH_F_ECDH_DATA_NEW_METHOD 101
117
118/* Reason codes. */
119#define ECDH_R_KDF_FAILED 102
120#define ECDH_R_KEY_TRUNCATION 104
121#define ECDH_R_NON_FIPS_METHOD 103
122#define ECDH_R_NO_PRIVATE_VALUE 100
123#define ECDH_R_POINT_ARITHMETIC_FAILURE 101
124
125#ifdef __cplusplus
126}
127#endif
128#endif
diff --git a/src/lib/libcrypto/ecdh/ech_err.c b/src/lib/libcrypto/ecdh/ech_err.c
deleted file mode 100644
index afe5ff3af8..0000000000
--- a/src/lib/libcrypto/ecdh/ech_err.c
+++ /dev/null
@@ -1,101 +0,0 @@
1/* $OpenBSD: ech_err.c,v 1.5 2015/09/13 11:49:44 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
74static ERR_STRING_DATA ECDH_str_functs[]= {
75 {ERR_FUNC(ECDH_F_ECDH_CHECK), "ECDH_CHECK"},
76 {ERR_FUNC(ECDH_F_ECDH_COMPUTE_KEY), "ECDH_compute_key"},
77 {ERR_FUNC(ECDH_F_ECDH_DATA_NEW_METHOD), "ECDH_DATA_new_method"},
78 {0, NULL}
79};
80
81static ERR_STRING_DATA ECDH_str_reasons[]= {
82 {ERR_REASON(ECDH_R_KDF_FAILED) , "KDF failed"},
83 {ERR_REASON(ECDH_R_KEY_TRUNCATION), "key would be truncated"},
84 {ERR_REASON(ECDH_R_NON_FIPS_METHOD) , "non fips method"},
85 {ERR_REASON(ECDH_R_NO_PRIVATE_VALUE) , "no private value"},
86 {ERR_REASON(ECDH_R_POINT_ARITHMETIC_FAILURE), "point arithmetic failure"},
87 {0, NULL}
88};
89
90#endif
91
92void
93ERR_load_ECDH_strings(void)
94{
95#ifndef OPENSSL_NO_ERR
96 if (ERR_func_error_string(ECDH_str_functs[0].error) == NULL) {
97 ERR_load_strings(0, ECDH_str_functs);
98 ERR_load_strings(0, ECDH_str_reasons);
99 }
100#endif
101}
diff --git a/src/lib/libcrypto/ecdh/ech_key.c b/src/lib/libcrypto/ecdh/ech_key.c
deleted file mode 100644
index 33ee244499..0000000000
--- a/src/lib/libcrypto/ecdh/ech_key.c
+++ /dev/null
@@ -1,226 +0,0 @@
1/* $OpenBSD: ech_key.c,v 1.6 2015/09/18 13:04:41 bcook 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 <limits.h>
71#include <string.h>
72
73#include <openssl/opensslconf.h>
74
75#include <openssl/bn.h>
76#include <openssl/err.h>
77#include <openssl/obj_mac.h>
78#include <openssl/sha.h>
79
80#include "ech_locl.h"
81
82static int ecdh_compute_key(void *out, size_t len, const EC_POINT *pub_key,
83 EC_KEY *ecdh,
84 void *(*KDF)(const void *in, size_t inlen, void *out, size_t *outlen));
85
86/*
87 * This implementation is based on the following primitives in the IEEE 1363
88 * standard:
89 * - ECKAS-DH1
90 * - ECSVDP-DH
91 * Finally an optional KDF is applied.
92 */
93static int
94ecdh_compute_key(void *out, size_t outlen, const EC_POINT *pub_key,
95 EC_KEY *ecdh,
96 void *(*KDF)(const void *in, size_t inlen, void *out, size_t *outlen))
97{
98 BN_CTX *ctx;
99 EC_POINT *tmp = NULL;
100 BIGNUM *x = NULL, *y = NULL;
101 const BIGNUM *priv_key;
102 const EC_GROUP* group;
103 int ret = -1;
104 size_t buflen, len;
105 unsigned char *buf = NULL;
106
107 if (outlen > INT_MAX) {
108 /* Sort of, anyway. */
109 ECDHerr(ECDH_F_ECDH_COMPUTE_KEY, ERR_R_MALLOC_FAILURE);
110 return -1;
111 }
112
113 if ((ctx = BN_CTX_new()) == NULL)
114 goto err;
115 BN_CTX_start(ctx);
116 if ((x = BN_CTX_get(ctx)) == NULL)
117 goto err;
118 if ((y = BN_CTX_get(ctx)) == NULL)
119 goto err;
120
121 priv_key = EC_KEY_get0_private_key(ecdh);
122 if (priv_key == NULL) {
123 ECDHerr(ECDH_F_ECDH_COMPUTE_KEY, ECDH_R_NO_PRIVATE_VALUE);
124 goto err;
125 }
126
127 group = EC_KEY_get0_group(ecdh);
128 if ((tmp = EC_POINT_new(group)) == NULL) {
129 ECDHerr(ECDH_F_ECDH_COMPUTE_KEY, ERR_R_MALLOC_FAILURE);
130 goto err;
131 }
132
133 if (!EC_POINT_mul(group, tmp, NULL, pub_key, priv_key, ctx)) {
134 ECDHerr(ECDH_F_ECDH_COMPUTE_KEY,
135 ECDH_R_POINT_ARITHMETIC_FAILURE);
136 goto err;
137 }
138
139 if (EC_METHOD_get_field_type(EC_GROUP_method_of(group)) ==
140 NID_X9_62_prime_field) {
141 if (!EC_POINT_get_affine_coordinates_GFp(group, tmp, x, y,
142 ctx)) {
143 ECDHerr(ECDH_F_ECDH_COMPUTE_KEY,
144 ECDH_R_POINT_ARITHMETIC_FAILURE);
145 goto err;
146 }
147 }
148#ifndef OPENSSL_NO_EC2M
149 else {
150 if (!EC_POINT_get_affine_coordinates_GF2m(group, tmp, x, y,
151 ctx)) {
152 ECDHerr(ECDH_F_ECDH_COMPUTE_KEY,
153 ECDH_R_POINT_ARITHMETIC_FAILURE);
154 goto err;
155 }
156 }
157#endif
158
159 buflen = ECDH_size(ecdh);
160 len = BN_num_bytes(x);
161 if (len > buflen) {
162 ECDHerr(ECDH_F_ECDH_COMPUTE_KEY, ERR_R_INTERNAL_ERROR);
163 goto err;
164 }
165 if (KDF == NULL && outlen < buflen) {
166 /* The resulting key would be truncated. */
167 ECDHerr(ECDH_F_ECDH_COMPUTE_KEY, ECDH_R_KEY_TRUNCATION);
168 goto err;
169 }
170 if ((buf = malloc(buflen)) == NULL) {
171 ECDHerr(ECDH_F_ECDH_COMPUTE_KEY, ERR_R_MALLOC_FAILURE);
172 goto err;
173 }
174
175 memset(buf, 0, buflen - len);
176 if (len != (size_t)BN_bn2bin(x, buf + buflen - len)) {
177 ECDHerr(ECDH_F_ECDH_COMPUTE_KEY, ERR_R_BN_LIB);
178 goto err;
179 }
180
181 if (KDF != NULL) {
182 if (KDF(buf, buflen, out, &outlen) == NULL) {
183 ECDHerr(ECDH_F_ECDH_COMPUTE_KEY, ECDH_R_KDF_FAILED);
184 goto err;
185 }
186 ret = outlen;
187 } else {
188 /* No KDF, just copy out the key and zero the rest. */
189 if (outlen > buflen) {
190 memset((void *)((uintptr_t)out + buflen), 0, outlen - buflen);
191 outlen = buflen;
192 }
193 memcpy(out, buf, outlen);
194 ret = outlen;
195 }
196
197err:
198 EC_POINT_free(tmp);
199 if (ctx)
200 BN_CTX_end(ctx);
201 BN_CTX_free(ctx);
202 free(buf);
203 return (ret);
204}
205
206static ECDH_METHOD openssl_ecdh_meth = {
207 .name = "OpenSSL ECDH method",
208 .compute_key = ecdh_compute_key
209};
210
211const ECDH_METHOD *
212ECDH_OpenSSL(void)
213{
214 return &openssl_ecdh_meth;
215}
216
217int
218ECDH_compute_key(void *out, size_t outlen, const EC_POINT *pub_key,
219 EC_KEY *eckey,
220 void *(*KDF)(const void *in, size_t inlen, void *out, size_t *outlen))
221{
222 ECDH_DATA *ecdh = ecdh_check(eckey);
223 if (ecdh == NULL)
224 return 0;
225 return ecdh->meth->compute_key(out, outlen, pub_key, eckey, KDF);
226}
diff --git a/src/lib/libcrypto/ecdh/ech_lib.c b/src/lib/libcrypto/ecdh/ech_lib.c
deleted file mode 100644
index bb70d2d95f..0000000000
--- a/src/lib/libcrypto/ecdh/ech_lib.c
+++ /dev/null
@@ -1,247 +0,0 @@
1/* $OpenBSD: ech_lib.c,v 1.11 2015/09/13 12:03:07 jsing 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
80static const ECDH_METHOD *default_ECDH_method = NULL;
81
82static void *ecdh_data_new(void);
83static void *ecdh_data_dup(void *);
84static void ecdh_data_free(void *);
85
86void
87ECDH_set_default_method(const ECDH_METHOD *meth)
88{
89 default_ECDH_method = meth;
90}
91
92const ECDH_METHOD *
93ECDH_get_default_method(void)
94{
95 if (!default_ECDH_method) {
96 default_ECDH_method = ECDH_OpenSSL();
97 }
98 return default_ECDH_method;
99}
100
101int
102ECDH_set_method(EC_KEY *eckey, const ECDH_METHOD *meth)
103{
104 ECDH_DATA *ecdh;
105
106 ecdh = ecdh_check(eckey);
107
108 if (ecdh == NULL)
109 return 0;
110
111#ifndef OPENSSL_NO_ENGINE
112 if (ecdh->engine) {
113 ENGINE_finish(ecdh->engine);
114 ecdh->engine = NULL;
115 }
116#endif
117 ecdh->meth = meth;
118 return 1;
119}
120
121static ECDH_DATA *
122ECDH_DATA_new_method(ENGINE *engine)
123{
124 ECDH_DATA *ret;
125
126 ret = malloc(sizeof(ECDH_DATA));
127 if (ret == NULL) {
128 ECDHerr(ECDH_F_ECDH_DATA_NEW_METHOD, ERR_R_MALLOC_FAILURE);
129 return (NULL);
130 }
131
132 ret->init = NULL;
133
134 ret->meth = ECDH_get_default_method();
135 ret->engine = engine;
136#ifndef OPENSSL_NO_ENGINE
137 if (!ret->engine)
138 ret->engine = ENGINE_get_default_ECDH();
139 if (ret->engine) {
140 ret->meth = ENGINE_get_ECDH(ret->engine);
141 if (!ret->meth) {
142 ECDHerr(ECDH_F_ECDH_DATA_NEW_METHOD, ERR_R_ENGINE_LIB);
143 ENGINE_finish(ret->engine);
144 free(ret);
145 return NULL;
146 }
147 }
148#endif
149
150 ret->flags = ret->meth->flags;
151 CRYPTO_new_ex_data(CRYPTO_EX_INDEX_ECDH, ret, &ret->ex_data);
152 return (ret);
153}
154
155static void *
156ecdh_data_new(void)
157{
158 return (void *)ECDH_DATA_new_method(NULL);
159}
160
161static void *
162ecdh_data_dup(void *data)
163{
164 ECDH_DATA *r = (ECDH_DATA *)data;
165
166 /* XXX: dummy operation */
167 if (r == NULL)
168 return NULL;
169
170 return (void *)ecdh_data_new();
171}
172
173void
174ecdh_data_free(void *data)
175{
176 ECDH_DATA *r = (ECDH_DATA *)data;
177
178#ifndef OPENSSL_NO_ENGINE
179 if (r->engine)
180 ENGINE_finish(r->engine);
181#endif
182
183 CRYPTO_free_ex_data(CRYPTO_EX_INDEX_ECDH, r, &r->ex_data);
184
185 explicit_bzero((void *)r, sizeof(ECDH_DATA));
186
187 free(r);
188}
189
190ECDH_DATA *
191ecdh_check(EC_KEY *key)
192{
193 ECDH_DATA *ecdh_data;
194
195 void *data = EC_KEY_get_key_method_data(key, ecdh_data_dup,
196 ecdh_data_free, ecdh_data_free);
197 if (data == NULL) {
198 ecdh_data = (ECDH_DATA *)ecdh_data_new();
199 if (ecdh_data == NULL)
200 return NULL;
201 data = EC_KEY_insert_key_method_data(key, (void *)ecdh_data,
202 ecdh_data_dup, ecdh_data_free, ecdh_data_free);
203 if (data != NULL) {
204 /* Another thread raced us to install the key_method
205 * data and won. */
206 ecdh_data_free(ecdh_data);
207 ecdh_data = (ECDH_DATA *)data;
208 }
209 } else
210 ecdh_data = (ECDH_DATA *)data;
211
212 return ecdh_data;
213}
214
215int
216ECDH_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
217 CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func)
218{
219 return CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_ECDH, argl, argp,
220 new_func, dup_func, free_func);
221}
222
223int
224ECDH_set_ex_data(EC_KEY *d, int idx, void *arg)
225{
226 ECDH_DATA *ecdh;
227 ecdh = ecdh_check(d);
228 if (ecdh == NULL)
229 return 0;
230 return (CRYPTO_set_ex_data(&ecdh->ex_data, idx, arg));
231}
232
233void *
234ECDH_get_ex_data(EC_KEY *d, int idx)
235{
236 ECDH_DATA *ecdh;
237 ecdh = ecdh_check(d);
238 if (ecdh == NULL)
239 return NULL;
240 return (CRYPTO_get_ex_data(&ecdh->ex_data, idx));
241}
242
243int
244ECDH_size(const EC_KEY *d)
245{
246 return ((EC_GROUP_get_degree(EC_KEY_get0_group(d)) + 7) / 8);
247}
diff --git a/src/lib/libcrypto/ecdh/ech_locl.h b/src/lib/libcrypto/ecdh/ech_locl.h
deleted file mode 100644
index 8338007393..0000000000
--- a/src/lib/libcrypto/ecdh/ech_locl.h
+++ /dev/null
@@ -1,97 +0,0 @@
1/* $OpenBSD: ech_locl.h,v 1.4 2015/09/13 10:46:20 jsing 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
62extern "C" {
63#endif
64
65struct ecdh_method {
66 const char *name;
67 int (*compute_key)(void *key, size_t outlen, const EC_POINT *pub_key, EC_KEY *ecdh,
68 void *(*KDF)(const void *in, size_t inlen, void *out, size_t *outlen));
69 int flags;
70 char *app_data;
71};
72
73/* If this flag is set the ECDH method is FIPS compliant and can be used
74 * in FIPS mode. This is set in the validated module method. If an
75 * application sets this flag in its own methods it is its responsibility
76 * to ensure the result is compliant.
77 */
78
79#define ECDH_FLAG_FIPS_METHOD 0x1
80
81typedef struct ecdh_data_st {
82 /* EC_KEY_METH_DATA part */
83 int (*init)(EC_KEY *);
84 /* method specific part */
85 ENGINE *engine;
86 int flags;
87 const ECDH_METHOD *meth;
88 CRYPTO_EX_DATA ex_data;
89} ECDH_DATA;
90
91ECDH_DATA *ecdh_check(EC_KEY *);
92
93#ifdef __cplusplus
94}
95#endif
96
97#endif /* HEADER_ECH_LOCL_H */
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-05-10 21:21:56 +0000