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

prefix primitive types with der_

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@18441 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2006-10-14 05:26:36 +00:00
parent 9ed8bb8ea2
commit 40acdb8650
6 changed files with 40 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/asn1/der_cmp.c
View File

@@ -34,7 +34,7 @@
#include "der_locl.h" #include "der_locl.h"
int int
heim_oid_cmp(const heim_oid *p, const heim_oid *q) der_heim_oid_cmp(const heim_oid *p, const heim_oid *q)
{ {
if (p->length != q->length) if (p->length != q->length)
return p->length - q->length; return p->length - q->length;
@@ -44,7 +44,8 @@ heim_oid_cmp(const heim_oid *p, const heim_oid *q)
} }
int int
heim_octet_string_cmp(const heim_octet_string *p, const heim_octet_string *q) der_heim_octet_string_cmp(const heim_octet_string *p,
const heim_octet_string *q)
{ {
if (p->length != q->length) if (p->length != q->length)
return p->length - q->length; return p->length - q->length;
@@ -52,7 +53,8 @@ heim_octet_string_cmp(const heim_octet_string *p, const heim_octet_string *q)
} }
int int
heim_bit_string_cmp(const heim_bit_string *p, const heim_bit_string *q) der_heim_bit_string_cmp(const heim_bit_string *p,
const heim_bit_string *q)
{ {
int i, r1, r2; int i, r1, r2;
if (p->length != q->length) if (p->length != q->length)
@@ -72,7 +74,8 @@ heim_bit_string_cmp(const heim_bit_string *p, const heim_bit_string *q)
} }
int int
heim_integer_cmp(const heim_integer *p, const heim_integer *q) der_heim_integer_cmp(const heim_integer *p,
const heim_integer *q)
{ {
if (p->negative != q->negative) if (p->negative != q->negative)
return q->negative - p->negative; return q->negative - p->negative;
@@ -82,7 +85,7 @@ heim_integer_cmp(const heim_integer *p, const heim_integer *q)
} }
int int
heim_bmp_string_cmp(const heim_bmp_string *p, const heim_bmp_string *q) der_heim_bmp_string_cmp(const heim_bmp_string *p, const heim_bmp_string *q)
{ {
if (p->length != q->length) if (p->length != q->length)
return p->length - q->length; return p->length - q->length;
@@ -90,8 +93,8 @@ heim_bmp_string_cmp(const heim_bmp_string *p, const heim_bmp_string *q)
} }
int int
heim_universal_string_cmp(const heim_universal_string *p, der_heim_universal_string_cmp(const heim_universal_string *p,
const heim_universal_string *q) const heim_universal_string *q)
{ {
if (p->length != q->length) if (p->length != q->length)
return p->length - q->length; return p->length - q->length;

20
lib/asn1/der_free.c
View File

@@ -36,34 +36,34 @@
RCSID("$Id$"); RCSID("$Id$");
void void
free_general_string (heim_general_string *str) der_free_general_string (heim_general_string *str)
{ {
free(*str); free(*str);
*str = NULL; *str = NULL;
} }
void void
free_utf8string (heim_utf8_string *str) der_free_utf8string (heim_utf8_string *str)
{ {
free(*str); free(*str);
*str = NULL; *str = NULL;
} }
void void
free_printable_string (heim_printable_string *str) der_free_printable_string (heim_printable_string *str)
{ {
free(*str); free(*str);
*str = NULL; *str = NULL;
} }
void void
free_ia5_string (heim_ia5_string *str) der_free_ia5_string (heim_ia5_string *str)
{ {
free_general_string(str); free_general_string(str);
} }
void void
free_bmp_string (heim_bmp_string *k) der_free_bmp_string (heim_bmp_string *k)
{ {
free(k->data); free(k->data);
k->data = NULL; k->data = NULL;
@@ -71,7 +71,7 @@ free_bmp_string (heim_bmp_string *k)
} }
void void
free_universal_string (heim_universal_string *k) der_free_universal_string (heim_universal_string *k)
{ {
free(k->data); free(k->data);
k->data = NULL; k->data = NULL;
@@ -79,7 +79,7 @@ free_universal_string (heim_universal_string *k)
} }
void void
free_octet_string (heim_octet_string *k) der_free_octet_string (heim_octet_string *k)
{ {
free(k->data); free(k->data);
k->data = NULL; k->data = NULL;
@@ -87,7 +87,7 @@ free_octet_string (heim_octet_string *k)
} }
void void
free_heim_integer (heim_integer *k) der_free_heim_integer (heim_integer *k)
{ {
free(k->data); free(k->data);
k->data = NULL; k->data = NULL;
@@ -95,7 +95,7 @@ free_heim_integer (heim_integer *k)
} }
void void
free_oid (heim_oid *k) der_free_oid (heim_oid *k)
{ {
free(k->components); free(k->components);
k->components = NULL; k->components = NULL;
@@ -103,7 +103,7 @@ free_oid (heim_oid *k)
} }
void void
free_bit_string (heim_bit_string *k) der_free_bit_string (heim_bit_string *k)
{ {
free(k->data); free(k->data);
k->data = NULL; k->data = NULL;

34
lib/asn1/der_length.c
View File

@@ -98,7 +98,7 @@ len_oid (const heim_oid *oid)
} }
size_t size_t
length_len (size_t len) der_length_len (size_t len)
{ {
if (len < 128) if (len < 128)
return 1; return 1;
@@ -113,67 +113,67 @@ length_len (size_t len)
} }
size_t size_t
length_integer (const int *data) der_length_integer (const int *data)
{ {
return _heim_len_int (*data); return _heim_len_int (*data);
} }
size_t size_t
length_unsigned (const unsigned *data) der_length_unsigned (const unsigned *data)
{ {
return _heim_len_unsigned(*data); return _heim_len_unsigned(*data);
} }
size_t size_t
length_enumerated (const unsigned *data) der_length_enumerated (const unsigned *data)
{ {
return _heim_len_int (*data); return _heim_len_int (*data);
} }
size_t size_t
length_general_string (const heim_general_string *data) der_length_general_string (const heim_general_string *data)
{ {
return strlen(*data); return strlen(*data);
} }
size_t size_t
length_utf8string (const heim_utf8_string *data) der_length_utf8string (const heim_utf8_string *data)
{ {
return strlen(*data); return strlen(*data);
} }
size_t size_t
length_printable_string (const heim_printable_string *data) der_length_printable_string (const heim_printable_string *data)
{ {
return strlen(*data); return strlen(*data);
} }
size_t size_t
length_ia5_string (const heim_ia5_string *data) der_length_ia5_string (const heim_ia5_string *data)
{ {
return strlen(*data); return strlen(*data);
} }
size_t size_t
length_bmp_string (const heim_bmp_string *data) der_length_bmp_string (const heim_bmp_string *data)
{ {
return data->length * 2; return data->length * 2;
} }
size_t size_t
length_universal_string (const heim_universal_string *data) der_length_universal_string (const heim_universal_string *data)
{ {
return data->length * 4; return data->length * 4;
} }
size_t size_t
length_octet_string (const heim_octet_string *k) der_length_octet_string (const heim_octet_string *k)
{ {
return k->length; return k->length;
} }
size_t size_t
length_heim_integer (const heim_integer *k) der_length_heim_integer (const heim_integer *k)
{ {
if (k->length == 0) if (k->length == 0)
return 1; return 1;
@@ -184,13 +184,13 @@ length_heim_integer (const heim_integer *k)
} }
size_t size_t
length_oid (const heim_oid *k) der_length_oid (const heim_oid *k)
{ {
return len_oid (k); return len_oid (k);
} }
size_t size_t
length_generalized_time (const time_t *t) der_length_generalized_time (const time_t *t)
{ {
heim_octet_string k; heim_octet_string k;
size_t ret; size_t ret;
@@ -202,7 +202,7 @@ length_generalized_time (const time_t *t)
} }
size_t size_t
length_utctime (const time_t *t) der_length_utctime (const time_t *t)
{ {
heim_octet_string k; heim_octet_string k;
size_t ret; size_t ret;
@@ -214,13 +214,13 @@ length_utctime (const time_t *t)
} }
size_t size_t
length_boolean (const int *k) der_length_boolean (const int *k)
{ {
return 1; return 1;
} }
size_t size_t
length_bit_string (const heim_bit_string *k) der_length_bit_string (const heim_bit_string *k)
{ {
return (k->length + 7) / 8 + 1; return (k->length + 7) / 8 + 1;
} }

2
lib/asn1/gen_copy.c
View File

@@ -40,7 +40,7 @@ static int used_fail;
static void static void
copy_primitive (const char *typename, const char *from, const char *to) copy_primitive (const char *typename, const char *from, const char *to)
{ {
fprintf (codefile, "if(copy_%s(%s, %s)) goto fail;\n", fprintf (codefile, "if(der_copy_%s(%s, %s)) goto fail;\n",
typename, from, to); typename, from, to);
used_fail++; used_fail++;
} }

2
lib/asn1/gen_free.c
View File

@@ -38,7 +38,7 @@ RCSID("$Id$");
static void static void
free_primitive (const char *typename, const char *name) free_primitive (const char *typename, const char *name)
{ {
fprintf (codefile, "free_%s(%s);\n", typename, name); fprintf (codefile, "der_free_%s(%s);\n", typename, name);
} }
static void static void

2
lib/asn1/gen_length.c
View File

@@ -40,7 +40,7 @@ length_primitive (const char *typename,
const char *name, const char *name,
const char *variable) const char *variable)
{ {
fprintf (codefile, "%s += length_%s(%s);\n", variable, typename, name); fprintf (codefile, "%s += der_length_%s(%s);\n", variable, typename, name);
} }
static size_t static size_t