AES is enabled by default, remove ifdefs

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@14652 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2005-03-17 00:28:48 +00:00
parent fb1f6f159b
commit 38ed3f09f9

View File

@@ -405,9 +405,7 @@ get_pa_etype_info(METHOD_DATA *md, hdb_entry *client,
* *
*/ */
#ifdef ENABLE_AES
extern int _krb5_AES_string_to_default_iterator; extern int _krb5_AES_string_to_default_iterator;
#endif
static krb5_error_code static krb5_error_code
make_etype_info2_entry(ETYPE_INFO2_ENTRY *ent, Key *key) make_etype_info2_entry(ETYPE_INFO2_ENTRY *ent, Key *key)
@@ -424,7 +422,6 @@ make_etype_info2_entry(ETYPE_INFO2_ENTRY *ent, Key *key)
ent->s2kparams = NULL; ent->s2kparams = NULL;
switch (key->key.keytype) { switch (key->key.keytype) {
#ifdef ENABLE_AES
case KEYTYPE_AES128: case KEYTYPE_AES128:
case KEYTYPE_AES256: case KEYTYPE_AES256:
ALLOC(ent->s2kparams); ALLOC(ent->s2kparams);
@@ -438,7 +435,6 @@ make_etype_info2_entry(ETYPE_INFO2_ENTRY *ent, Key *key)
_krb5_AES_string_to_default_iterator, _krb5_AES_string_to_default_iterator,
ent->s2kparams->length); ent->s2kparams->length);
break; break;
#endif
default: default:
break; break;
} }