module: icp: spi: flatten struct crypto_ops, crypto_provider_info

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Closes #12901
This commit is contained in:
наб
2021-12-22 22:09:28 +01:00
committed by Brian Behlendorf
parent 959b9d6392
commit f5896e2bdf
6 changed files with 19 additions and 108 deletions
+4 -5
View File
@@ -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 };
+4 -5
View File
@@ -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;
+4 -5
View File
@@ -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;