Print this page
5218 posix definition of NULL
correct unistd.h and iso/stddef_iso.h
update gate source affected

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/gssapi/mechs/krb5/crypto/etypes.c
          +++ new/usr/src/uts/common/gssapi/mechs/krb5/crypto/etypes.c
↓ open down ↓ 93 lines elided ↑ open up ↑
  94   94  #else
  95   95        SUN_CKM_DES_CBC,
  96   96        SUN_CKM_MD5,
  97   97        CRYPTO_MECH_INVALID,
  98   98        CRYPTO_MECH_INVALID
  99   99  #endif /* _KERNEL */
 100  100   },
 101  101      { ENCTYPE_DES_CBC_RAW,
 102  102        "des-cbc-raw", "DES cbc mode raw",
 103  103        &krb5int_enc_des, NULL,
 104      -      krb5_raw_encrypt_length, krb5_raw_encrypt, krb5_raw_decrypt,
 105      -      NULL,
      104 +      krb5_raw_encrypt_length, krb5_raw_encrypt, krb5_raw_decrypt, 0,
 106  105  #ifndef _KERNEL
 107  106        krb5int_des_string_to_key,
 108  107  #else
 109  108        SUN_CKM_DES_CBC,
 110  109        NULL,
 111  110        CRYPTO_MECH_INVALID,
 112  111        CRYPTO_MECH_INVALID
 113  112  #endif /* !_KERNEL */
 114  113  },
 115  114  
 116  115      { ENCTYPE_DES3_CBC_RAW,
 117  116        "des3-cbc-raw", "Triple DES cbc mode raw",
 118  117        &krb5int_enc_des3, NULL,
 119      -      krb5_raw_encrypt_length, krb5_raw_encrypt, krb5_raw_decrypt,
 120      -      NULL,
      118 +      krb5_raw_encrypt_length, krb5_raw_encrypt, krb5_raw_decrypt, 0,
 121  119  #ifndef _KERNEL
 122  120        krb5int_dk_string_to_key,
 123  121  #else
 124  122        SUN_CKM_DES3_CBC,
 125  123        NULL,
 126  124        CRYPTO_MECH_INVALID,
 127  125        CRYPTO_MECH_INVALID
 128  126  #endif /* !_KERNEL */
 129  127  },
 130  128  
↓ open down ↓ 53 lines elided ↑ open up ↑
 184  182        SUN_CKM_DES3_CBC,
 185  183        SUN_CKM_SHA1_HMAC,
 186  184        CRYPTO_MECH_INVALID,
 187  185        CRYPTO_MECH_INVALID
 188  186  #endif /* !_KERNEL */
 189  187  },
 190  188  
 191  189      { ENCTYPE_DES_HMAC_SHA1,
 192  190        "des-hmac-sha1", "DES with HMAC/sha1",
 193  191        &krb5int_enc_des, &krb5int_hash_sha1,
 194      -      krb5_dk_encrypt_length, krb5_dk_encrypt, krb5_dk_decrypt,
 195      -      NULL,
      192 +      krb5_dk_encrypt_length, krb5_dk_encrypt, krb5_dk_decrypt, 0,
 196  193  #ifndef _KERNEL
 197  194        krb5int_dk_string_to_key,
 198  195  #else
 199  196        SUN_CKM_DES_CBC,
 200  197        SUN_CKM_SHA1_HMAC,
 201  198        CRYPTO_MECH_INVALID,
 202  199        CRYPTO_MECH_INVALID
 203  200  #endif /* !_KERNEL */
 204  201  },
 205  202      { ENCTYPE_ARCFOUR_HMAC,
↓ open down ↓ 235 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX