diff options
Diffstat (limited to 'module/icp/io')
| -rw-r--r-- | module/icp/io/aes.c | 9 | ||||
| -rw-r--r-- | module/icp/io/sha2_mod.c | 9 | ||||
| -rw-r--r-- | module/icp/io/skein_mod.c | 9 |
3 files changed, 12 insertions, 15 deletions
diff --git a/module/icp/io/aes.c b/module/icp/io/aes.c index 510764e7b..27930ed00 100644 --- a/module/icp/io/aes.c +++ b/module/icp/io/aes.c @@ -143,7 +143,7 @@ static const crypto_ctx_ops_t aes_ctx_ops = { .free_context = aes_free_context }; -static const crypto_ops_t aes_crypto_ops = {{{{{ +static const crypto_ops_t aes_crypto_ops = { NULL, &aes_cipher_ops, &aes_mac_ops, @@ -157,17 +157,16 @@ static const crypto_ops_t aes_crypto_ops = {{{{{ NULL, NULL, &aes_ctx_ops -}}}}}; +}; -static const crypto_provider_info_t aes_prov_info = {{{{ - CRYPTO_SPI_VERSION_1, +static const crypto_provider_info_t aes_prov_info = { "AES Software Provider", CRYPTO_SW_PROVIDER, NULL, &aes_crypto_ops, sizeof (aes_mech_info_tab) / sizeof (crypto_mech_info_t), aes_mech_info_tab -}}}}; +}; static crypto_kcf_provider_handle_t aes_prov_handle = 0; static crypto_data_t null_crypto_data = { CRYPTO_DATA_RAW }; diff --git a/module/icp/io/sha2_mod.c b/module/icp/io/sha2_mod.c index df25d1544..0c7f8a73d 100644 --- a/module/icp/io/sha2_mod.c +++ b/module/icp/io/sha2_mod.c @@ -157,7 +157,7 @@ static const crypto_ctx_ops_t sha2_ctx_ops = { .free_context = sha2_free_context }; -static const crypto_ops_t sha2_crypto_ops = {{{{{ +static const crypto_ops_t sha2_crypto_ops = { &sha2_digest_ops, NULL, &sha2_mac_ops, @@ -171,17 +171,16 @@ static const crypto_ops_t sha2_crypto_ops = {{{{{ NULL, NULL, &sha2_ctx_ops -}}}}}; +}; -static const crypto_provider_info_t sha2_prov_info = {{{{ - CRYPTO_SPI_VERSION_1, +static const crypto_provider_info_t sha2_prov_info = { "SHA2 Software Provider", CRYPTO_SW_PROVIDER, NULL, &sha2_crypto_ops, sizeof (sha2_mech_info_tab) / sizeof (crypto_mech_info_t), sha2_mech_info_tab -}}}}; +}; static crypto_kcf_provider_handle_t sha2_prov_handle = 0; diff --git a/module/icp/io/skein_mod.c b/module/icp/io/skein_mod.c index b54685873..cceea29d4 100644 --- a/module/icp/io/skein_mod.c +++ b/module/icp/io/skein_mod.c @@ -95,7 +95,7 @@ static const crypto_ctx_ops_t skein_ctx_ops = { .free_context = skein_free_context }; -static const crypto_ops_t skein_crypto_ops = {{{{{ +static const crypto_ops_t skein_crypto_ops = { &skein_digest_ops, NULL, &skein_mac_ops, @@ -109,17 +109,16 @@ static const crypto_ops_t skein_crypto_ops = {{{{{ NULL, NULL, &skein_ctx_ops, -}}}}}; +}; -static const crypto_provider_info_t skein_prov_info = {{{{ - CRYPTO_SPI_VERSION_1, +static const crypto_provider_info_t skein_prov_info = { "Skein Software Provider", CRYPTO_SW_PROVIDER, NULL, &skein_crypto_ops, sizeof (skein_mech_info_tab) / sizeof (crypto_mech_info_t), skein_mech_info_tab -}}}}; +}; static crypto_kcf_provider_handle_t skein_prov_handle = 0; |