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

prefix typedef\'s and structs with heim_

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@12438 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2003-07-15 13:57:32 +00:00
parent 72c26c7cce
commit 939b444ca3
10 changed files with 77 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/asn1/asn1-common.h
View File

@@ -6,17 +6,17 @@
#ifndef __asn1_common_definitions__ #ifndef __asn1_common_definitions__
#define __asn1_common_definitions__ #define __asn1_common_definitions__
typedef struct octet_string { typedef struct heim_octet_string {
size_t length; size_t length;
void *data; void *data;
} octet_string; } heim_octet_string;
typedef char *general_string; typedef char *heim_general_string;
typedef char *utf8_string; typedef char *heim_utf8_string;
typedef struct oid { typedef struct heim_oid {
size_t length; size_t length;
unsigned *components; unsigned *components;
} oid; } heim_oid;
#endif #endif

6
lib/asn1/asn1_print.c
View File

@@ -138,7 +138,7 @@ loop (unsigned char *buf, size_t len, int indent)
break; break;
} }
case UT_OctetString : { case UT_OctetString : {
octet_string str; heim_octet_string str;
int i; int i;
unsigned char *uc; unsigned char *uc;
@@ -155,7 +155,7 @@ loop (unsigned char *buf, size_t len, int indent)
} }
case UT_GeneralizedTime : case UT_GeneralizedTime :
case UT_GeneralString : { case UT_GeneralString : {
general_string str; heim_general_string str;
ret = der_get_general_string (buf, length, &str, NULL); ret = der_get_general_string (buf, length, &str, NULL);
if (ret) if (ret)
@@ -166,7 +166,7 @@ loop (unsigned char *buf, size_t len, int indent)
break; break;
} }
case UT_OID: { case UT_OID: {
oid o; heim_oid o;
int i; int i;
ret = der_get_oid(buf, length, &o, NULL); ret = der_get_oid(buf, length, &o, NULL);

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

@@ -130,8 +130,8 @@ test_unsigned (void)
static int static int
cmp_octet_string (void *a, void *b) cmp_octet_string (void *a, void *b)
{ {
octet_string *oa = (octet_string *)a; heim_octet_string *oa = (heim_octet_string *)a;
octet_string *ob = (octet_string *)b; heim_octet_string *ob = (heim_octet_string *)b;
if (oa->length != ob->length) if (oa->length != ob->length)
return ob->length - oa->length; return ob->length - oa->length;
@@ -142,7 +142,7 @@ cmp_octet_string (void *a, void *b)
static int static int
test_octet_string (void) test_octet_string (void)
{ {
octet_string s1 = {8, "\x01\x23\x45\x67\x89\xab\xcd\xef"}; heim_octet_string s1 = {8, "\x01\x23\x45\x67\x89\xab\xcd\xef"};
struct test_case tests[] = { struct test_case tests[] = {
{NULL, 10, "\x04\x08\x01\x23\x45\x67\x89\xab\xcd\xef"} {NULL, 10, "\x04\x08\x01\x23\x45\x67\x89\xab\xcd\xef"}
@@ -152,7 +152,7 @@ test_octet_string (void)
tests[0].val = &s1; tests[0].val = &s1;
asprintf (&tests[0].name, "a octet string"); asprintf (&tests[0].name, "a octet string");
return generic_test (tests, ntests, sizeof(octet_string), return generic_test (tests, ntests, sizeof(heim_octet_string),
(generic_encode)encode_octet_string, (generic_encode)encode_octet_string,
(generic_length)length_octet_string, (generic_length)length_octet_string,
(generic_decode)decode_octet_string, (generic_decode)decode_octet_string,

56
lib/asn1/der.h
View File

@@ -69,17 +69,17 @@ enum {
time_t timegm (struct tm *); time_t timegm (struct tm *);
#endif #endif
int time2generalizedtime (time_t t, octet_string *s); int time2generalizedtime (time_t t, heim_octet_string *s);
int der_get_int (const unsigned char *p, size_t len, int *ret, size_t *size); int der_get_int (const unsigned char *p, size_t len, int *ret, size_t *size);
int der_get_length (const unsigned char *p, size_t len, int der_get_length (const unsigned char *p, size_t len,
size_t *val, size_t *size); size_t *val, size_t *size);
int der_get_general_string (const unsigned char *p, size_t len, int der_get_general_string (const unsigned char *p, size_t len,
general_string *str, size_t *size); heim_general_string *str, size_t *size);
int der_get_octet_string (const unsigned char *p, size_t len, int der_get_octet_string (const unsigned char *p, size_t len,
octet_string *data, size_t *size); heim_octet_string *data, size_t *size);
int der_get_oid (const unsigned char *p, size_t len, int der_get_oid (const unsigned char *p, size_t len,
oid *data, size_t *size); heim_oid *data, size_t *size);
int der_get_tag (const unsigned char *p, size_t len, int der_get_tag (const unsigned char *p, size_t len,
Der_class *class, Der_type *type, Der_class *class, Der_type *type,
int *tag, size_t *size); int *tag, size_t *size);
@@ -95,22 +95,24 @@ int decode_integer (const unsigned char*, size_t, int*, size_t*);
int decode_unsigned (const unsigned char*, size_t, unsigned*, size_t*); int decode_unsigned (const unsigned char*, size_t, unsigned*, size_t*);
int decode_enumerated (const unsigned char*, size_t, unsigned*, size_t*); int decode_enumerated (const unsigned char*, size_t, unsigned*, size_t*);
int decode_general_string (const unsigned char*, size_t, int decode_general_string (const unsigned char*, size_t,
general_string*, size_t*); heim_general_string*, size_t*);
int decode_oid (const unsigned char *p, size_t len, int decode_oid (const unsigned char *p, size_t len,
oid *k, size_t *size); heim_oid *k, size_t *size);
int decode_octet_string (const unsigned char*, size_t, octet_string*, size_t*); int decode_octet_string (const unsigned char*, size_t,
heim_octet_string*, size_t*);
int decode_generalized_time (const unsigned char*, size_t, time_t*, size_t*); int decode_generalized_time (const unsigned char*, size_t, time_t*, size_t*);
int decode_nulltype (const unsigned char*, size_t, size_t*); int decode_nulltype (const unsigned char*, size_t, size_t*);
int decode_utf8string (const unsigned char*, size_t, utf8_string*, size_t*); int decode_utf8string (const unsigned char*, size_t,
heim_utf8_string*, size_t*);
int der_put_int (unsigned char *p, size_t len, int val, size_t*); int der_put_int (unsigned char *p, size_t len, int val, size_t*);
int der_put_length (unsigned char *p, size_t len, size_t val, size_t*); int der_put_length (unsigned char *p, size_t len, size_t val, size_t*);
int der_put_general_string (unsigned char *p, size_t len, int der_put_general_string (unsigned char *p, size_t len,
const general_string *str, size_t*); const heim_general_string *str, size_t*);
int der_put_octet_string (unsigned char *p, size_t len, int der_put_octet_string (unsigned char *p, size_t len,
const octet_string *data, size_t*); const heim_octet_string *data, size_t*);
int der_put_oid (unsigned char *p, size_t len, int der_put_oid (unsigned char *p, size_t len,
const oid *data, size_t *size); const heim_oid *data, size_t *size);
int der_put_tag (unsigned char *p, size_t len, Der_class class, Der_type type, int der_put_tag (unsigned char *p, size_t len, Der_class class, Der_type type,
int tag, size_t*); int tag, size_t*);
int der_put_length_and_tag (unsigned char*, size_t, size_t, int der_put_length_and_tag (unsigned char*, size_t, size_t,
@@ -123,39 +125,39 @@ int encode_unsigned (unsigned char *p, size_t len,
int encode_enumerated (unsigned char *p, size_t len, int encode_enumerated (unsigned char *p, size_t len,
const unsigned *data, size_t*); const unsigned *data, size_t*);
int encode_general_string (unsigned char *p, size_t len, int encode_general_string (unsigned char *p, size_t len,
const general_string *data, size_t*); const heim_general_string *data, size_t*);
int encode_octet_string (unsigned char *p, size_t len, int encode_octet_string (unsigned char *p, size_t len,
const octet_string *k, size_t*); const heim_octet_string *k, size_t*);
int encode_oid (unsigned char *p, size_t len, int encode_oid (unsigned char *p, size_t len,
const oid *k, size_t*); const heim_oid *k, size_t*);
int encode_generalized_time (unsigned char *p, size_t len, int encode_generalized_time (unsigned char *p, size_t len,
const time_t *t, size_t*); const time_t *t, size_t*);
int encode_nulltype (unsigned char*, size_t, size_t*); int encode_nulltype (unsigned char*, size_t, size_t*);
int encode_utf8string (unsigned char*, size_t, utf8_string*, size_t*); int encode_utf8string (unsigned char*, size_t, heim_utf8_string*, size_t*);
void free_integer (int *num); void free_integer (int *num);
void free_general_string (general_string *str); void free_general_string (heim_general_string *str);
void free_octet_string (octet_string *k); void free_octet_string (heim_octet_string *k);
void free_oid (oid *k); void free_oid (heim_oid *k);
void free_generalized_time (time_t *t); void free_generalized_time (time_t *t);
void free_utf8string (utf8_string*); void free_utf8string (heim_utf8_string*);
size_t length_len (size_t len); size_t length_len (size_t len);
size_t length_integer (const int *data); size_t length_integer (const int *data);
size_t length_unsigned (const unsigned *data); size_t length_unsigned (const unsigned *data);
size_t length_enumerated (const unsigned *data); size_t length_enumerated (const unsigned *data);
size_t length_general_string (const general_string *data); size_t length_general_string (const heim_general_string *data);
size_t length_octet_string (const octet_string *k); size_t length_octet_string (const heim_octet_string *k);
size_t length_oid (const oid *k); size_t length_oid (const heim_oid *k);
size_t length_generalized_time (const time_t *t); size_t length_generalized_time (const time_t *t);
size_t length_nulltype (void); size_t length_nulltype (void);
size_t length_utf8string (const utf8_string*); size_t length_utf8string (const heim_utf8_string*);
int copy_general_string (const general_string *from, general_string *to); int copy_general_string (const heim_general_string *, heim_general_string *);
int copy_octet_string (const octet_string *from, octet_string *to); int copy_octet_string (const heim_octet_string *, heim_octet_string *);
int copy_oid (const oid *from, oid *to); int copy_oid (const heim_oid *from, heim_oid *to);
int copy_nulltype (void *, void *); int copy_nulltype (void *, void *);
int copy_utf8string (const utf8_string*, utf8_string*); int copy_utf8string (const heim_utf8_string*, heim_utf8_string*);
int fix_dce(size_t reallen, size_t *len); int fix_dce(size_t reallen, size_t *len);

6
lib/asn1/der_copy.c
View File

@@ -36,7 +36,7 @@
RCSID("$Id$"); RCSID("$Id$");
int int
copy_general_string (const general_string *from, general_string *to) copy_general_string (const heim_general_string *from, heim_general_string *to)
{ {
*to = strdup(*from); *to = strdup(*from);
if(*to == NULL) if(*to == NULL)
@@ -45,7 +45,7 @@ copy_general_string (const general_string *from, general_string *to)
} }
int int
copy_octet_string (const octet_string *from, octet_string *to) copy_octet_string (const heim_octet_string *from, heim_octet_string *to)
{ {
to->length = from->length; to->length = from->length;
to->data = malloc(to->length); to->data = malloc(to->length);
@@ -56,7 +56,7 @@ copy_octet_string (const octet_string *from, octet_string *to)
} }
int int
copy_oid (const oid *from, oid *to) copy_oid (const heim_oid *from, heim_oid *to)
{ {
to->length = from->length; to->length = from->length;
to->components = malloc(to->length * sizeof(*to->components)); to->components = malloc(to->length * sizeof(*to->components));

6
lib/asn1/der_free.c
View File

@@ -36,19 +36,19 @@
RCSID("$Id$"); RCSID("$Id$");
void void
free_general_string (general_string *str) free_general_string (heim_general_string *str)
{ {
free(*str); free(*str);
} }
void void
free_octet_string (octet_string *k) free_octet_string (heim_octet_string *k)
{ {
free(k->data); free(k->data);
} }
void void
free_oid (oid *k) free_oid (heim_oid *k)
{ {
free(k->components); free(k->components);
} }

14
lib/asn1/der_get.c
View File

@@ -112,7 +112,7 @@ der_get_length (const unsigned char *p, size_t len,
int int
der_get_general_string (const unsigned char *p, size_t len, der_get_general_string (const unsigned char *p, size_t len,
general_string *str, size_t *size) heim_general_string *str, size_t *size)
{ {
char *s; char *s;
@@ -128,7 +128,7 @@ der_get_general_string (const unsigned char *p, size_t len,
int int
der_get_octet_string (const unsigned char *p, size_t len, der_get_octet_string (const unsigned char *p, size_t len,
octet_string *data, size_t *size) heim_octet_string *data, size_t *size)
{ {
data->length = len; data->length = len;
data->data = malloc(len); data->data = malloc(len);
@@ -141,7 +141,7 @@ der_get_octet_string (const unsigned char *p, size_t len,
int int
der_get_oid (const unsigned char *p, size_t len, der_get_oid (const unsigned char *p, size_t len,
oid *data, size_t *size) heim_oid *data, size_t *size)
{ {
int n; int n;
size_t oldlen = len; size_t oldlen = len;
@@ -321,7 +321,7 @@ decode_enumerated (const unsigned char *p, size_t len,
int int
decode_general_string (const unsigned char *p, size_t len, decode_general_string (const unsigned char *p, size_t len,
general_string *str, size_t *size) heim_general_string *str, size_t *size)
{ {
size_t ret = 0; size_t ret = 0;
size_t l; size_t l;
@@ -353,7 +353,7 @@ decode_general_string (const unsigned char *p, size_t len,
int int
decode_octet_string (const unsigned char *p, size_t len, decode_octet_string (const unsigned char *p, size_t len,
octet_string *k, size_t *size) heim_octet_string *k, size_t *size)
{ {
size_t ret = 0; size_t ret = 0;
size_t l; size_t l;
@@ -385,7 +385,7 @@ decode_octet_string (const unsigned char *p, size_t len,
int int
decode_oid (const unsigned char *p, size_t len, decode_oid (const unsigned char *p, size_t len,
oid *k, size_t *size) heim_oid *k, size_t *size)
{ {
size_t ret = 0; size_t ret = 0;
size_t l; size_t l;
@@ -433,7 +433,7 @@ int
decode_generalized_time (const unsigned char *p, size_t len, decode_generalized_time (const unsigned char *p, size_t len,
time_t *t, size_t *size) time_t *t, size_t *size)
{ {
octet_string k; heim_octet_string k;
char *times; char *times;
size_t ret = 0; size_t ret = 0;
size_t l; size_t l;

10
lib/asn1/der_length.c
View File

@@ -68,7 +68,7 @@ len_int (int val)
} }
static size_t static size_t
len_oid (const oid *oid) len_oid (const heim_oid *oid)
{ {
size_t ret = 1; size_t ret = 1;
int n; int n;
@@ -128,7 +128,7 @@ length_enumerated (const unsigned *data)
} }
size_t size_t
length_general_string (const general_string *data) length_general_string (const heim_general_string *data)
{ {
char *str = *data; char *str = *data;
size_t len = strlen(str); size_t len = strlen(str);
@@ -136,13 +136,13 @@ length_general_string (const general_string *data)
} }
size_t size_t
length_octet_string (const octet_string *k) length_octet_string (const heim_octet_string *k)
{ {
return 1 + length_len(k->length) + k->length; return 1 + length_len(k->length) + k->length;
} }
size_t size_t
length_oid (const oid *k) length_oid (const heim_oid *k)
{ {
size_t len = len_oid (k); size_t len = len_oid (k);
@@ -152,7 +152,7 @@ length_oid (const oid *k)
size_t size_t
length_generalized_time (const time_t *t) length_generalized_time (const time_t *t)
{ {
octet_string k; heim_octet_string k;
size_t ret; size_t ret;
time2generalizedtime (*t, &k); time2generalizedtime (*t, &k);

16
lib/asn1/der_put.c
View File

@@ -134,7 +134,7 @@ der_put_length (unsigned char *p, size_t len, size_t val, size_t *size)
int int
der_put_general_string (unsigned char *p, size_t len, der_put_general_string (unsigned char *p, size_t len,
const general_string *str, size_t *size) const heim_general_string *str, size_t *size)
{ {
size_t slen = strlen(*str); size_t slen = strlen(*str);
@@ -149,7 +149,7 @@ der_put_general_string (unsigned char *p, size_t len,
int int
der_put_octet_string (unsigned char *p, size_t len, der_put_octet_string (unsigned char *p, size_t len,
const octet_string *data, size_t *size) const heim_octet_string *data, size_t *size)
{ {
if (len < data->length) if (len < data->length)
return ASN1_OVERFLOW; return ASN1_OVERFLOW;
@@ -162,7 +162,7 @@ der_put_octet_string (unsigned char *p, size_t len,
int int
der_put_oid (unsigned char *p, size_t len, der_put_oid (unsigned char *p, size_t len,
const oid *data, size_t *size) const heim_oid *data, size_t *size)
{ {
unsigned char *base = p; unsigned char *base = p;
int n; int n;
@@ -310,7 +310,7 @@ encode_enumerated (unsigned char *p, size_t len, const unsigned *data,
int int
encode_general_string (unsigned char *p, size_t len, encode_general_string (unsigned char *p, size_t len,
const general_string *data, size_t *size) const heim_general_string *data, size_t *size)
{ {
size_t ret = 0; size_t ret = 0;
size_t l; size_t l;
@@ -334,7 +334,7 @@ encode_general_string (unsigned char *p, size_t len,
int int
encode_octet_string (unsigned char *p, size_t len, encode_octet_string (unsigned char *p, size_t len,
const octet_string *k, size_t *size) const heim_octet_string *k, size_t *size)
{ {
size_t ret = 0; size_t ret = 0;
size_t l; size_t l;
@@ -358,7 +358,7 @@ encode_octet_string (unsigned char *p, size_t len,
int int
encode_oid(unsigned char *p, size_t len, encode_oid(unsigned char *p, size_t len,
const oid *k, size_t *size) const heim_oid *k, size_t *size)
{ {
size_t ret = 0; size_t ret = 0;
size_t l; size_t l;
@@ -381,7 +381,7 @@ encode_oid(unsigned char *p, size_t len,
} }
int int
time2generalizedtime (time_t t, octet_string *s) time2generalizedtime (time_t t, heim_octet_string *s)
{ {
struct tm *tm; struct tm *tm;
size_t len; size_t len;
@@ -405,7 +405,7 @@ encode_generalized_time (unsigned char *p, size_t len,
{ {
size_t ret = 0; size_t ret = 0;
size_t l; size_t l;
octet_string k; heim_octet_string k;
int e; int e;
e = time2generalizedtime (*t, &k); e = time2generalizedtime (*t, &k);

18
lib/asn1/gen.c
View File

@@ -97,21 +97,21 @@ init_generate (const char *filename, const char *base)
"#ifndef __asn1_common_definitions__\n" "#ifndef __asn1_common_definitions__\n"
"#define __asn1_common_definitions__\n\n"); "#define __asn1_common_definitions__\n\n");
fprintf (headerfile, fprintf (headerfile,
"typedef struct octet_string {\n" "typedef struct heim_octet_string {\n"
" size_t length;\n" " size_t length;\n"
" void *data;\n" " void *data;\n"
"} octet_string;\n\n"); "} heim_octet_string;\n\n");
fprintf (headerfile, fprintf (headerfile,
"typedef char *general_string;\n\n" "typedef char *heim_general_string;\n\n"
); );
fprintf (headerfile, fprintf (headerfile,
"typedef char *utf8_string;\n\n" "typedef char *heim_utf8_string;\n\n"
); );
fprintf (headerfile, fprintf (headerfile,
"typedef struct oid {\n" "typedef struct heim_oid {\n"
" size_t length;\n" " size_t length;\n"
" unsigned *components;\n" " unsigned *components;\n"
"} oid;\n\n"); "} heim_oid;\n\n");
fputs("#define ASN1_MALLOC_ENCODE(T, B, BL, S, L, R) \\\n" fputs("#define ASN1_MALLOC_ENCODE(T, B, BL, S, L, R) \\\n"
" do { \\\n" " do { \\\n"
" (BL) = length_##T((S)); \\\n" " (BL) = length_##T((S)); \\\n"
@@ -315,11 +315,11 @@ define_type (int level, char *name, Type *t, int typedefp)
break; break;
case TOctetString: case TOctetString:
space(level); space(level);
fprintf (headerfile, "octet_string %s;\n", name); fprintf (headerfile, "heim_octet_string %s;\n", name);
break; break;
case TOID : case TOID :
space(level); space(level);
fprintf (headerfile, "oid %s;\n", name); fprintf (headerfile, "heim_oid %s;\n", name);
break; break;
case TBitString: { case TBitString: {
Member *m; Member *m;
@@ -401,7 +401,7 @@ define_type (int level, char *name, Type *t, int typedefp)
break; break;
case TGeneralString: case TGeneralString:
space(level); space(level);
fprintf (headerfile, "general_string %s;\n", name); fprintf (headerfile, "heim_general_string %s;\n", name);
break; break;
case TUTF8String: case TUTF8String:
space(level); space(level);