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/des/des_crypt.c
          +++ new/usr/src/uts/common/des/des_crypt.c
↓ open down ↓ 81 lines elided ↑ open up ↑
  82   82          "des encryption",
  83   83  };
  84   84  
  85   85  static struct modlcrypto modlcrypto = {
  86   86          &mod_cryptoops,
  87   87          "DES Kernel SW Provider"
  88   88  };
  89   89  
  90   90  static struct modlinkage modlinkage = {
  91   91          MODREV_1,
  92      -        &modlmisc,
  93      -        &modlcrypto,
  94      -        NULL
       92 +        {   &modlmisc,
       93 +            &modlcrypto,
       94 +            NULL
       95 +        }
  95   96  };
  96   97  
  97   98  #define DES_MIN_KEY_LEN         DES_MINBYTES
  98   99  #define DES_MAX_KEY_LEN         DES_MAXBYTES
  99  100  #define DES3_MIN_KEY_LEN        DES3_MAXBYTES   /* no CKK_DES2 support */
 100  101  #define DES3_MAX_KEY_LEN        DES3_MAXBYTES
 101  102  
 102  103  #ifndef DES_MIN_KEY_LEN
 103  104  #define DES_MIN_KEY_LEN         0
 104  105  #endif
↓ open down ↓ 103 lines elided ↑ open up ↑
 208  209  static crypto_key_ops_t des_key_ops = {
 209  210          NULL,
 210  211          NULL,
 211  212          NULL,
 212  213          NULL,
 213  214          NULL,
 214  215          des_key_check
 215  216  };
 216  217  
 217  218  static crypto_ops_t des_crypto_ops = {
 218      -        &des_control_ops,
 219      -        NULL,
 220      -        &des_cipher_ops,
 221      -        NULL,
 222      -        NULL,
 223      -        NULL,
 224      -        NULL,
 225      -        NULL,
 226      -        NULL,
 227      -        NULL,
 228      -        NULL,
 229      -        &des_key_ops,
 230      -        NULL,
 231      -        &des_ctx_ops,
 232      -        NULL,
 233      -        NULL,
 234      -        NULL
      219 +        .co_control_ops = &des_control_ops,
      220 +        .co_cipher_ops = &des_cipher_ops,
      221 +        .co_key_ops = &des_key_ops,
      222 +        .co_ctx_ops = &des_ctx_ops
 235  223  };
 236  224  
 237      -static crypto_provider_info_t des_prov_info = {
      225 +static crypto_provider_info_t des_prov_info = {{{{
 238  226          CRYPTO_SPI_VERSION_4,
 239  227          "DES Software Provider",
 240  228          CRYPTO_SW_PROVIDER,
 241  229          {&modlinkage},
 242  230          NULL,
 243  231          &des_crypto_ops,
 244  232          sizeof (des_mech_info_tab)/sizeof (crypto_mech_info_t),
 245  233          des_mech_info_tab
 246      -};
      234 +}}}};
 247  235  
 248  236  static crypto_kcf_provider_handle_t des_prov_handle = NULL;
 249  237  
 250  238  int
 251  239  _init(void)
 252  240  {
 253  241          int ret;
 254  242  
 255  243          if ((ret = mod_install(&modlinkage)) != 0)
 256  244                  return (ret);
↓ open down ↓ 904 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX