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/aes.c
          +++ new/usr/src/uts/common/crypto/io/aes.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          "AES 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   * Mechanism info structure passed to KCF during registration.
  61   61   */
  62   62  static crypto_mech_info_t aes_mech_info_tab[] = {
  63   63          /* AES_ECB */
  64   64          {SUN_CKM_AES_ECB, AES_ECB_MECH_INFO_TYPE,
  65   65              CRYPTO_FG_ENCRYPT | CRYPTO_FG_ENCRYPT_ATOMIC |
  66   66              CRYPTO_FG_DECRYPT | CRYPTO_FG_DECRYPT_ATOMIC,
↓ open down ↓ 100 lines elided ↑ open up ↑
 167  167  static int aes_create_ctx_template(crypto_provider_handle_t,
 168  168      crypto_mechanism_t *, crypto_key_t *, crypto_spi_ctx_template_t *,
 169  169      size_t *, crypto_req_handle_t);
 170  170  static int aes_free_context(crypto_ctx_t *);
 171  171  
 172  172  static crypto_ctx_ops_t aes_ctx_ops = {
 173  173          aes_create_ctx_template,
 174  174          aes_free_context
 175  175  };
 176  176  
 177      -static crypto_ops_t aes_crypto_ops = {
 178      -        &aes_control_ops,
 179      -        NULL,
 180      -        &aes_cipher_ops,
 181      -        &aes_mac_ops,
 182      -        NULL,
 183      -        NULL,
 184      -        NULL,
 185      -        NULL,
 186      -        NULL,
 187      -        NULL,
 188      -        NULL,
 189      -        NULL,
 190      -        NULL,
 191      -        &aes_ctx_ops,
 192      -        NULL,
 193      -        NULL,
 194      -        NULL,
 195      -};
      177 +static crypto_ops_t aes_crypto_ops = {{{{{{
      178 +                                &aes_control_ops,
      179 +                                NULL,
      180 +                                &aes_cipher_ops,
      181 +                                &aes_mac_ops,
      182 +                                NULL,
      183 +                                NULL,
      184 +                                NULL,
      185 +                                NULL,
      186 +                                NULL,
      187 +                                NULL,
      188 +                                NULL,
      189 +                                NULL,
      190 +                                NULL,
      191 +                                &aes_ctx_ops }, /* cou_v1 */
      192 +                        NULL },                 /* cou_v2 */
      193 +                NULL },                         /* cou_v3 */
      194 +        NULL }                                  /* cou_v4 */
      195 +}};
 196  196  
 197      -static crypto_provider_info_t aes_prov_info = {
      197 +static crypto_provider_info_t aes_prov_info = {{{{
 198  198          CRYPTO_SPI_VERSION_4,
 199  199          "AES Software Provider",
 200  200          CRYPTO_SW_PROVIDER,
 201  201          {&modlinkage},
 202  202          NULL,
 203  203          &aes_crypto_ops,
 204  204          sizeof (aes_mech_info_tab)/sizeof (crypto_mech_info_t),
 205  205          aes_mech_info_tab
 206      -};
      206 +}}}};
 207  207  
 208  208  static crypto_kcf_provider_handle_t aes_prov_handle = NULL;
 209  209  static crypto_data_t null_crypto_data = { CRYPTO_DATA_RAW };
 210  210  
 211  211  int
 212  212  _init(void)
 213  213  {
 214  214          int ret;
 215  215  
 216  216          if ((ret = mod_install(&modlinkage)) != 0)
↓ open down ↓ 1256 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX