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

use ASN1_MALLOC_ENCODE

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@11373 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
2002-09-04 16:32:30 +00:00
parent ddc308c36f
commit c8ac575762
1 changed files with 8 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
lib/hdb/common.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1997-2001 Kungliga Tekniska H<>gskolan * Copyright (c) 1997-2002 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden). * (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved. * All rights reserved.
* *
@@ -40,28 +40,14 @@ hdb_principal2key(krb5_context context, krb5_principal p, krb5_data *key)
{ {
Principal new; Principal new;
size_t len; size_t len;
unsigned char *buf;
int ret; int ret;
ret = copy_Principal(p, &new); ret = copy_Principal(p, &new);
if(ret) if(ret)
goto out; return ret;
new.name.name_type = 0; new.name.name_type = 0;
len = length_Principal(&new);
buf = malloc(len); ASN1_MALLOC_ENCODE(Principal, key->data, key->length, &new, &len, ret);
if(buf == NULL){
krb5_set_error_string(context, "malloc: out of memory");
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); free_Principal(&new);
return ret; return ret;
} }
@@ -75,24 +61,11 @@ hdb_key2principal(krb5_context context, krb5_data *key, krb5_principal p)
int int
hdb_entry2value(krb5_context context, hdb_entry *ent, krb5_data *value) hdb_entry2value(krb5_context context, hdb_entry *ent, krb5_data *value)
{ {
unsigned char *buf;
size_t len; size_t len;
int ret; int ret;
len = length_hdb_entry(ent); ASN1_MALLOC_ENCODE(hdb_entry, value->data, value->length, ent, &len, ret);
buf = malloc(len);
if(buf == NULL) {
krb5_set_error_string(context, "malloc: out of memory");
return ENOMEM;
}
ret = encode_hdb_entry(buf + len - 1, len, ent, &len);
if(ret){
free(buf);
return ret; return ret;
}
value->data = buf;
value->length = len;
return 0;
} }
int int