summaryrefslogtreecommitdiff
path: root/lib/minitasn1/decoding.c
diff options
context:
space:
mode:
authorSimon Josefsson <simon@josefsson.org>2011-10-25 20:31:39 +0200
committerSimon Josefsson <simon@josefsson.org>2011-10-25 20:31:39 +0200
commitc9e0c70d588e0f80d313d13a9ad5f44f62546d9c (patch)
treebd0e5911f12d02e943e78c597045edd2d3942aba /lib/minitasn1/decoding.c
parent5a110e397e7dc01f7c557ec63811be08ecaa28e7 (diff)
downloadgnutls-c9e0c70d588e0f80d313d13a9ad5f44f62546d9c.tar.gz
Update to libtasn1 2.10.
Diffstat (limited to 'lib/minitasn1/decoding.c')
-rw-r--r--lib/minitasn1/decoding.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/minitasn1/decoding.c b/lib/minitasn1/decoding.c
index ae32c98b03..3849375d07 100644
--- a/lib/minitasn1/decoding.c
+++ b/lib/minitasn1/decoding.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2002, 2004, 2006, 2008, 2009, 2010 Free Software
+ * Copyright (C) 2002, 2004, 2006, 2008, 2009, 2010, 2011 Free Software
* Foundation, Inc.
*
* This file is part of LIBTASN1.
@@ -168,7 +168,7 @@ asn1_get_tag_der (const unsigned char *der, int der_len,
* asn1_get_length_der() is that this function will return a length
* even if the value has indefinite encoding.
*
- * Returns: Return the decoded length value, or negative error code when
+ * Returns: Return the decoded length value, or negative value when
* the value was too big.
*
* Since: 2.0
@@ -1367,7 +1367,7 @@ asn1_der_decoding_element (ASN1_TYPE * structure, const char *elementName,
char temp[128], currentName[ASN1_MAX_NAME_SIZE * 10], *dot_p, *char_p;
int nameLen = ASN1_MAX_NAME_SIZE * 10 - 1, state;
int counter, len2, len3, len4, move, ris, tlen;
- unsigned char class, *temp2;
+ unsigned char class;
unsigned long tag;
int indefinite, result;
const unsigned char *der = ider;
@@ -1921,7 +1921,6 @@ asn1_der_decoding_element (ASN1_TYPE * structure, const char *elementName,
if (state == FOUND)
{
_asn1_set_value_octet (p, der + counter, len2 + len3);
- temp2 = NULL;
if (p == nodeFound)
state = EXIT;