Print this page
5218 posix definition of NULL
correct unistd.h and iso/stddef_iso.h
update gate source affected
*** 36,100 ****
#include "cksumtypes.h"
const struct krb5_cksumtypes krb5_cksumtypes_list[] = {
{ CKSUMTYPE_CRC32, KRB5_CKSUMFLAG_NOT_COLL_PROOF,
"crc32", "CRC-32",
! NULL, NULL, &krb5int_hash_crc32, 0,
#ifdef _KERNEL
NULL,
CRYPTO_MECH_INVALID
#endif /* _KERNEL */
},
{ CKSUMTYPE_DESCBC, 0,
"des-cbc", "DES cbc mode",
ENCTYPE_DES_CBC_CRC, &krb5int_keyhash_descbc,
! NULL, NULL,
#ifdef _KERNEL
NULL,
CRYPTO_MECH_INVALID
#endif /* _KERNEL */
},
{ CKSUMTYPE_RSA_MD5, 0,
"md5", "RSA-MD5",
! NULL, NULL, &krb5int_hash_md5, 0,
#ifdef _KERNEL
SUN_CKM_MD5,
CRYPTO_MECH_INVALID
#endif /* _KERNEL */
},
{ CKSUMTYPE_RSA_MD5_DES, 0,
"md5-des", "RSA-MD5 with DES cbc mode",
ENCTYPE_DES_CBC_CRC, &krb5int_keyhash_md5des,
! NULL, NULL,
#ifdef _KERNEL
SUN_CKM_MD5,
CRYPTO_MECH_INVALID
#endif /* _KERNEL */
},
{ CKSUMTYPE_NIST_SHA, 0,
"sha", "NIST-SHA",
! NULL, NULL, &krb5int_hash_sha1, 0,
#ifdef _KERNEL
SUN_CKM_SHA1,
CRYPTO_MECH_INVALID
#endif /* _KERNEL */
},
{ CKSUMTYPE_HMAC_SHA1_DES3, KRB5_CKSUMFLAG_DERIVE,
"hmac-sha1-des3", "HMAC-SHA1 DES3 key",
! NULL, NULL, &krb5int_hash_sha1, 0,
#ifdef _KERNEL
SUN_CKM_SHA1_HMAC,
CRYPTO_MECH_INVALID
#endif /* _KERNEL */
},
{ CKSUMTYPE_HMAC_SHA1_DES3, KRB5_CKSUMFLAG_DERIVE,
"hmac-sha1-des3-kd", "HMAC-SHA1 DES3 key", /* alias */
! NULL, NULL, &krb5int_hash_sha1, 0,
#ifdef _KERNEL
SUN_CKM_SHA1_HMAC,
CRYPTO_MECH_INVALID
#endif /* _KERNEL */
},
--- 36,100 ----
#include "cksumtypes.h"
const struct krb5_cksumtypes krb5_cksumtypes_list[] = {
{ CKSUMTYPE_CRC32, KRB5_CKSUMFLAG_NOT_COLL_PROOF,
"crc32", "CRC-32",
! 0, NULL, &krb5int_hash_crc32, 0,
#ifdef _KERNEL
NULL,
CRYPTO_MECH_INVALID
#endif /* _KERNEL */
},
{ CKSUMTYPE_DESCBC, 0,
"des-cbc", "DES cbc mode",
ENCTYPE_DES_CBC_CRC, &krb5int_keyhash_descbc,
! NULL, 0,
#ifdef _KERNEL
NULL,
CRYPTO_MECH_INVALID
#endif /* _KERNEL */
},
{ CKSUMTYPE_RSA_MD5, 0,
"md5", "RSA-MD5",
! 0, NULL, &krb5int_hash_md5, 0,
#ifdef _KERNEL
SUN_CKM_MD5,
CRYPTO_MECH_INVALID
#endif /* _KERNEL */
},
{ CKSUMTYPE_RSA_MD5_DES, 0,
"md5-des", "RSA-MD5 with DES cbc mode",
ENCTYPE_DES_CBC_CRC, &krb5int_keyhash_md5des,
! NULL, 0,
#ifdef _KERNEL
SUN_CKM_MD5,
CRYPTO_MECH_INVALID
#endif /* _KERNEL */
},
{ CKSUMTYPE_NIST_SHA, 0,
"sha", "NIST-SHA",
! 0, NULL, &krb5int_hash_sha1, 0,
#ifdef _KERNEL
SUN_CKM_SHA1,
CRYPTO_MECH_INVALID
#endif /* _KERNEL */
},
{ CKSUMTYPE_HMAC_SHA1_DES3, KRB5_CKSUMFLAG_DERIVE,
"hmac-sha1-des3", "HMAC-SHA1 DES3 key",
! 0, NULL, &krb5int_hash_sha1, 0,
#ifdef _KERNEL
SUN_CKM_SHA1_HMAC,
CRYPTO_MECH_INVALID
#endif /* _KERNEL */
},
{ CKSUMTYPE_HMAC_SHA1_DES3, KRB5_CKSUMFLAG_DERIVE,
"hmac-sha1-des3-kd", "HMAC-SHA1 DES3 key", /* alias */
! 0, NULL, &krb5int_hash_sha1, 0,
#ifdef _KERNEL
SUN_CKM_SHA1_HMAC,
CRYPTO_MECH_INVALID
#endif /* _KERNEL */
},
*** 126,136 ****
#endif /* _KERNEL */
},
{ CKSUMTYPE_HMAC_SHA1_96_AES128, KRB5_CKSUMFLAG_DERIVE,
"hmac-sha1-96-aes128", "HMAC-SHA1 AES128 key",
! NULL, NULL, &krb5int_hash_sha1, 12,
#ifdef _KERNEL
SUN_CKM_SHA1_HMAC,
CRYPTO_MECH_INVALID
#endif /* _KERNEL */
},
--- 126,136 ----
#endif /* _KERNEL */
},
{ CKSUMTYPE_HMAC_SHA1_96_AES128, KRB5_CKSUMFLAG_DERIVE,
"hmac-sha1-96-aes128", "HMAC-SHA1 AES128 key",
! 0, NULL, &krb5int_hash_sha1, 12,
#ifdef _KERNEL
SUN_CKM_SHA1_HMAC,
CRYPTO_MECH_INVALID
#endif /* _KERNEL */
},