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

storage tweaks; also try to handle zero sized keytab files

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@10933 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
2002-04-18 14:03:13 +00:00
parent b6de4e7c52
commit ce0ace220b
1 changed files with 66 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

109
lib/krb5/keytab_file.c
View File

@@ -61,7 +61,7 @@ krb5_kt_ret_data(krb5_context context,
krb5_set_error_string (context, "malloc: out of memory"); krb5_set_error_string (context, "malloc: out of memory");
return ENOMEM; return ENOMEM;
} }
ret = sp->fetch(sp, data->data, size); ret = krb5_storage_read(sp, data->data, size);
if(ret != size) if(ret != size)
return (ret < 0)? errno : KRB5_KT_END; return (ret < 0)? errno : KRB5_KT_END;
return 0; return 0;
@@ -82,7 +82,7 @@ krb5_kt_ret_string(krb5_context context,
krb5_set_error_string (context, "malloc: out of memory"); krb5_set_error_string (context, "malloc: out of memory");
return ENOMEM; return ENOMEM;
} }
ret = sp->fetch(sp, *data, size); ret = krb5_storage_read(sp, *data, size);
(*data)[size] = '\0'; (*data)[size] = '\0';
if(ret != size) if(ret != size)
return (ret < 0)? errno : KRB5_KT_END; return (ret < 0)? errno : KRB5_KT_END;
@@ -98,7 +98,7 @@ krb5_kt_store_data(krb5_context context,
ret = krb5_store_int16(sp, data.length); ret = krb5_store_int16(sp, data.length);
if(ret < 0) if(ret < 0)
return ret; return ret;
ret = sp->store(sp, data.data, data.length); ret = krb5_storage_write(sp, data.data, data.length);
if(ret != data.length){ if(ret != data.length){
if(ret < 0) if(ret < 0)
return errno; return errno;
@@ -116,7 +116,7 @@ krb5_kt_store_string(krb5_storage *sp,
ret = krb5_store_int16(sp, len); ret = krb5_store_int16(sp, len);
if(ret < 0) if(ret < 0)
return ret; return ret;
ret = sp->store(sp, data, len); ret = krb5_storage_write(sp, data, len);
if(ret != len){ if(ret != len){
if(ret < 0) if(ret < 0)
return errno; return errno;
@@ -171,7 +171,7 @@ krb5_kt_ret_principal(krb5_context context,
ret = krb5_ret_int16(sp, &tmp); ret = krb5_ret_int16(sp, &tmp);
if(ret) if(ret)
return ret; return ret;
if (sp->flags & KRB5_STORAGE_PRINCIPAL_WRONG_NUM_COMPONENTS) if(krb5_storage_is_flags(sp, KRB5_STORAGE_PRINCIPAL_WRONG_NUM_COMPONENTS))
tmp--; tmp--;
p->name.name_string.len = tmp; p->name.name_string.len = tmp;
ret = krb5_kt_ret_string(context, sp, &p->realm); ret = krb5_kt_ret_string(context, sp, &p->realm);
@@ -284,8 +284,8 @@ storage_set_flags(krb5_context context, krb5_storage *sp, int vno)
case KRB5_KT_VNO_2: case KRB5_KT_VNO_2:
break; break;
default: default:
krb5_abortx(context, krb5_warnx(context,
"storage_set_flags called with bad vno (%x)", vno); "storage_set_flags called with bad vno (%d)", vno);
} }
krb5_storage_set_flags(sp, flags); krb5_storage_set_flags(sp, flags);
} }
@@ -308,6 +308,7 @@ fkt_start_seq_get_int(krb5_context context,
return ret; return ret;
} }
c->sp = krb5_storage_from_fd(c->fd); c->sp = krb5_storage_from_fd(c->fd);
krb5_storage_set_eof_code(c->sp, KRB5_KT_END);
ret = krb5_ret_int8(c->sp, &pvno); ret = krb5_ret_int8(c->sp, &pvno);
if(ret) { if(ret) {
krb5_storage_free(c->sp); krb5_storage_free(c->sp);
@@ -353,13 +354,13 @@ fkt_next_entry_int(krb5_context context,
int32_t tmp32; int32_t tmp32;
off_t pos; off_t pos;
pos = cursor->sp->seek(cursor->sp, 0, SEEK_CUR); pos = krb5_storage_seek(cursor->sp, 0, SEEK_CUR);
loop: loop:
ret = krb5_ret_int32(cursor->sp, &len); ret = krb5_ret_int32(cursor->sp, &len);
if (ret) if (ret)
return ret; return ret;
if(len < 0) { if(len < 0) {
pos = cursor->sp->seek(cursor->sp, -len, SEEK_CUR); pos = krb5_storage_seek(cursor->sp, -len, SEEK_CUR);
goto loop; goto loop;
} }
ret = krb5_kt_ret_principal (context, cursor->sp, &entry->principal); ret = krb5_kt_ret_principal (context, cursor->sp, &entry->principal);
@@ -386,7 +387,7 @@ loop:
if(start) *start = pos; if(start) *start = pos;
if(end) *end = *start + 4 + len; if(end) *end = *start + 4 + len;
out: out:
cursor->sp->seek(cursor->sp, pos + 4 + len, SEEK_SET); krb5_storage_seek(cursor->sp, pos + 4 + len, SEEK_CUR);
return ret; return ret;
} }
@@ -409,6 +410,20 @@ fkt_end_seq_get(krb5_context context,
return 0; return 0;
} }
static krb5_error_code
fkt_setup_keytab(krb5_context context,
krb5_keytab id,
krb5_storage *sp)
{
krb5_error_code ret;
ret = krb5_store_int8(sp, 5);
if(ret)
return ret;
if(id->version == 0)
id->version = KRB5_KT_VNO;
return krb5_store_int8 (sp, id->version);
}
static krb5_error_code static krb5_error_code
fkt_add_entry(krb5_context context, fkt_add_entry(krb5_context context,
krb5_keytab id, krb5_keytab id,
@@ -431,44 +446,52 @@ fkt_add_entry(krb5_context context,
return ret; return ret;
} }
sp = krb5_storage_from_fd(fd); sp = krb5_storage_from_fd(fd);
ret = krb5_store_int8(sp, 5); krb5_storage_set_eof_code(sp, KRB5_KT_END);
ret = fkt_setup_keytab(context, id, sp);
if(ret) { if(ret) {
krb5_storage_free(sp); krb5_storage_free(sp);
close(fd); close(fd);
return ret; return ret;
} }
if(id->version == 0)
id->version = KRB5_KT_VNO;
ret = krb5_store_int8 (sp, id->version);
if (ret) {
krb5_storage_free(sp);
close(fd);
return ret;
}
storage_set_flags(context, sp, id->version); storage_set_flags(context, sp, id->version);
} else { } else {
int8_t pvno, tag; int8_t pvno, tag;
sp = krb5_storage_from_fd(fd); sp = krb5_storage_from_fd(fd);
krb5_storage_set_eof_code(sp, KRB5_KT_END);
ret = krb5_ret_int8(sp, &pvno); ret = krb5_ret_int8(sp, &pvno);
if(ret) { if(ret) {
krb5_storage_free(sp); /* we probably have a zero byte file, so try to set it up
close(fd); properly */
return ret; ret = fkt_setup_keytab(context, id, sp);
if(ret) {
krb5_set_error_string(context, "%s: keytab is corrupted: %s",
d->filename, strerror(ret));
krb5_storage_free(sp);
close(fd);
return ret;
}
storage_set_flags(context, sp, id->version);
} else {
if(pvno != 5) {
krb5_storage_free(sp);
close(fd);
krb5_clear_error_string (context);
ret = KRB5_KEYTAB_BADVNO;
krb5_set_error_string(context, "%s: %s",
d->filename, strerror(ret));
return ret;
}
ret = krb5_ret_int8 (sp, &tag);
if (ret) {
krb5_set_error_string(context, "%s: reading tag: %s",
d->filename, strerror(ret));
krb5_storage_free(sp);
close(fd);
return ret;
}
id->version = tag;
storage_set_flags(context, sp, id->version);
} }
if(pvno != 5) {
krb5_storage_free(sp);
close(fd);
krb5_clear_error_string (context);
return KRB5_KEYTAB_BADVNO;
}
ret = krb5_ret_int8 (sp, &tag);
if (ret) {
krb5_storage_free(sp);
close(fd);
return ret;
}
id->version = tag;
storage_set_flags(context, sp, id->version);
} }
{ {
@@ -513,25 +536,25 @@ fkt_add_entry(krb5_context context,
while(1) { while(1) {
ret = krb5_ret_int32(sp, &len); ret = krb5_ret_int32(sp, &len);
if(ret == KRB5_CC_END) { if(ret == KRB5_KT_END) {
len = keytab.length; len = keytab.length;
break; break;
} }
if(len < 0) { if(len < 0) {
len = -len; len = -len;
if(len >= keytab.length) { if(len >= keytab.length) {
sp->seek(sp, -4, SEEK_CUR); krb5_storage_seek(sp, -4, SEEK_CUR);
break; break;
} }
} }
sp->seek(sp, len, SEEK_CUR); krb5_storage_seek(sp, len, SEEK_CUR);
} }
ret = krb5_store_int32(sp, len); ret = krb5_store_int32(sp, len);
if(sp->store(sp, keytab.data, keytab.length) < 0) if(krb5_storage_write(sp, keytab.data, keytab.length) < 0)
ret = errno; ret = errno;
memset(keytab.data, 0, keytab.length); memset(keytab.data, 0, keytab.length);
krb5_data_free(&keytab); krb5_data_free(&keytab);
out: out:
krb5_storage_free(sp); krb5_storage_free(sp);
close(fd); close(fd);
return ret; return ret;
@@ -555,12 +578,12 @@ fkt_remove_entry(krb5_context context,
int32_t len; int32_t len;
unsigned char buf[128]; unsigned char buf[128];
found = 1; found = 1;
cursor.sp->seek(cursor.sp, pos_start, SEEK_SET); krb5_storage_seek(cursor.sp, pos_start, SEEK_SET);
len = pos_end - pos_start - 4; len = pos_end - pos_start - 4;
krb5_store_int32(cursor.sp, -len); krb5_store_int32(cursor.sp, -len);
memset(buf, 0, sizeof(buf)); memset(buf, 0, sizeof(buf));
while(len > 0) { while(len > 0) {
cursor.sp->store(cursor.sp, buf, min(len, sizeof(buf))); krb5_storage_write(cursor.sp, buf, min(len, sizeof(buf)));
len -= min(len, sizeof(buf)); len -= min(len, sizeof(buf));
} }
} }