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/md5_mod.c
          +++ new/usr/src/uts/common/crypto/io/md5_mod.c
↓ open down ↓ 56 lines elided ↑ open up ↑
  57   57          "MD5 Message-Digest Algorithm"
  58   58  };
  59   59  
  60   60  static struct modlcrypto modlcrypto = {
  61   61          &mod_cryptoops,
  62   62          "MD5 Kernel SW Provider"
  63   63  };
  64   64  
  65   65  static struct modlinkage modlinkage = {
  66   66          MODREV_1,
  67      -        (void *)&modlmisc,
  68      -        (void *)&modlcrypto,
  69      -        NULL
       67 +        {   (void *)&modlmisc,
       68 +            (void *)&modlcrypto,
       69 +            NULL }
  70   70  };
  71   71  
  72   72  /*
  73   73   * CSPI information (entry points, provider info, etc.)
  74   74   */
  75   75  
  76   76  typedef enum md5_mech_type {
  77   77          MD5_MECH_INFO_TYPE,             /* SUN_CKM_MD5 */
  78   78          MD5_HMAC_MECH_INFO_TYPE,        /* SUN_CKM_MD5_HMAC */
  79   79          MD5_HMAC_GEN_MECH_INFO_TYPE     /* SUN_CKM_MD5_HMAC_GENERAL */
↓ open down ↓ 119 lines elided ↑ open up ↑
 199  199      crypto_mechanism_t *, crypto_key_t *, crypto_spi_ctx_template_t *,
 200  200      size_t *, crypto_req_handle_t);
 201  201  static int md5_free_context(crypto_ctx_t *);
 202  202  
 203  203  static crypto_ctx_ops_t md5_ctx_ops = {
 204  204          md5_create_ctx_template,
 205  205          md5_free_context
 206  206  };
 207  207  
 208  208  static crypto_ops_t md5_crypto_ops = {
 209      -        &md5_control_ops,
 210      -        &md5_digest_ops,
 211      -        NULL,
 212      -        &md5_mac_ops,
 213      -        NULL,
 214      -        NULL,
 215      -        NULL,
 216      -        NULL,
 217      -        NULL,
 218      -        NULL,
 219      -        NULL,
 220      -        NULL,
 221      -        NULL,
 222      -        &md5_ctx_ops
      209 +        .co_control_ops = &md5_control_ops,
      210 +        .co_digest_ops = &md5_digest_ops,
      211 +        .co_cipher_ops = NULL,
      212 +        .co_mac_ops = &md5_mac_ops,
      213 +        .co_sign_ops = NULL,
      214 +        .co_verify_ops = NULL,
      215 +        .co_dual_ops = NULL,
      216 +        .co_dual_cipher_mac_ops = NULL,
      217 +        .co_random_ops = NULL,
      218 +        .co_session_ops = NULL,
      219 +        .co_object_ops = NULL,
      220 +        .co_key_ops = NULL,
      221 +        .co_provider_ops = NULL,
      222 +        .co_ctx_ops = &md5_ctx_ops
 223  223  };
 224  224  
 225      -static crypto_provider_info_t md5_prov_info = {
      225 +static crypto_provider_info_t md5_prov_info = {{{{
 226  226          CRYPTO_SPI_VERSION_1,
 227  227          "MD5 Software Provider",
 228  228          CRYPTO_SW_PROVIDER,
 229  229          {&modlinkage},
 230  230          NULL,
 231  231          &md5_crypto_ops,
 232  232          sizeof (md5_mech_info_tab)/sizeof (crypto_mech_info_t),
 233  233          md5_mech_info_tab
 234      -};
      234 +}}}};
 235  235  
 236  236  static crypto_kcf_provider_handle_t md5_prov_handle = NULL;
 237  237  
 238  238  int
 239  239  _init(void)
 240  240  {
 241  241          int ret;
 242  242  
 243  243          if ((ret = mod_install(&modlinkage)) != 0)
 244  244                  return (ret);
↓ open down ↓ 1256 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX