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

(der_get_length): fix test of len

Browse Source 
(der_get_tag): more type correctness


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@5210 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1998-11-21 22:14:42 +00:00
parent 085021aea2
commit 25ecde8225
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/asn1/der_get.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1997 Kungliga Tekniska H<>gskolan * Copyright (c) 1997, 1998 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden). * (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved. * All rights reserved.
* *
@@ -74,8 +74,9 @@ der_get_length (unsigned char *p, size_t len, size_t *val, size_t *size)
{ {
size_t v; size_t v;
if (--len < 0) if (len <= 0)
return ASN1_OVERRUN; return ASN1_OVERRUN;
--len;
v = *p++; v = *p++;
if (v < 128) { if (v < 128) {
*val = v; *val = v;
@@ -153,8 +154,8 @@ der_get_tag (unsigned char *p, size_t len, Der_class *class, Der_type *type,
{ {
if (len < 1) if (len < 1)
return ASN1_OVERRUN; return ASN1_OVERRUN;
*class = ((*p) >> 6) & 0x03; *class = (Der_class)(((*p) >> 6) & 0x03);
*type = ((*p) >> 5) & 0x01; *type = (Der_type)(((*p) >> 5) & 0x01);
*tag = (*p) & 0x1F; *tag = (*p) & 0x1F;
if(size) *size = 1; if(size) *size = 1;
return 0; return 0;