summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--usr/src/uts/common/gssapi/mechs/krb5/crypto/cksumtypes.c26
-rw-r--r--usr/src/uts/common/gssapi/mechs/krb5/crypto/etypes.c26
2 files changed, 26 insertions, 26 deletions
diff --git a/usr/src/uts/common/gssapi/mechs/krb5/crypto/cksumtypes.c b/usr/src/uts/common/gssapi/mechs/krb5/crypto/cksumtypes.c
index 43c42bd629..9ebf2464e2 100644
--- a/usr/src/uts/common/gssapi/mechs/krb5/crypto/cksumtypes.c
+++ b/usr/src/uts/common/gssapi/mechs/krb5/crypto/cksumtypes.c
@@ -6,14 +6,14 @@
/*
* Copyright (C) 1998 by the FundsXpress, INC.
- *
+ *
* All rights reserved.
- *
+ *
* Export of this software from the United States of America may require
* a specific license from the United States Government. It is the
* responsibility of any person or organization contemplating export to
* obtain such a license before exporting.
- *
+ *
* WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
* distribute this software and its documentation for any purpose and
* without fee is hereby granted, provided that the above copyright
@@ -24,7 +24,7 @@
* permission. FundsXpress makes no representations about the suitability of
* this software for any purpose. It is provided "as is" without express
* or implied warranty.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
@@ -38,7 +38,7 @@
const struct krb5_cksumtypes krb5_cksumtypes_list[] = {
{ CKSUMTYPE_CRC32, KRB5_CKSUMFLAG_NOT_COLL_PROOF,
"crc32", "CRC-32",
- NULL, NULL, &krb5int_hash_crc32, 0,
+ 0, NULL, &krb5int_hash_crc32, 0,
#ifdef _KERNEL
NULL,
CRYPTO_MECH_INVALID
@@ -48,7 +48,7 @@ const struct krb5_cksumtypes krb5_cksumtypes_list[] = {
{ CKSUMTYPE_DESCBC, 0,
"des-cbc", "DES cbc mode",
ENCTYPE_DES_CBC_CRC, &krb5int_keyhash_descbc,
- NULL, NULL,
+ 0, 0,
#ifdef _KERNEL
NULL,
CRYPTO_MECH_INVALID
@@ -57,7 +57,7 @@ const struct krb5_cksumtypes krb5_cksumtypes_list[] = {
{ CKSUMTYPE_RSA_MD5, 0,
"md5", "RSA-MD5",
- NULL, NULL, &krb5int_hash_md5, 0,
+ 0, NULL, &krb5int_hash_md5, 0,
#ifdef _KERNEL
SUN_CKM_MD5,
CRYPTO_MECH_INVALID
@@ -66,7 +66,7 @@ const struct krb5_cksumtypes krb5_cksumtypes_list[] = {
{ CKSUMTYPE_RSA_MD5_DES, 0,
"md5-des", "RSA-MD5 with DES cbc mode",
ENCTYPE_DES_CBC_CRC, &krb5int_keyhash_md5des,
- NULL, NULL,
+ 0, 0,
#ifdef _KERNEL
SUN_CKM_MD5,
CRYPTO_MECH_INVALID
@@ -75,7 +75,7 @@ const struct krb5_cksumtypes krb5_cksumtypes_list[] = {
{ CKSUMTYPE_NIST_SHA, 0,
"sha", "NIST-SHA",
- NULL, NULL, &krb5int_hash_sha1, 0,
+ 0, NULL, &krb5int_hash_sha1, 0,
#ifdef _KERNEL
SUN_CKM_SHA1,
CRYPTO_MECH_INVALID
@@ -84,7 +84,7 @@ const struct krb5_cksumtypes krb5_cksumtypes_list[] = {
{ CKSUMTYPE_HMAC_SHA1_DES3, KRB5_CKSUMFLAG_DERIVE,
"hmac-sha1-des3", "HMAC-SHA1 DES3 key",
- NULL, NULL, &krb5int_hash_sha1, 0,
+ 0, NULL, &krb5int_hash_sha1, 0,
#ifdef _KERNEL
SUN_CKM_SHA1_HMAC,
CRYPTO_MECH_INVALID
@@ -92,14 +92,14 @@ const struct krb5_cksumtypes krb5_cksumtypes_list[] = {
},
{ CKSUMTYPE_HMAC_SHA1_DES3, KRB5_CKSUMFLAG_DERIVE,
"hmac-sha1-des3-kd", "HMAC-SHA1 DES3 key", /* alias */
- NULL, NULL, &krb5int_hash_sha1, 0,
+ 0, NULL, &krb5int_hash_sha1, 0,
#ifdef _KERNEL
SUN_CKM_SHA1_HMAC,
CRYPTO_MECH_INVALID
#endif /* _KERNEL */
},
{ CKSUMTYPE_HMAC_MD5_ARCFOUR, 0,
- "hmac-md5-rc4", "Microsoft HMAC MD5 (RC4 key)",
+ "hmac-md5-rc4", "Microsoft HMAC MD5 (RC4 key)",
ENCTYPE_ARCFOUR_HMAC, &krb5int_keyhash_hmac_md5,
NULL, 0,
#ifdef _KERNEL
@@ -128,7 +128,7 @@ const struct krb5_cksumtypes krb5_cksumtypes_list[] = {
{ CKSUMTYPE_HMAC_SHA1_96_AES128, KRB5_CKSUMFLAG_DERIVE,
"hmac-sha1-96-aes128", "HMAC-SHA1 AES128 key",
- NULL, NULL, &krb5int_hash_sha1, 12,
+ 0, NULL, &krb5int_hash_sha1, 12,
#ifdef _KERNEL
SUN_CKM_SHA1_HMAC,
CRYPTO_MECH_INVALID
diff --git a/usr/src/uts/common/gssapi/mechs/krb5/crypto/etypes.c b/usr/src/uts/common/gssapi/mechs/krb5/crypto/etypes.c
index 7566a0e036..130a8ba8c1 100644
--- a/usr/src/uts/common/gssapi/mechs/krb5/crypto/etypes.c
+++ b/usr/src/uts/common/gssapi/mechs/krb5/crypto/etypes.c
@@ -6,14 +6,14 @@
/*
* Copyright (C) 1998 by the FundsXpress, INC.
- *
+ *
* All rights reserved.
- *
+ *
* Export of this software from the United States of America may require
* a specific license from the United States Government. It is the
* responsibility of any person or organization contemplating export to
* obtain such a license before exporting.
- *
+ *
* WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
* distribute this software and its documentation for any purpose and
* without fee is hereby granted, provided that the above copyright
@@ -24,7 +24,7 @@
* permission. FundsXpress makes no representations about the suitability of
* this software for any purpose. It is provided "as is" without express
* or implied warranty.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
@@ -37,7 +37,7 @@
#define krb5int_des_string_to_key NULL
#define krb5_dk_string_to_key NULL
#define krb5int_arcfour_string_to_key NULL
-#endif /* _KERNEL */
+#endif /* _KERNEL */
#include <k5-int.h>
#include <enc_provider.h>
@@ -102,7 +102,7 @@ struct krb5_keytypes krb5_enctypes_list[] = {
"des-cbc-raw", "DES cbc mode raw",
&krb5int_enc_des, NULL,
krb5_raw_encrypt_length, krb5_raw_encrypt, krb5_raw_decrypt,
- NULL,
+ 0,
#ifndef _KERNEL
krb5int_des_string_to_key,
#else
@@ -117,7 +117,7 @@ struct krb5_keytypes krb5_enctypes_list[] = {
"des3-cbc-raw", "Triple DES cbc mode raw",
&krb5int_enc_des3, NULL,
krb5_raw_encrypt_length, krb5_raw_encrypt, krb5_raw_decrypt,
- NULL,
+ 0,
#ifndef _KERNEL
krb5int_dk_string_to_key,
#else
@@ -192,7 +192,7 @@ struct krb5_keytypes krb5_enctypes_list[] = {
"des-hmac-sha1", "DES with HMAC/sha1",
&krb5int_enc_des, &krb5int_hash_sha1,
krb5_dk_encrypt_length, krb5_dk_encrypt, krb5_dk_decrypt,
- NULL,
+ 0,
#ifndef _KERNEL
krb5int_dk_string_to_key,
#else
@@ -221,7 +221,7 @@ krb5_arcfour_encrypt_length, krb5_arcfour_encrypt,
"rc4-hmac", "ArcFour with HMAC/md5", &krb5int_enc_arcfour,
&krb5int_hash_md5,
krb5_arcfour_encrypt_length, krb5_arcfour_encrypt,
- krb5_arcfour_decrypt,
+ krb5_arcfour_decrypt,
CKSUMTYPE_HMAC_MD5_ARCFOUR,
#ifndef _KERNEL
krb5int_arcfour_string_to_key,
@@ -395,7 +395,7 @@ setup_kef_keytypes()
crypto_mech_type_t
get_cipher_mech_type(krb5_context context, krb5_keyblock *key)
{
- int i;
+ int i;
struct krb5_keytypes *kt;
if (key == NULL)
@@ -411,14 +411,14 @@ get_cipher_mech_type(krb5_context context, krb5_keyblock *key)
return (kt->kef_cipher_mt);
}
}
- return (CRYPTO_MECH_INVALID);
+ return (CRYPTO_MECH_INVALID);
}
/*ARGSUSED*/
crypto_mech_type_t
get_hash_mech_type(krb5_context context, krb5_keyblock *key)
{
- int i;
+ int i;
struct krb5_keytypes *kt;
if (key == NULL)
@@ -434,7 +434,7 @@ get_hash_mech_type(krb5_context context, krb5_keyblock *key)
return (kt->kef_hash_mt);
}
}
- return (CRYPTO_MECH_INVALID);
+ return (CRYPTO_MECH_INVALID);
}
#endif /* _KERNEL */
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-11 22:59:11 +0000