Print this page
fixup .text where possible
additional style updates in crypto
7127  remove -Wno-missing-braces from Makefile.uts

@@ -188,13 +188,13 @@
         "Pseudo KCF Prov (crypto)"
 };
 
 static struct modlinkage modlinkage = {
         MODREV_1,
-        &modldrv,
+        {   &modldrv,
         &modlcrypto,
-        NULL
+            NULL }
 };
 
 /*
  * CSPI information (entry points, provider info, etc.)
  */

@@ -1038,12 +1038,12 @@
         dprov_nostore_key_generate,
         dprov_nostore_key_generate_pair,
         dprov_nostore_key_derive
 };
 
-static crypto_ops_t dprov_crypto_ops = {
-        &dprov_control_ops,
+static crypto_ops_t dprov_crypto_ops = { .cou.cou_v2 = {
+        {   &dprov_control_ops,
         &dprov_digest_ops,
         &dprov_cipher_ops,
         &dprov_mac_ops,
         &dprov_sign_ops,
         &dprov_verify_ops,

@@ -1052,13 +1052,13 @@
         &dprov_random_number_ops,
         &dprov_session_ops,
         &dprov_object_ops,
         &dprov_key_ops,
         &dprov_management_ops,
-        &dprov_ctx_ops,
+            &dprov_ctx_ops },
         &dprov_mech_ops
-};
+}};
 
 
 /* maximum SO and user PIN lengths */
 #define DPROV_MAX_PIN_LEN       128
 

@@ -1207,23 +1207,23 @@
         dprov_session_state_t ds_state; /* session state */
         dprov_object_t *ds_objects[DPROV_MAX_OBJECTS];  /* session objects */
 } dprov_session_t;
 
 
-static crypto_provider_info_t dprov_prov_info = {
-        CRYPTO_SPI_VERSION_2,
+static crypto_provider_info_t dprov_prov_info = {{{
+        {   CRYPTO_SPI_VERSION_2,
         "Dummy Pseudo HW Provider",
         CRYPTO_HW_PROVIDER,
-        NULL,                           /* pi_provider_dev */
+            { NULL },                   /* pi_provider_dev */
         NULL,                           /* pi_provider_handle */
         &dprov_crypto_ops,
         sizeof (dprov_mech_info_tab)/sizeof (crypto_mech_info_t),
         dprov_mech_info_tab,
         0,                              /* pi_logical_provider_count */
-        NULL,                           /* pi_logical_providers */
+            NULL },                     /* pi_logical_providers */
         0                               /* pi_flags */
-};
+}}};
 
 /*
  * Per-instance info.
  */
 typedef struct dprov_state {