giomba
/
opensc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Space cleanups 

git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@2234 c6295689-39f2-0310-b995-f0e70906c6a9
This commit is contained in:
pisi 2005-03-09 10:47:01 +00:00
parent eb4717ea17
commit a1ffc6b72e
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/libopensc/asn1.c
View File

@ -123,20 +123,20 @@ void sc_copy_asn1_entry(const struct sc_asn1_entry *src,
size_t _sc_count_bit_string_size(const void * buf, size_t bufsize) size_t _sc_count_bit_string_size(const void * buf, size_t bufsize)
{ {
const u8 *p = (const u8 *) buf + bufsize - 1; const u8 *p = (const u8 *) buf + bufsize - 1;
u8 c; u8 c;
size_t skip = 0; size_t skip = 0;
int i; int i;
while (p >= (const u8 *) buf && *p == 0) { while (p >= (const u8 *) buf && *p == 0) {
skip += 8; skip += 8;
p--; p--;
} }
if (p < (const u8 *) buf) if (p < (const u8 *) buf)
return 0; return 0;
c = *p; c = *p;
for (i = 0; (c >> (7-i)) == 0; i++); for (i = 0; (c >> (7-i)) == 0; i++);
return bufsize * 8 - (skip + i); return bufsize * 8 - (skip + i);
} }
static void sc_asn1_print_octet_string(const u8 * buf, size_t buflen) static void sc_asn1_print_octet_string(const u8 * buf, size_t buflen)
@ -160,7 +160,7 @@ static void sc_asn1_print_integer(const u8 * buf, size_t buflen)
#ifndef _WIN32 #ifndef _WIN32
long long a = 0; long long a = 0;
#else #else
__int64 a = 0; __int64 a = 0;
#endif #endif
size_t i; size_t i;
@ -180,7 +180,7 @@ static void sc_asn1_print_bit_string(const u8 * buf, size_t buflen)
#ifndef _WIN32 #ifndef _WIN32
long long a = 0; long long a = 0;
#else #else
__int64 a = 0; __int64 a = 0;
#endif #endif
int r, i; int r, i;
@ -943,8 +943,8 @@ static int asn1_decode_entry(sc_context_t *ctx,struct sc_asn1_entry *entry,
} }
break; break;
case SC_ASN1_GENERALIZEDTIME: case SC_ASN1_GENERALIZEDTIME:
/* FIXME: we should parse the string and convert it /* FIXME: we should parse the string and convert it
into a standard ISO time string. */ into a standard ISO time string. */
if (parm != NULL) { if (parm != NULL) {
size_t c; size_t c;
assert(len != NULL); assert(len != NULL);
@ -1004,7 +1004,7 @@ static int asn1_decode_entry(sc_context_t *ctx,struct sc_asn1_entry *entry,
case SC_ASN1_ALGORITHM_ID: case SC_ASN1_ALGORITHM_ID:
if (entry->parm != NULL) if (entry->parm != NULL)
r = sc_asn1_decode_algorithm_id(ctx, obj, objlen, (struct sc_algorithm_id *) parm, depth); r = sc_asn1_decode_algorithm_id(ctx, obj, objlen, (struct sc_algorithm_id *) parm, depth);
break; break;
case SC_ASN1_CALLBACK: case SC_ASN1_CALLBACK:
if (entry->parm != NULL) if (entry->parm != NULL)
r = callback_func(ctx, entry->arg, obj, objlen, depth); r = callback_func(ctx, entry->arg, obj, objlen, depth);