diff options
| author | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2017-05-01 12:44:46 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2017-05-01 12:52:20 +0200 |
| commit | 8f981f0373fd3484659a5b0452306d01e13fc26d (patch) | |
| tree | 35d52251d36ca224ec0bd827da8bb9e5e9f5dcff | |
| parent | 162a35176ecb5189177be5dfcba267924758ca53 (diff) | |
| download | gnutls-8f981f0373fd3484659a5b0452306d01e13fc26d.tar.gz | |
updated minitasn1
Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>
| -rw-r--r-- | lib/minitasn1/decoding.c | 6 | ||||
| -rw-r--r-- | lib/minitasn1/errors.c | 1 | ||||
| -rw-r--r-- | lib/minitasn1/libtasn1.h | 1 |
3 files changed, 5 insertions, 3 deletions
diff --git a/lib/minitasn1/decoding.c b/lib/minitasn1/decoding.c index 2abff57f14..fcf3aff0a3 100644 --- a/lib/minitasn1/decoding.c +++ b/lib/minitasn1/decoding.c @@ -329,7 +329,7 @@ _asn1_get_time_der (unsigned type, const unsigned char *der, int der_len, int *r if (str_len < 8) { warn(); - return ASN1_DER_ERROR; + return ASN1_TIME_ENCODING_ERROR; } if (flags & ASN1_DECODE_FLAG_STRICT_DER) @@ -359,14 +359,14 @@ _asn1_get_time_der (unsigned type, const unsigned char *der, int der_len, int *r } warn(); - return ASN1_DER_ERROR; + return ASN1_TIME_ENCODING_ERROR; } } if (sign_count == 0 && p[str_len-1] != 'Z') { warn(); - return ASN1_DER_ERROR; + return ASN1_TIME_ENCODING_ERROR; } } memcpy (str, der + len_len, str_len); diff --git a/lib/minitasn1/errors.c b/lib/minitasn1/errors.c index e9fa302605..fef45ae742 100644 --- a/lib/minitasn1/errors.c +++ b/lib/minitasn1/errors.c @@ -52,6 +52,7 @@ static const libtasn1_error_entry error_algorithms[] = { LIBTASN1_ERROR_ENTRY (ASN1_NAME_TOO_LONG), LIBTASN1_ERROR_ENTRY (ASN1_ARRAY_ERROR), LIBTASN1_ERROR_ENTRY (ASN1_ELEMENT_NOT_EMPTY), + LIBTASN1_ERROR_ENTRY (ASN1_TIME_ENCODING_ERROR), {0, 0} }; diff --git a/lib/minitasn1/libtasn1.h b/lib/minitasn1/libtasn1.h index 4ad01e78d9..0d6203d273 100644 --- a/lib/minitasn1/libtasn1.h +++ b/lib/minitasn1/libtasn1.h @@ -78,6 +78,7 @@ extern "C" #define ASN1_NAME_TOO_LONG 15 #define ASN1_ARRAY_ERROR 16 #define ASN1_ELEMENT_NOT_EMPTY 17 +#define ASN1_TIME_ENCODING_ERROR 18 /*************************************/ /* Constants used in asn1_visit_tree */ |