Use generated encode and decode functions.
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@2516 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
113
lib/hdb/hdb.c
113
lib/hdb/hdb.c
@@ -40,97 +40,94 @@
|
|||||||
|
|
||||||
RCSID("$Id$");
|
RCSID("$Id$");
|
||||||
|
|
||||||
void
|
int
|
||||||
hdb_principal2key(krb5_context context, krb5_principal p, krb5_data *key)
|
hdb_principal2key(krb5_context context, krb5_principal p, krb5_data *key)
|
||||||
{
|
{
|
||||||
krb5_storage *sp;
|
Principal new;
|
||||||
krb5_principal new;
|
size_t len;
|
||||||
|
unsigned char *buf;
|
||||||
|
int ret;
|
||||||
|
|
||||||
krb5_copy_principal(context, p, &new);
|
ret = copy_Principal(p, &new);
|
||||||
new->name.name_type = 0;
|
if(ret)
|
||||||
sp = krb5_storage_emem();
|
goto out;
|
||||||
krb5_store_principal(sp, new);
|
new.name.name_type = 0;
|
||||||
krb5_storage_to_data(sp, key);
|
len = length_Principal(&new);
|
||||||
krb5_storage_free(sp);
|
buf = malloc(len);
|
||||||
krb5_free_principal(context, new);
|
if(buf == NULL){
|
||||||
|
ret = ENOMEM;
|
||||||
|
goto out;
|
||||||
|
}
|
||||||
|
ret = encode_Principal(buf + len - 1, len, &new, &len);
|
||||||
|
if(ret){
|
||||||
|
free(buf);
|
||||||
|
goto out;
|
||||||
|
}
|
||||||
|
key->data = buf;
|
||||||
|
key->length = len;
|
||||||
|
out:
|
||||||
|
free_Principal(&new);
|
||||||
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
int
|
||||||
hdb_key2principal(krb5_context context, krb5_data *key, krb5_principal *p)
|
hdb_key2principal(krb5_context context, krb5_data *key, krb5_principal p)
|
||||||
{
|
{
|
||||||
krb5_storage *sp;
|
size_t len;
|
||||||
sp = krb5_storage_from_mem(key->data, key->length);
|
return decode_Principal(key->data, key->length, p, &len);
|
||||||
krb5_ret_principal(sp, p);
|
|
||||||
krb5_storage_free(sp);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
int
|
||||||
hdb_entry2value(krb5_context context, hdb_entry *ent, krb5_data *value)
|
hdb_entry2value(krb5_context context, hdb_entry *ent, krb5_data *value)
|
||||||
{
|
{
|
||||||
krb5_storage *sp;
|
unsigned char *buf;
|
||||||
sp = krb5_storage_emem();
|
size_t len;
|
||||||
krb5_store_int32(sp, ent->kvno);
|
int ret;
|
||||||
krb5_store_keyblock(sp, ent->keyblock);
|
len = length_hdb_entry(ent);
|
||||||
krb5_store_int32(sp, ent->max_life);
|
buf = malloc(len);
|
||||||
krb5_store_int32(sp, ent->max_renew);
|
if(buf == NULL)
|
||||||
krb5_store_int32(sp, ent->last_change);
|
return ENOMEM;
|
||||||
krb5_store_principal(sp, ent->changed_by);
|
ret = encode_hdb_entry(buf + len - 1, len, ent, &len);
|
||||||
krb5_store_int32(sp, ent->expires);
|
if(ret){
|
||||||
krb5_store_int32(sp, ent->flags.i);
|
free(buf);
|
||||||
krb5_storage_to_data(sp, value);
|
return ret;
|
||||||
krb5_storage_free(sp);
|
}
|
||||||
|
value->data = buf;
|
||||||
|
value->length = len;
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
int
|
||||||
hdb_value2entry(krb5_context context, krb5_data *value, hdb_entry *ent)
|
hdb_value2entry(krb5_context context, krb5_data *value, hdb_entry *ent)
|
||||||
{
|
{
|
||||||
/* XXX must check return values */
|
size_t len;
|
||||||
krb5_storage *sp;
|
return decode_hdb_entry(value->data, value->length, ent, &len);
|
||||||
int32_t tmp;
|
|
||||||
sp = krb5_storage_from_mem(value->data, value->length);
|
|
||||||
krb5_ret_int32(sp, &tmp);
|
|
||||||
ent->kvno = tmp;
|
|
||||||
krb5_ret_keyblock(sp, &ent->keyblock);
|
|
||||||
krb5_ret_int32(sp, &tmp);
|
|
||||||
ent->max_life = tmp;
|
|
||||||
krb5_ret_int32(sp, &tmp);
|
|
||||||
ent->max_renew = tmp;
|
|
||||||
krb5_ret_int32(sp, &tmp);
|
|
||||||
ent->last_change = tmp;
|
|
||||||
krb5_ret_principal(sp, &ent->changed_by);
|
|
||||||
krb5_ret_int32(sp, &tmp);
|
|
||||||
ent->expires = tmp;
|
|
||||||
krb5_ret_int32(sp, &tmp);
|
|
||||||
ent->flags.i = tmp;
|
|
||||||
krb5_storage_free(sp);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
krb5_error_code
|
krb5_error_code
|
||||||
hdb_etype2key(krb5_context context,
|
hdb_etype2key(krb5_context context,
|
||||||
hdb_entry *e,
|
hdb_entry *e,
|
||||||
krb5_enctype etype,
|
krb5_enctype etype,
|
||||||
krb5_keyblock **key)
|
Key **key)
|
||||||
{
|
{
|
||||||
krb5_keytype keytype;
|
krb5_keytype keytype;
|
||||||
krb5_error_code ret;
|
krb5_error_code ret;
|
||||||
|
int i;
|
||||||
ret = krb5_etype2keytype(context, etype, &keytype);
|
ret = krb5_etype2keytype(context, etype, &keytype);
|
||||||
if(ret)
|
if(ret)
|
||||||
return ret;
|
return ret;
|
||||||
if(keytype == e->keyblock.keytype){
|
for(i = 0; i < e->keys.len; i++)
|
||||||
*key = &e->keyblock;
|
if(e->keys.val[i].key.keytype == keytype){
|
||||||
|
*key = &e->keys.val[i];
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
return KRB5_PROG_ETYPE_NOSUPP;
|
return KRB5_PROG_ETYPE_NOSUPP; /* XXX */
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
hdb_free_entry(krb5_context context, hdb_entry *ent)
|
hdb_free_entry(krb5_context context, hdb_entry *ent)
|
||||||
{
|
{
|
||||||
krb5_free_principal(context, ent->principal);
|
free_hdb_entry(ent);
|
||||||
krb5_free_keyblock(context, &ent->keyblock);
|
|
||||||
krb5_free_principal(context, ent->changed_by);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user