diff options
| author | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2015-04-28 14:31:08 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2015-04-28 14:31:08 +0200 |
| commit | d0148e33b291002f313e811fece0e276002164d7 (patch) | |
| tree | 6a5696abb2f776edef0d424285ddd7f8df61abda | |
| parent | d9c4ce676d140a63ae0ebd719d67e85ea13eea6b (diff) | |
| download | gnutls-d0148e33b291002f313e811fece0e276002164d7.tar.gz | |
updated minitasn1
| -rw-r--r-- | lib/minitasn1/decoding.c | 3 | ||||
| -rw-r--r-- | lib/minitasn1/libtasn1.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/minitasn1/decoding.c b/lib/minitasn1/decoding.c index 7fbd93160f..42ddc6be03 100644 --- a/lib/minitasn1/decoding.c +++ b/lib/minitasn1/decoding.c @@ -732,6 +732,7 @@ _asn1_extract_der_octet (asn1_node node, const unsigned char *der, return ASN1_DER_ERROR; counter = len3 + 1; + DECR_LEN(der_len, len3); if (len2 == -1) counter_end = der_len - 2; @@ -740,6 +741,7 @@ _asn1_extract_der_octet (asn1_node node, const unsigned char *der, while (counter < counter_end) { + DECR_LEN(der_len, 1); len2 = asn1_get_length_der (der + counter, der_len, &len3); if (IS_ERR(len2, flags)) @@ -764,7 +766,6 @@ _asn1_extract_der_octet (asn1_node node, const unsigned char *der, len2 = 0; } - DECR_LEN(der_len, 1); counter += len2 + len3 + 1; } diff --git a/lib/minitasn1/libtasn1.h b/lib/minitasn1/libtasn1.h index c0632c3b7f..53cec5e6a1 100644 --- a/lib/minitasn1/libtasn1.h +++ b/lib/minitasn1/libtasn1.h @@ -44,7 +44,7 @@ extern "C" { #endif -#define ASN1_VERSION "4.3" +#define ASN1_VERSION "4.4" #if defined(__GNUC__) && !defined(ASN1_INTERNAL_BUILD) # define _ASN1_GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) |