summaryrefslogtreecommitdiff
path: root/src/lib/libc
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/lib/libcrypto/Makefile5
-rw-r--r--src/lib/libcrypto/ecdh/ecdh.c (renamed from src/lib/libcrypto/ecdh/ech_key.c)64
-rw-r--r--src/lib/libcrypto/ecdh/ecdh_kdf.c121
3 files changed, 65 insertions, 125 deletions
diff --git a/src/lib/libcrypto/Makefile b/src/lib/libcrypto/Makefile
index bf20491fbc..6e41dae162 100644
--- a/src/lib/libcrypto/Makefile
+++ b/src/lib/libcrypto/Makefile
@@ -1,4 +1,4 @@
1# $OpenBSD: Makefile,v 1.134 2023/07/05 12:18:21 tb Exp $ 1# $OpenBSD: Makefile,v 1.135 2023/07/05 12:31:14 tb Exp $
2 2
3LIB= crypto 3LIB= crypto
4LIBREBUILD=y 4LIBREBUILD=y
@@ -351,9 +351,8 @@ SRCS+= ecp_smpl.c
351SRCS+= ecx_methods.c 351SRCS+= ecx_methods.c
352 352
353# ecdh/ 353# ecdh/
354SRCS+= ecdh_kdf.c 354SRCS+= ecdh.c
355SRCS+= ech_err.c 355SRCS+= ech_err.c
356SRCS+= ech_key.c
357SRCS+= ech_lib.c 356SRCS+= ech_lib.c
358 357
359# ecdsa/ 358# ecdsa/
diff --git a/src/lib/libcrypto/ecdh/ech_key.c b/src/lib/libcrypto/ecdh/ecdh.c
index 5efb49ba59..d2de3a09af 100644
--- a/src/lib/libcrypto/ecdh/ech_key.c
+++ b/src/lib/libcrypto/ecdh/ecdh.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ech_key.c,v 1.33 2023/07/05 08:39:40 tb Exp $ */ 1/* $OpenBSD: ecdh.c,v 1.1 2023/07/05 12:31:14 tb Exp $ */
2/* ==================================================================== 2/* ====================================================================
3 * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED. 3 * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
4 * 4 *
@@ -77,10 +77,72 @@
77#include <openssl/ec.h> 77#include <openssl/ec.h>
78#include <openssl/ecdh.h> 78#include <openssl/ecdh.h>
79#include <openssl/err.h> 79#include <openssl/err.h>
80#include <openssl/evp.h>
80 81
81#include "ec_local.h" 82#include "ec_local.h"
82 83
83/* 84/*
85 * Key derivation function from X9.63/SECG.
86 */
87
88/* Way more than we will ever need */
89#define ECDH_KDF_MAX (1 << 30)
90
91int
92ecdh_KDF_X9_63(unsigned char *out, size_t outlen, const unsigned char *Z,
93 size_t Zlen, const unsigned char *sinfo, size_t sinfolen, const EVP_MD *md)
94{
95 EVP_MD_CTX *mctx = NULL;
96 unsigned int i;
97 size_t mdlen;
98 unsigned char ctr[4];
99 int rv = 0;
100
101 if (sinfolen > ECDH_KDF_MAX || outlen > ECDH_KDF_MAX ||
102 Zlen > ECDH_KDF_MAX)
103 return 0;
104 mctx = EVP_MD_CTX_new();
105 if (mctx == NULL)
106 return 0;
107 mdlen = EVP_MD_size(md);
108 for (i = 1;; i++) {
109 unsigned char mtmp[EVP_MAX_MD_SIZE];
110 if (!EVP_DigestInit_ex(mctx, md, NULL))
111 goto err;
112 ctr[3] = i & 0xFF;
113 ctr[2] = (i >> 8) & 0xFF;
114 ctr[1] = (i >> 16) & 0xFF;
115 ctr[0] = (i >> 24) & 0xFF;
116 if (!EVP_DigestUpdate(mctx, Z, Zlen))
117 goto err;
118 if (!EVP_DigestUpdate(mctx, ctr, sizeof(ctr)))
119 goto err;
120 if (!EVP_DigestUpdate(mctx, sinfo, sinfolen))
121 goto err;
122 if (outlen >= mdlen) {
123 if (!EVP_DigestFinal(mctx, out, NULL))
124 goto err;
125 outlen -= mdlen;
126 if (outlen == 0)
127 break;
128 out += mdlen;
129 } else {
130 if (!EVP_DigestFinal(mctx, mtmp, NULL))
131 goto err;
132 memcpy(out, mtmp, outlen);
133 explicit_bzero(mtmp, mdlen);
134 break;
135 }
136 }
137 rv = 1;
138
139 err:
140 EVP_MD_CTX_free(mctx);
141
142 return rv;
143}
144
145/*
84 * Based on the ECKAS-DH1 and ECSVDP-DH primitives in the IEEE 1363 standard. 146 * Based on the ECKAS-DH1 and ECSVDP-DH primitives in the IEEE 1363 standard.
85 */ 147 */
86/* XXX - KDF handling moved to ECDH_compute_key(). See OpenSSL e2285d87. */ 148/* XXX - KDF handling moved to ECDH_compute_key(). See OpenSSL e2285d87. */
diff --git a/src/lib/libcrypto/ecdh/ecdh_kdf.c b/src/lib/libcrypto/ecdh/ecdh_kdf.c
deleted file mode 100644
index f9340749a6..0000000000
--- a/src/lib/libcrypto/ecdh/ecdh_kdf.c
+++ /dev/null
@@ -1,121 +0,0 @@
1/* $OpenBSD: ecdh_kdf.c,v 1.9 2023/06/25 19:43:28 tb Exp $ */
2/*
3 * Written by Stephen Henson for the OpenSSL project.
4 */
5/* ====================================================================
6 * Copyright (c) 2013 The OpenSSL Project. All rights reserved.
7 *
8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions
10 * are met:
11 *
12 * 1. Redistributions of source code must retain the above copyright
13 * notice, this list of conditions and the following disclaimer.
14 *
15 * 2. Redistributions in binary form must reproduce the above copyright
16 * notice, this list of conditions and the following disclaimer in
17 * the documentation and/or other materials provided with the
18 * distribution.
19 *
20 * 3. All advertising materials mentioning features or use of this
21 * software must display the following acknowledgment:
22 * "This product includes software developed by the OpenSSL Project
23 * for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
24 *
25 * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
26 * endorse or promote products derived from this software without
27 * prior written permission. For written permission, please contact
28 * openssl-core@openssl.org.
29 *
30 * 5. Products derived from this software may not be called "OpenSSL"
31 * nor may "OpenSSL" appear in their names without prior written
32 * permission of the OpenSSL Project.
33 *
34 * 6. Redistributions of any form whatsoever must retain the following
35 * acknowledgment:
36 * "This product includes software developed by the OpenSSL Project
37 * for use in the OpenSSL Toolkit (http://www.openssl.org/)"
38 *
39 * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
40 * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
41 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
42 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
43 * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
44 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
45 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
46 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
47 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
48 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
49 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
50 * OF THE POSSIBILITY OF SUCH DAMAGE.
51 * ====================================================================
52 */
53
54#include <string.h>
55
56#include <openssl/ecdh.h>
57#include <openssl/ec.h>
58#include <openssl/evp.h>
59
60#include "ec_local.h"
61
62/*
63 * Key derivation function from X9.63/SECG.
64 */
65
66/* Way more than we will ever need */
67#define ECDH_KDF_MAX (1 << 30)
68
69int
70ecdh_KDF_X9_63(unsigned char *out, size_t outlen, const unsigned char *Z,
71 size_t Zlen, const unsigned char *sinfo, size_t sinfolen, const EVP_MD *md)
72{
73 EVP_MD_CTX *mctx = NULL;
74 unsigned int i;
75 size_t mdlen;
76 unsigned char ctr[4];
77 int rv = 0;
78
79 if (sinfolen > ECDH_KDF_MAX || outlen > ECDH_KDF_MAX ||
80 Zlen > ECDH_KDF_MAX)
81 return 0;
82 mctx = EVP_MD_CTX_new();
83 if (mctx == NULL)
84 return 0;
85 mdlen = EVP_MD_size(md);
86 for (i = 1;; i++) {
87 unsigned char mtmp[EVP_MAX_MD_SIZE];
88 if (!EVP_DigestInit_ex(mctx, md, NULL))
89 goto err;
90 ctr[3] = i & 0xFF;
91 ctr[2] = (i >> 8) & 0xFF;
92 ctr[1] = (i >> 16) & 0xFF;
93 ctr[0] = (i >> 24) & 0xFF;
94 if (!EVP_DigestUpdate(mctx, Z, Zlen))
95 goto err;
96 if (!EVP_DigestUpdate(mctx, ctr, sizeof(ctr)))
97 goto err;
98 if (!EVP_DigestUpdate(mctx, sinfo, sinfolen))
99 goto err;
100 if (outlen >= mdlen) {
101 if (!EVP_DigestFinal(mctx, out, NULL))
102 goto err;
103 outlen -= mdlen;
104 if (outlen == 0)
105 break;
106 out += mdlen;
107 } else {
108 if (!EVP_DigestFinal(mctx, mtmp, NULL))
109 goto err;
110 memcpy(out, mtmp, outlen);
111 explicit_bzero(mtmp, mdlen);
112 break;
113 }
114 }
115 rv = 1;
116
117 err:
118 EVP_MD_CTX_free(mctx);
119
120 return rv;
121}
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-11-17 12:11:09 +0000