diff options
| author | Theo Buehler <tb@cvs.openbsd.org> | 2022-05-05 07:53:31 +0000 |
|---|---|---|
| committer | Theo Buehler <tb@cvs.openbsd.org> | 2022-05-05 07:53:31 +0000 |
| commit | 4d8f6d00c4a11591f8f1cf054fdd1f711c475922 (patch) | |
| tree | 66441a8f145b24c2695e90acebae48676b4af1d7 /lib/libcrypto/kdf | |
| parent | 5b01595d38ea8ffd97546e966063938fbcf2c84a (diff) | |
Use C99 initializres for hkdf_pkey_meth
ok beck jsing
Diffstat (limited to 'lib/libcrypto/kdf')
| -rw-r--r-- | lib/libcrypto/kdf/hkdf_evp.c | 36 |
1 files changed, 10 insertions, 26 deletions
diff --git a/lib/libcrypto/kdf/hkdf_evp.c b/lib/libcrypto/kdf/hkdf_evp.c index 50164239dc1..a258cb7ec98 100644 --- a/lib/libcrypto/kdf/hkdf_evp.c +++ b/lib/libcrypto/kdf/hkdf_evp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hkdf_evp.c,v 1.7 2022/05/05 07:50:06 tb Exp $ */ +/* $OpenBSD: hkdf_evp.c,v 1.8 2022/05/05 07:53:30 tb Exp $ */ /* ==================================================================== * Copyright (c) 2016-2018 The OpenSSL Project. All rights reserved. * @@ -259,31 +259,15 @@ pkey_hkdf_derive(EVP_PKEY_CTX *ctx, unsigned char *key, } const EVP_PKEY_METHOD hkdf_pkey_meth = { - EVP_PKEY_HKDF, - 0, - pkey_hkdf_init, - 0, - pkey_hkdf_cleanup, + .pkey_id = EVP_PKEY_HKDF, + .flags = 0, - 0, 0, - 0, 0, + .init = pkey_hkdf_init, + .copy = NULL, + .cleanup = pkey_hkdf_cleanup, - 0, - 0, - - 0, - 0, - - 0, 0, - - 0, 0, 0, 0, - - 0, 0, - - 0, 0, - - pkey_hkdf_derive_init, - pkey_hkdf_derive, - pkey_hkdf_ctrl, - pkey_hkdf_ctrl_str + .derive_init = pkey_hkdf_derive_init, + .derive = pkey_hkdf_derive, + .ctrl = pkey_hkdf_ctrl, + .ctrl_str = pkey_hkdf_ctrl_str, }; |