diff options
author | tb <> | 2023-07-01 14:52:34 +0000 |
---|---|---|
committer | tb <> | 2023-07-01 14:52:34 +0000 |
commit | 6dadceb6c588984746cc26b7cdbc3d3450fbe3e8 (patch) | |
tree | 4c20b801bfb5f360bdaef2d1bc886825303d9086 /src/lib | |
parent | 051da6d02b4e1290f2af4135c212b9083524d588 (diff) | |
download | openbsd-6dadceb6c588984746cc26b7cdbc3d3450fbe3e8.tar.gz openbsd-6dadceb6c588984746cc26b7cdbc3d3450fbe3e8.tar.bz2 openbsd-6dadceb6c588984746cc26b7cdbc3d3450fbe3e8.zip |
Reference commit needed in the next major bump
Diffstat (limited to 'src/lib')
-rw-r--r-- | src/lib/libcrypto/ecdh/ech_key.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/libcrypto/ecdh/ech_key.c b/src/lib/libcrypto/ecdh/ech_key.c index 662fc5bba1..f0c760b8da 100644 --- a/src/lib/libcrypto/ecdh/ech_key.c +++ b/src/lib/libcrypto/ecdh/ech_key.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ech_key.c,v 1.22 2023/07/01 14:50:39 tb Exp $ */ | 1 | /* $OpenBSD: ech_key.c,v 1.23 2023/07/01 14:52:34 tb Exp $ */ |
2 | /* ==================================================================== | 2 | /* ==================================================================== |
3 | * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED. | 3 | * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED. |
4 | * | 4 | * |
@@ -85,8 +85,8 @@ | |||
85 | * standard: | 85 | * standard: |
86 | * - ECKAS-DH1 | 86 | * - ECKAS-DH1 |
87 | * - ECSVDP-DH | 87 | * - ECSVDP-DH |
88 | * Finally an optional KDF is applied. | ||
89 | */ | 88 | */ |
89 | /* XXX - KDF handling moved to ECDH_compute_key(). See OpenSSL e2285d87. */ | ||
90 | int | 90 | int |
91 | ossl_ecdh_compute_key(void *out, size_t outlen, const EC_POINT *pub_key, | 91 | ossl_ecdh_compute_key(void *out, size_t outlen, const EC_POINT *pub_key, |
92 | EC_KEY *ecdh, | 92 | EC_KEY *ecdh, |