oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Don't declare des_salt &c as static with incomplete type (invalid in

Browse Source 
c89, at least).


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@15053 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2005-05-02 14:11:59 +00:00
parent 6985bebfc1
commit 9b38bf74d1
1 changed files with 53 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

105
lib/krb5/crypto.c
View File

@@ -864,8 +864,59 @@ rc2_schedule(krb5_context context,
* *
*/ */
static struct salt_type des_salt[], static struct salt_type des_salt[] = {
des3_salt[], des3_salt_derived[], arcfour_salt[], AES_salt[]; {
KRB5_PW_SALT,
"pw-salt",
krb5_DES_string_to_key
},
{
KRB5_AFS3_SALT,
"afs3-salt",
DES_AFS3_string_to_key
},
{ 0 }
};
static struct salt_type des3_salt[] = {
{
KRB5_PW_SALT,
"pw-salt",
DES3_string_to_key
},
{ 0 }
};
static struct salt_type des3_salt_derived[] = {
{
KRB5_PW_SALT,
"pw-salt",
DES3_string_to_key_derived
},
{ 0 }
};
static struct salt_type AES_salt[] = {
{
KRB5_PW_SALT,
"pw-salt",
AES_string_to_key
},
{ 0 }
};
static struct salt_type arcfour_salt[] = {
{
KRB5_PW_SALT,
"pw-salt",
ARCFOUR_string_to_key
},
{ 0 }
};
/*
*
*/
static struct key_type keytype_null = { static struct key_type keytype_null = {
KEYTYPE_NULL, KEYTYPE_NULL,
@@ -1006,56 +1057,6 @@ _find_keytype(krb5_keytype type)
} }
static struct salt_type des_salt[] = {
{
KRB5_PW_SALT,
"pw-salt",
krb5_DES_string_to_key
},
{
KRB5_AFS3_SALT,
"afs3-salt",
DES_AFS3_string_to_key
},
{ 0 }
};
static struct salt_type des3_salt[] = {
{
KRB5_PW_SALT,
"pw-salt",
DES3_string_to_key
},
{ 0 }
};
static struct salt_type des3_salt_derived[] = {
{
KRB5_PW_SALT,
"pw-salt",
DES3_string_to_key_derived
},
{ 0 }
};
static struct salt_type AES_salt[] = {
{
KRB5_PW_SALT,
"pw-salt",
AES_string_to_key
},
{ 0 }
};
static struct salt_type arcfour_salt[] = {
{
KRB5_PW_SALT,
"pw-salt",
ARCFOUR_string_to_key
},
{ 0 }
};
krb5_error_code KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_FUNCTION
krb5_salttype_to_string (krb5_context context, krb5_salttype_to_string (krb5_context context,
krb5_enctype etype, krb5_enctype etype,