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

(der_put_unsigned): new function

Browse Source 
(der_put_int): handle signed integers


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@5348 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1999-02-13 16:14:53 +00:00
parent 90737baeff
commit 65ffbd5e29
1 changed files with 45 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
lib/asn1/der_put.c
View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 1997 Kungliga Tekniska H<>gskolan
* Copyright (c) 1997, 1998, 1999 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved.
*
@@ -47,8 +47,8 @@ RCSID("$Id$");
* indicating how many actually got written, or <0 in case of errors.
*/
int
der_put_int (unsigned char *p, size_t len, unsigned val, size_t *size)
static int
der_put_unsigned (unsigned char *p, size_t len, unsigned val, size_t *size)
{
unsigned char *base = p;
@@ -58,7 +58,7 @@ der_put_int (unsigned char *p, size_t len, unsigned val, size_t *size)
val /= 256;
--len;
}
if (val)
if (val != 0)
return ASN1_OVERFLOW;
else {
*size = base - p;
@@ -67,7 +67,44 @@ der_put_int (unsigned char *p, size_t len, unsigned val, size_t *size)
} else if (len < 1)
return ASN1_OVERFLOW;
else {
*p = 0;
*p = 0;
*size = 1;
return 0;
}
}
int
der_put_int (unsigned char *p, size_t len, int val, size_t *size)
{
unsigned char *base = p;
if (val) {
while (len > 0 && abs(val) > 255) {
*p-- = val % 256;
val /= 256;
--len;
}
if (len > 0 && abs(val) > 0) {
*p-- = val;
--len;
if ((signed char)val != val) {
if (len < 1)
return ASN1_OVERFLOW;
*p-- = (val < 0) ? 0xff: 0;
--len;
}
val /= 256;
}
if (val != 0)
return ASN1_OVERFLOW;
else {
*size = base - p;
return 0;
}
} else if (len < 1)
return ASN1_OVERFLOW;
else {
*p = 0;
*size = 1;
return 0;
}
@@ -88,7 +125,7 @@ der_put_length (unsigned char *p, size_t len, size_t val, size_t *size)
size_t l;
int e;
e = der_put_int (p, len - 1, val, &l);
e = der_put_unsigned (p, len - 1, val, &l);
if (e)
return e;
p -= l;
@@ -173,9 +210,9 @@ der_put_length_and_tag (unsigned char *p, size_t len, size_t len_val,
}
int
encode_integer (unsigned char *p, size_t len, unsigned *data, size_t *size)
encode_integer (unsigned char *p, size_t len, int *data, size_t *size)
{
unsigned num = *data;
int num = *data;
size_t ret = 0;
size_t l;
int e;