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

Move zero length integercheck to a better place.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@21354 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2007-06-27 07:37:01 +00:00
parent 5791153faf
commit d9e1a55133
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/asn1/check-der.c
View File

@@ -481,6 +481,8 @@ test_heim_integer (void)
}; };
int i, ret; int i, ret;
int ntests = sizeof(tests) / sizeof(tests[0]); int ntests = sizeof(tests) / sizeof(tests[0]);
size_t size;
heim_integer i2;
for (i = 0; i < ntests; ++i) { for (i = 0; i < ntests; ++i) {
tests[i].val = &values[i]; tests[i].val = &values[i];
@@ -497,7 +499,18 @@ test_heim_integer (void)
test_cmp_heim_integer); test_cmp_heim_integer);
for (i = 0; i < ntests; ++i) for (i = 0; i < ntests; ++i)
free (tests[i].name); free (tests[i].name);
return ret; if (ret)
return ret;
/* test zero length integer (BER format) */
ret = der_get_heim_integer(NULL, 0, &i2, &size);
if (ret)
errx(1, "der_get_heim_integer");
if (i2.length != 0)
errx(1, "der_get_heim_integer wrong length");
der_free_heim_integer(&i2);
return 0;
} }
static int static int
@@ -655,7 +668,6 @@ static int
check_heim_integer_same(const char *p, const char *norm_p, heim_integer *i) check_heim_integer_same(const char *p, const char *norm_p, heim_integer *i)
{ {
heim_integer i2; heim_integer i2;
size_t size;
char *str; char *str;
int ret; int ret;
@@ -685,12 +697,6 @@ check_heim_integer_same(const char *p, const char *norm_p, heim_integer *i)
der_free_heim_integer(&i2); der_free_heim_integer(&i2);
/* test zero length integer (BER format) */
ret = der_get_heim_integer(NULL, 0, &i2, &size);
if (ret)
errx(1, "der_get_heim_integer");
der_free_heim_integer(&i2);
return 0; return 0;
} }