Print this page
fixup .text where possible
7127  remove -Wno-missing-braces from Makefile.uts

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/crypto/io/blowfish.c
          +++ new/usr/src/uts/common/crypto/io/blowfish.c
↓ open down ↓ 44 lines elided ↑ open up ↑
  45   45  /*
  46   46   * Module linkage information for the kernel.
  47   47   */
  48   48  static struct modlcrypto modlcrypto = {
  49   49          &mod_cryptoops,
  50   50          "Blowfish Kernel SW Provider"
  51   51  };
  52   52  
  53   53  static struct modlinkage modlinkage = {
  54   54          MODREV_1,
  55      -        (void *)&modlcrypto,
  56      -        NULL
       55 +        {   (void *)&modlcrypto,
       56 +            NULL }
  57   57  };
  58   58  
  59   59  /*
  60   60   * CSPI information (entry points, provider info, etc.)
  61   61   */
  62   62  typedef enum blowfish_mech_type {
  63   63          BLOWFISH_ECB_MECH_INFO_TYPE,            /* SUN_CKM_BLOWFISH_ECB */
  64   64          BLOWFISH_CBC_MECH_INFO_TYPE             /* SUN_CKM_BLOWFISH_CBC */
  65   65  } blowfish_mech_type_t;
  66   66  
↓ open down ↓ 92 lines elided ↑ open up ↑
 159  159      crypto_mechanism_t *, crypto_key_t *, crypto_spi_ctx_template_t *,
 160  160      size_t *, crypto_req_handle_t);
 161  161  static int blowfish_free_context(crypto_ctx_t *);
 162  162  
 163  163  static crypto_ctx_ops_t blowfish_ctx_ops = {
 164  164          blowfish_create_ctx_template,
 165  165          blowfish_free_context
 166  166  };
 167  167  
 168  168  static crypto_ops_t blowfish_crypto_ops = {
 169      -        &blowfish_control_ops,
 170      -        NULL,
 171      -        &blowfish_cipher_ops,
 172      -        NULL,
 173      -        NULL,
 174      -        NULL,
 175      -        NULL,
 176      -        NULL,
 177      -        NULL,
 178      -        NULL,
 179      -        NULL,
 180      -        NULL,
 181      -        NULL,
 182      -        &blowfish_ctx_ops
      169 +        .co_control_ops = &blowfish_control_ops,
      170 +        .co_digest_ops = NULL,
      171 +        .co_cipher_ops = &blowfish_cipher_ops,
      172 +        .co_mac_ops = NULL,
      173 +        .co_sign_ops = NULL,
      174 +        .co_verify_ops = NULL,
      175 +        .co_dual_ops = NULL,
      176 +        .co_dual_cipher_mac_ops = NULL,
      177 +        .co_random_ops = NULL,
      178 +        .co_session_ops = NULL,
      179 +        .co_object_ops = NULL,
      180 +        .co_key_ops = NULL,
      181 +        .co_provider_ops = NULL,
      182 +        .co_ctx_ops = &blowfish_ctx_ops
 183  183  };
 184  184  
 185      -static crypto_provider_info_t blowfish_prov_info = {
      185 +static crypto_provider_info_t blowfish_prov_info = {{{{
 186  186          CRYPTO_SPI_VERSION_1,
 187  187          "Blowfish Software Provider",
 188  188          CRYPTO_SW_PROVIDER,
 189  189          {&modlinkage},
 190  190          NULL,
 191  191          &blowfish_crypto_ops,
 192  192          sizeof (blowfish_mech_info_tab)/sizeof (crypto_mech_info_t),
 193  193          blowfish_mech_info_tab
 194      -};
      194 +}}}};
 195  195  
 196  196  
 197  197  static crypto_kcf_provider_handle_t blowfish_prov_handle = NULL;
 198  198  
 199  199  int
 200  200  _init(void)
 201  201  {
 202  202          int ret;
 203  203  
 204  204          if ((ret = mod_install(&modlinkage)) != 0)
↓ open down ↓ 666 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX