make all_etypes const and move outside function to avoid returning
data on stack git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@14198 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -46,20 +46,8 @@ RCSID("$Id$");
|
|||||||
* afs or afs3 == des:afs3-salt
|
* afs or afs3 == des:afs3-salt
|
||||||
*/
|
*/
|
||||||
|
|
||||||
static krb5_error_code
|
|
||||||
parse_key_set(krb5_context context, const char *key,
|
|
||||||
krb5_enctype **enctypes, size_t *num_enctypes,
|
|
||||||
krb5_salt *salt, krb5_principal principal)
|
|
||||||
{
|
|
||||||
const char *p;
|
|
||||||
char buf[3][256];
|
|
||||||
int num_buf = 0;
|
|
||||||
int i;
|
|
||||||
static krb5_enctype e; /* XXX */
|
|
||||||
krb5_error_code ret;
|
|
||||||
|
|
||||||
/* the 3 DES types must be first */
|
/* the 3 DES types must be first */
|
||||||
krb5_enctype all_etypes[] = {
|
const krb5_enctype all_etypes[] = {
|
||||||
ETYPE_DES_CBC_MD5,
|
ETYPE_DES_CBC_MD5,
|
||||||
ETYPE_DES_CBC_MD4,
|
ETYPE_DES_CBC_MD4,
|
||||||
ETYPE_DES_CBC_CRC,
|
ETYPE_DES_CBC_CRC,
|
||||||
@@ -68,7 +56,19 @@ parse_key_set(krb5_context context, const char *key,
|
|||||||
#endif
|
#endif
|
||||||
ETYPE_ARCFOUR_HMAC_MD5,
|
ETYPE_ARCFOUR_HMAC_MD5,
|
||||||
ETYPE_DES3_CBC_SHA1
|
ETYPE_DES3_CBC_SHA1
|
||||||
};
|
};
|
||||||
|
|
||||||
|
static krb5_error_code
|
||||||
|
parse_key_set(krb5_context context, const char *key,
|
||||||
|
const krb5_enctype **enctypes, size_t *num_enctypes,
|
||||||
|
krb5_salt *salt, krb5_principal principal)
|
||||||
|
{
|
||||||
|
const char *p;
|
||||||
|
char buf[3][256];
|
||||||
|
int num_buf = 0;
|
||||||
|
int i;
|
||||||
|
static krb5_enctype e; /* XXX */
|
||||||
|
krb5_error_code ret;
|
||||||
|
|
||||||
p = key;
|
p = key;
|
||||||
|
|
||||||
@@ -246,7 +246,7 @@ _kadm5_generate_key_set(krb5_context context, krb5_principal principal,
|
|||||||
for(kp = ktypes; kp && *kp; kp++) {
|
for(kp = ktypes; kp && *kp; kp++) {
|
||||||
const char *p;
|
const char *p;
|
||||||
krb5_salt salt;
|
krb5_salt salt;
|
||||||
krb5_enctype *enctypes;
|
const krb5_enctype *enctypes;
|
||||||
size_t num_enctypes;
|
size_t num_enctypes;
|
||||||
|
|
||||||
p = *kp;
|
p = *kp;
|
||||||
|
Reference in New Issue
Block a user