Print this page
7127  remove -Wno-missing-braces from Makefile.uts

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/crypto/core/kcf_cryptoadm.c
          +++ new/usr/src/uts/common/crypto/core/kcf_cryptoadm.c
↓ open down ↓ 149 lines elided ↑ open up ↑
 150  150              "CKM_SHA512", "CKM_SHA512_HMAC", "CKM_SHA512_HMAC_GENERAL", ""};
 151  151          static crypto_mech_name_t       md4_mechs[] = {
 152  152              "CKM_MD4", ""};
 153  153          static crypto_mech_name_t       md5_mechs[] = {
 154  154              "CKM_MD5", "CKM_MD5_HMAC_GENERAL", "CKM_MD5_HMAC", ""};
 155  155          static crypto_mech_name_t       rsa_mechs[] = {
 156  156              "CKM_RSA_PKCS", "CKM_RSA_X_509", "CKM_MD5_RSA_PKCS",
 157  157              "CKM_SHA1_RSA_PKCS", "CKM_SHA256_RSA_PKCS", "CKM_SHA384_RSA_PKCS",
 158  158              "CKM_SHA512_RSA_PKCS", ""};
 159  159          static crypto_mech_name_t       swrand_mechs[] = {
 160      -            "random", NULL};
      160 +            "random", ""};
 161  161          static initial_soft_config_entry_t
 162  162              initial_soft_config_entry[] = {
 163      -                "des", des_mechs,
 164      -                "aes", aes_mechs,
 165      -                "arcfour", arcfour_mechs,
 166      -                "blowfish", blowfish_mechs,
 167      -                "ecc", ecc_mechs,
 168      -                "sha1", sha1_mechs,
 169      -                "sha2", sha2_mechs,
 170      -                "md4", md4_mechs,
 171      -                "md5", md5_mechs,
 172      -                "rsa", rsa_mechs,
 173      -                "swrand", swrand_mechs
      163 +                { "des", des_mechs },
      164 +                { "aes", aes_mechs },
      165 +                { "arcfour", arcfour_mechs },
      166 +                { "blowfish", blowfish_mechs },
      167 +                { "ecc", ecc_mechs },
      168 +                { "sha1", sha1_mechs },
      169 +                { "sha2", sha2_mechs },
      170 +                { "md4", md4_mechs },
      171 +                { "md5", md5_mechs },
      172 +                { "rsa", rsa_mechs },
      173 +                { "swrand", swrand_mechs }
 174  174          };
 175  175          const int       initial_soft_config_entries =
 176  176              sizeof (initial_soft_config_entry)
 177  177              / sizeof (initial_soft_config_entry_t);
 178  178          int             i;
 179  179  
 180  180          mutex_init(&soft_config_mutex, NULL, MUTEX_DRIVER, NULL);
 181  181  
 182  182          /*
 183  183           * Initialize soft_config_list with default providers.
↓ open down ↓ 1024 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX