diff options
author | tb <> | 2022-05-05 07:53:30 +0000 |
---|---|---|
committer | tb <> | 2022-05-05 07:53:30 +0000 |
commit | f957cc830af2bd08f5fcace287ae5ebd52577ff0 (patch) | |
tree | 2a3d09ce94d681440b933238134dd0e38b18354e /src | |
parent | 2e4ad2802422c50618b3d85dd57dfaf0016eb54b (diff) | |
download | openbsd-f957cc830af2bd08f5fcace287ae5ebd52577ff0.tar.gz openbsd-f957cc830af2bd08f5fcace287ae5ebd52577ff0.tar.bz2 openbsd-f957cc830af2bd08f5fcace287ae5ebd52577ff0.zip |
Use C99 initializres for hkdf_pkey_meth
ok beck jsing
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libcrypto/kdf/hkdf_evp.c | 36 |
1 files changed, 10 insertions, 26 deletions
diff --git a/src/lib/libcrypto/kdf/hkdf_evp.c b/src/lib/libcrypto/kdf/hkdf_evp.c index 50164239dc..a258cb7ec9 100644 --- a/src/lib/libcrypto/kdf/hkdf_evp.c +++ b/src/lib/libcrypto/kdf/hkdf_evp.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: hkdf_evp.c,v 1.7 2022/05/05 07:50:06 tb Exp $ */ | 1 | /* $OpenBSD: hkdf_evp.c,v 1.8 2022/05/05 07:53:30 tb Exp $ */ |
2 | /* ==================================================================== | 2 | /* ==================================================================== |
3 | * Copyright (c) 2016-2018 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 2016-2018 The OpenSSL Project. All rights reserved. |
4 | * | 4 | * |
@@ -259,31 +259,15 @@ pkey_hkdf_derive(EVP_PKEY_CTX *ctx, unsigned char *key, | |||
259 | } | 259 | } |
260 | 260 | ||
261 | const EVP_PKEY_METHOD hkdf_pkey_meth = { | 261 | const EVP_PKEY_METHOD hkdf_pkey_meth = { |
262 | EVP_PKEY_HKDF, | 262 | .pkey_id = EVP_PKEY_HKDF, |
263 | 0, | 263 | .flags = 0, |
264 | pkey_hkdf_init, | ||
265 | 0, | ||
266 | pkey_hkdf_cleanup, | ||
267 | 264 | ||
268 | 0, 0, | 265 | .init = pkey_hkdf_init, |
269 | 0, 0, | 266 | .copy = NULL, |
267 | .cleanup = pkey_hkdf_cleanup, | ||
270 | 268 | ||
271 | 0, | 269 | .derive_init = pkey_hkdf_derive_init, |
272 | 0, | 270 | .derive = pkey_hkdf_derive, |
273 | 271 | .ctrl = pkey_hkdf_ctrl, | |
274 | 0, | 272 | .ctrl_str = pkey_hkdf_ctrl_str, |
275 | 0, | ||
276 | |||
277 | 0, 0, | ||
278 | |||
279 | 0, 0, 0, 0, | ||
280 | |||
281 | 0, 0, | ||
282 | |||
283 | 0, 0, | ||
284 | |||
285 | pkey_hkdf_derive_init, | ||
286 | pkey_hkdf_derive, | ||
287 | pkey_hkdf_ctrl, | ||
288 | pkey_hkdf_ctrl_str | ||
289 | }; | 273 | }; |