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

1.28.2.16: (der_get_oid): handle all oid components being smaller then

Browse Source 
127 and allocate one extra element since first byte is split to to
elements.


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@13735 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2004-04-21 00:53:58 +00:00
parent 21139ee8f0
commit 8b7d2a4dc4
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/asn1/der_get.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1997 - 2002 Kungliga Tekniska H<>gskolan * Copyright (c) 1997 - 2004 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden). * (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved. * All rights reserved.
* *
@@ -162,8 +162,8 @@ der_get_oid (const unsigned char *p, size_t len,
if (len < 1) if (len < 1)
return ASN1_OVERRUN; return ASN1_OVERRUN;
data->components = malloc(len * sizeof(*data->components)); data->components = malloc((len + 1) * sizeof(*data->components));
if (data->components == NULL && len != 0) if (data->components == NULL)
return ENOMEM; return ENOMEM;
data->components[0] = (*p) / 40; data->components[0] = (*p) / 40;
data->components[1] = (*p) % 40; data->components[1] = (*p) % 40;
@@ -178,7 +178,7 @@ der_get_oid (const unsigned char *p, size_t len,
} while (len > 0 && p[-1] & 0x80); } while (len > 0 && p[-1] & 0x80);
data->components[n] = u; data->components[n] = u;
} }
if (p[-1] & 0x80) { if (len > 0 && p[-1] & 0x80) {
free_oid (data); free_oid (data);
return ASN1_OVERRUN; return ASN1_OVERRUN;
} }