add --disable-DES
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@13455 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
17
kdc/config.c
17
kdc/config.c
@@ -70,6 +70,8 @@ static const char *trpolicy_str;
|
|||||||
static struct getarg_strings addresses_str; /* addresses to listen on */
|
static struct getarg_strings addresses_str; /* addresses to listen on */
|
||||||
krb5_addresses explicit_addresses;
|
krb5_addresses explicit_addresses;
|
||||||
|
|
||||||
|
static int disable_des = -1;
|
||||||
|
|
||||||
#ifdef KRB4
|
#ifdef KRB4
|
||||||
char *v4_realm;
|
char *v4_realm;
|
||||||
int enable_v4 = -1;
|
int enable_v4 = -1;
|
||||||
@@ -140,6 +142,8 @@ static struct getargs args[] = {
|
|||||||
#endif
|
#endif
|
||||||
{ "addresses", 0, arg_strings, &addresses_str,
|
{ "addresses", 0, arg_strings, &addresses_str,
|
||||||
"addresses to listen on", "list of addresses" },
|
"addresses to listen on", "list of addresses" },
|
||||||
|
{ "disable-des", 0, arg_flag, &disable_des,
|
||||||
|
"disable DES" },
|
||||||
{ "help", 'h', arg_flag, &help_flag },
|
{ "help", 'h', arg_flag, &help_flag },
|
||||||
{ "version", 'v', arg_flag, &version_flag }
|
{ "version", 'v', arg_flag, &version_flag }
|
||||||
};
|
};
|
||||||
@@ -463,4 +467,17 @@ configure(int argc, char **argv)
|
|||||||
krb_get_lrealm(v4_realm, 1);
|
krb_get_lrealm(v4_realm, 1);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
if(disable_des == -1)
|
||||||
|
disable_des = krb5_config_get_bool_default(context, NULL,
|
||||||
|
0,
|
||||||
|
"kdc",
|
||||||
|
"disable-des", NULL);
|
||||||
|
if(disable_des) {
|
||||||
|
krb5_enctype_disable(context, ETYPE_DES_CBC_CRC);
|
||||||
|
krb5_enctype_disable(context, ETYPE_DES_CBC_MD4);
|
||||||
|
krb5_enctype_disable(context, ETYPE_DES_CBC_MD5);
|
||||||
|
krb5_enctype_disable(context, ETYPE_DES_CBC_NONE);
|
||||||
|
krb5_enctype_disable(context, ETYPE_DES_CFB64_NONE);
|
||||||
|
krb5_enctype_disable(context, ETYPE_DES_PCBC_NONE);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user