diff options
| author | Simon Josefsson <simon@josefsson.org> | 2006-10-19 19:59:06 +0000 |
|---|---|---|
| committer | Simon Josefsson <simon@josefsson.org> | 2006-10-19 19:59:06 +0000 |
| commit | 1e81cb94acf734540f96ef8e637ea348e15e14cf (patch) | |
| tree | 0519f141e8380b423881ea5b7094d681a41b58be /lib/minitasn1 | |
| parent | ea3b12e62aedb67f6a4be14e0f3cbeeb76642844 (diff) | |
| download | gnutls-1e81cb94acf734540f96ef8e637ea348e15e14cf.tar.gz | |
Update to 0.3.7.
Diffstat (limited to 'lib/minitasn1')
| -rw-r--r-- | lib/minitasn1/coding.c | 3 | ||||
| -rw-r--r-- | lib/minitasn1/decoding.c | 6 | ||||
| -rw-r--r-- | lib/minitasn1/libtasn1.h | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/lib/minitasn1/coding.c b/lib/minitasn1/coding.c index 206b8c0c5f..cd646c7822 100644 --- a/lib/minitasn1/coding.c +++ b/lib/minitasn1/coding.c @@ -913,7 +913,8 @@ asn1_der_coding (ASN1_TYPE element, const char *name, void *ider, int *len, case TYPE_NULL: max_len--; if (max_len >= 0) - der[counter++] = 0; + der[counter] = 0; + counter++; move = RIGHT; break; case TYPE_BOOLEAN: diff --git a/lib/minitasn1/decoding.c b/lib/minitasn1/decoding.c index 3df85318e6..5d51a4e37f 100644 --- a/lib/minitasn1/decoding.c +++ b/lib/minitasn1/decoding.c @@ -107,7 +107,7 @@ asn1_get_length_der (const unsigned char *der, int der_len, int *len) * asn1_get_tag_der: * @der: DER data to decode. * @der_len: Length of DER data to decode. - * @class: Output variable containing decoded class. + * @cls: Output variable containing decoded class. * @len: Output variable containing the length of the DER TAG data. * @tag: Output variable containing the decoded tag. * @@ -117,14 +117,14 @@ asn1_get_length_der (const unsigned char *der, int der_len, int *len) **/ int asn1_get_tag_der (const unsigned char *der, int der_len, - unsigned char *class, int *len, unsigned long *tag) + unsigned char *cls, int *len, unsigned long *tag) { int punt, ris; if (der == NULL || der_len <= 0 || len == NULL) return ASN1_DER_ERROR; - *class = der[0] & 0xE0; + *cls = der[0] & 0xE0; if ((der[0] & 0x1F) != 0x1F) { /* short form */ diff --git a/lib/minitasn1/libtasn1.h b/lib/minitasn1/libtasn1.h index c539cdd79a..00a2208368 100644 --- a/lib/minitasn1/libtasn1.h +++ b/lib/minitasn1/libtasn1.h @@ -31,7 +31,7 @@ extern "C" { #endif -#define LIBTASN1_VERSION "0.3.5" +#define LIBTASN1_VERSION "0.3.7" #include <sys/types.h> #include <time.h> |