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/sha1_mod.c
          +++ new/usr/src/uts/common/crypto/io/sha1_mod.c
↓ open down ↓ 48 lines elided ↑ open up ↑
  49   49          &mod_miscops,
  50   50          "SHA1 Message-Digest Algorithm"
  51   51  };
  52   52  
  53   53  static struct modlcrypto modlcrypto = {
  54   54          &mod_cryptoops,
  55   55          "SHA1 Kernel SW Provider 1.1"
  56   56  };
  57   57  
  58   58  static struct modlinkage modlinkage = {
  59      -        MODREV_1, &modlmisc, &modlcrypto, NULL
       59 +        MODREV_1, { &modlmisc, &modlcrypto, NULL }
  60   60  };
  61   61  
  62   62  
  63   63  /*
  64   64   * Macros to access the SHA1 or SHA1-HMAC contexts from a context passed
  65   65   * by KCF to one of the entry points.
  66   66   */
  67   67  
  68   68  #define PROV_SHA1_CTX(ctx)      ((sha1_ctx_t *)(ctx)->cc_provider_private)
  69   69  #define PROV_SHA1_HMAC_CTX(ctx) ((sha1_hmac_ctx_t *)(ctx)->cc_provider_private)
↓ open down ↓ 87 lines elided ↑ open up ↑
 157  157      crypto_mechanism_t *, crypto_key_t *, crypto_spi_ctx_template_t *,
 158  158      size_t *, crypto_req_handle_t);
 159  159  static int sha1_free_context(crypto_ctx_t *);
 160  160  
 161  161  static crypto_ctx_ops_t sha1_ctx_ops = {
 162  162          sha1_create_ctx_template,
 163  163          sha1_free_context
 164  164  };
 165  165  
 166  166  static crypto_ops_t sha1_crypto_ops = {
 167      -        &sha1_control_ops,
 168      -        &sha1_digest_ops,
 169      -        NULL,
 170      -        &sha1_mac_ops,
 171      -        NULL,
 172      -        NULL,
 173      -        NULL,
 174      -        NULL,
 175      -        NULL,
 176      -        NULL,
 177      -        NULL,
 178      -        NULL,
 179      -        NULL,
 180      -        &sha1_ctx_ops,
 181      -        NULL,
 182      -        NULL,
 183      -        NULL,
      167 +        .co_control_ops = &sha1_control_ops,
      168 +        .co_digest_ops = &sha1_digest_ops,
      169 +        .co_mac_ops = &sha1_mac_ops,
      170 +        .co_ctx_ops = &sha1_ctx_ops
 184  171  };
 185  172  
 186      -static crypto_provider_info_t sha1_prov_info = {
      173 +static crypto_provider_info_t sha1_prov_info = {{{{
 187  174          CRYPTO_SPI_VERSION_4,
 188  175          "SHA1 Software Provider",
 189  176          CRYPTO_SW_PROVIDER,
 190  177          {&modlinkage},
 191  178          NULL,
 192  179          &sha1_crypto_ops,
 193  180          sizeof (sha1_mech_info_tab)/sizeof (crypto_mech_info_t),
 194  181          sha1_mech_info_tab
 195      -};
      182 +}}}};
 196  183  
 197  184  static crypto_kcf_provider_handle_t sha1_prov_handle = NULL;
 198  185  
 199  186  int
 200  187  _init()
 201  188  {
 202  189          int ret;
 203  190  
 204  191          if ((ret = mod_install(&modlinkage)) != 0)
 205  192                  return (ret);
↓ open down ↓ 1238 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX