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/skein_mod.c
          +++ new/usr/src/uts/common/crypto/io/skein_mod.c
↓ open down ↓ 40 lines elided ↑ open up ↑
  41   41          &mod_miscops,
  42   42          "Skein Message-Digest Algorithm"
  43   43  };
  44   44  
  45   45  static struct modlcrypto modlcrypto = {
  46   46          &mod_cryptoops,
  47   47          "Skein Kernel SW Provider"
  48   48  };
  49   49  
  50   50  static struct modlinkage modlinkage = {
  51      -        MODREV_1, &modlmisc, &modlcrypto, NULL
       51 +        MODREV_1, { &modlmisc, &modlcrypto, NULL }
  52   52  };
  53   53  
  54   54  static crypto_mech_info_t skein_mech_info_tab[] = {
  55   55          {CKM_SKEIN_256, SKEIN_256_MECH_INFO_TYPE,
  56   56              CRYPTO_FG_DIGEST | CRYPTO_FG_DIGEST_ATOMIC,
  57   57              0, 0, CRYPTO_KEYSIZE_UNIT_IN_BITS},
  58   58          {CKM_SKEIN_256_MAC, SKEIN_256_MAC_MECH_INFO_TYPE,
  59   59              CRYPTO_FG_MAC | CRYPTO_FG_MAC_ATOMIC, 1, INT_MAX,
  60   60              CRYPTO_KEYSIZE_UNIT_IN_BYTES},
  61   61          {CKM_SKEIN_512, SKEIN_512_MECH_INFO_TYPE,
↓ open down ↓ 53 lines elided ↑ open up ↑
 115  115  static int skein_create_ctx_template(crypto_provider_handle_t,
 116  116      crypto_mechanism_t *, crypto_key_t *, crypto_spi_ctx_template_t *,
 117  117      size_t *, crypto_req_handle_t);
 118  118  static int skein_free_context(crypto_ctx_t *);
 119  119  
 120  120  static crypto_ctx_ops_t skein_ctx_ops = {
 121  121          skein_create_ctx_template,
 122  122          skein_free_context
 123  123  };
 124  124  
 125      -static crypto_ops_t skein_crypto_ops = {
 126      -        &skein_control_ops,
 127      -        &skein_digest_ops,
 128      -        NULL,
 129      -        &skein_mac_ops,
 130      -        NULL,
 131      -        NULL,
 132      -        NULL,
 133      -        NULL,
 134      -        NULL,
 135      -        NULL,
 136      -        NULL,
 137      -        NULL,
 138      -        NULL,
 139      -        &skein_ctx_ops,
 140      -        NULL,
 141      -        NULL,
 142      -        NULL
 143      -};
      125 +static crypto_ops_t skein_crypto_ops = {{{{{{
      126 +                                &skein_control_ops,
      127 +                                &skein_digest_ops,
      128 +                                NULL,
      129 +                                &skein_mac_ops,
      130 +                                NULL,
      131 +                                NULL,
      132 +                                NULL,
      133 +                                NULL,
      134 +                                NULL,
      135 +                                NULL,
      136 +                                NULL,
      137 +                                NULL,
      138 +                                NULL,
      139 +                                &skein_ctx_ops },       /* cou_v1 */
      140 +                        NULL },                         /* cou_v2 */
      141 +                NULL },                                 /* cou_v3 */
      142 +        NULL }                                          /* cou_v4 */
      143 +}};
 144  144  
 145      -static crypto_provider_info_t skein_prov_info = {
      145 +static crypto_provider_info_t skein_prov_info = {{{{
 146  146          CRYPTO_SPI_VERSION_4,
 147  147          "Skein Software Provider",
 148  148          CRYPTO_SW_PROVIDER,
 149  149          {&modlinkage},
 150  150          NULL,
 151  151          &skein_crypto_ops,
 152  152          sizeof (skein_mech_info_tab) / sizeof (crypto_mech_info_t),
 153  153          skein_mech_info_tab
 154      -};
      154 +}}}};
 155  155  
 156  156  static crypto_kcf_provider_handle_t skein_prov_handle = 0;
 157  157  
 158  158  typedef struct skein_ctx {
 159  159          skein_mech_type_t               sc_mech_type;
 160  160          size_t                          sc_digest_bitlen;
 161  161          union {
 162  162                  Skein_256_Ctxt_t        sc_256;
 163  163                  Skein_512_Ctxt_t        sc_512;
 164  164                  Skein1024_Ctxt_t        sc_1024;
↓ open down ↓ 668 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX