[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU libtasn1 branch, master, updated. libtasn1_2_11-31-g95ed3fd
|
From: |
Simon Josefsson |
|
Subject: |
[SCM] GNU libtasn1 branch, master, updated. libtasn1_2_11-31-g95ed3fd |
|
Date: |
Mon, 19 Mar 2012 09:47:01 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU libtasn1".
http://git.savannah.gnu.org/cgit/libtasn1.git/commit/?id=95ed3fdda525edd37ce0ea8eaf255a9b1563a25b
The branch, master has been updated
via 95ed3fdda525edd37ce0ea8eaf255a9b1563a25b (commit)
via fb467377da305fb0afd5326e32f5654dfd816705 (commit)
via e4c605d4c575d9f56f44970fdf3bee567b8fac18 (commit)
via 8ab3a5231ef83834a17818edf2f2b1911b02bb05 (commit)
from 41faef165ea348b50f4deb625de0479ae3a05126 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 95ed3fdda525edd37ce0ea8eaf255a9b1563a25b
Author: Simon Josefsson <address@hidden>
Date: Mon Mar 19 10:46:50 2012 +0100
Generated.
commit fb467377da305fb0afd5326e32f5654dfd816705
Author: Simon Josefsson <address@hidden>
Date: Mon Mar 19 10:39:00 2012 +0100
Version 2.12.
commit e4c605d4c575d9f56f44970fdf3bee567b8fac18
Author: Simon Josefsson <address@hidden>
Date: Mon Mar 19 10:14:19 2012 +0100
Indent code.
commit 8ab3a5231ef83834a17818edf2f2b1911b02bb05
Author: Simon Josefsson <address@hidden>
Date: Mon Mar 19 10:12:41 2012 +0100
Update gnulib files.
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 199 ++++++++++++++++++++++++++++++++++++++++-
NEWS | 2 +-
build-aux/gnupload | 2 +-
examples/CertificateExample.c | 8 +-
lib/coding.c | 4 +-
lib/decoding.c | 92 ++++++++++----------
lib/errors.c | 2 +-
lib/int.h | 4 +-
lib/parser_aux.c | 3 +-
lib/version.c | 2 +-
maint.mk | 3 +-
src/asn1Coding.c | 7 +-
src/asn1Decoding.c | 4 +-
src/asn1Parser.c | 4 +-
tests/Test_overflow.c | 6 +-
tests/Test_simple.c | 83 +++++++++---------
16 files changed, 312 insertions(+), 113 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 21e9088..b8c15c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,199 @@
+2012-03-19 Simon Josefsson <address@hidden>
+
+ * NEWS: Version 2.12.
+
+2012-03-19 Simon Josefsson <address@hidden>
+
+ * examples/CertificateExample.c, lib/coding.c, lib/decoding.c,
+ lib/errors.c, lib/int.h, lib/parser_aux.c, lib/version.c,
+ src/asn1Coding.c, src/asn1Decoding.c, src/asn1Parser.c,
+ tests/Test_overflow.c, tests/Test_simple.c: Indent code.
+
+2012-03-19 Simon Josefsson <address@hidden>
+
+ * build-aux/gnupload, maint.mk: Update gnulib files.
+
+2012-03-14 Simon Josefsson <address@hidden>
+
+ * THANKS: Give credit.
+
+2012-03-14 Simon Josefsson <address@hidden>
+
+ * NEWS: Mention severity.
+
+2012-03-14 Simon Josefsson <address@hidden>
+
+ * .gitignore, lib/coding.c, lib/decoding.c, lib/libtasn1.h,
+ tests/Test_overflow.c: Simplify overflow check.
+
+2012-03-13 Simon Josefsson <address@hidden>
+
+ * NEWS, tests/Makefile.am, tests/Test_overflow.c: Add self-check.
+
+2012-03-13 Nikos Mavrogiannopoulos <address@hidden>
+
+ * lib/decoding.c: for some reason the tot < 0 test wasn't successful
+ on negative results. Replaced with tot < ret.
+
+2012-03-13 Nikos Mavrogiannopoulos <address@hidden>
+
+ * NEWS: the change was reverted
+
+2012-03-13 Nikos Mavrogiannopoulos <address@hidden>
+
+ * configure.ac: reverted to the old ABI.
+
+2012-03-13 Nikos Mavrogiannopoulos <address@hidden>
+
+ * lib/coding.c, lib/decoding.c, lib/libtasn1.h: reverted to the old
+ ABI.
+
+2012-03-13 Nikos Mavrogiannopoulos <address@hidden>
+
+ * NEWS: documented fix
+
+2012-03-13 Nikos Mavrogiannopoulos <address@hidden>
+
+ * lib/decoding.c: check for overflows
+
+2012-03-13 Nikos Mavrogiannopoulos <address@hidden>
+
+ * lib/decoding.c, lib/libtasn1.h: int is signed.
+
+2012-03-13 Nikos Mavrogiannopoulos <address@hidden>
+
+ * configure.ac: bumped shared lib version
+
+2012-03-04 Nikos Mavrogiannopoulos <address@hidden>
+
+ * lib/decoding.c: Added asn1_get_length_der_checked() to put some of
+ the common checks in a single function.
+
+2012-03-04 Nikos Mavrogiannopoulos <address@hidden>
+
+ * lib/decoding.c: cleanups in asn1_der_decoding_element().
+
+2012-03-04 Nikos Mavrogiannopoulos <address@hidden>
+
+ * NEWS, lib/coding.c, lib/decoding.c, lib/libtasn1.h: API is based
+ on integers instead of long to prevent errors in systems where
+ sizeof(int)!=sizeof(long)
+
+2012-03-04 Nikos Mavrogiannopoulos <address@hidden>
+
+ * lib/decoding.c: asn1_get_length_der() may handle up to signed long
+ values.
+
+2012-03-04 Nikos Mavrogiannopoulos <address@hidden>
+
+ * lib/ASN1.c: updated to bison 2.5
+
+2012-03-04 Nikos Mavrogiannopoulos <address@hidden>
+
+ * lib/decoding.c: better cleanup in decoding.
+
+2012-03-09 Simon Josefsson <address@hidden>
+
+ * NEWS: Add.
+
+2012-03-07 Simon Josefsson <address@hidden>
+
+ * GNUmakefile, NEWS, build-aux/update-copyright, gl/errno.in.h,
+ gl/gettext.h, gl/lseek.c, gl/malloc.c, gl/msvc-inval.c,
+ gl/msvc-inval.h, gl/msvc-nothrow.c, gl/msvc-nothrow.h,
+ gl/read-file.c, gl/read-file.h, gl/stdarg.in.h, gl/stddef.in.h,
+ gl/stdint.in.h, gl/stdio-impl.h, gl/stdio.in.h, gl/sys_stat.in.h,
+ gl/time.in.h, gl/unistd.in.h, gl/version-etc.h,
+ lib/gllib/stddef.in.h, lib/gllib/stdint.in.h,
+ lib/gllib/string.in.h, lib/gllib/strverscmp.c, maint.mk: Update
+ gnulib files.
+
+2012-01-23 Simon Josefsson <address@hidden>
+
+ * .clcopying, AUTHORS, Makefile.am, NEWS, README, README-alpha,
+ THANKS, cfg.mk, configure.ac, doc/Makefile.am, doc/TODO,
+ doc/cyclo/Makefile.am, doc/libtasn1.texi,
+ examples/CertificateExample.c, examples/CrlExample.c,
+ examples/Makefile.am, examples/asn1Coding_test.asn,
+ examples/pkix.asn, lib/ASN1.y, lib/Makefile.am, lib/coding.c,
+ lib/decoding.c, lib/element.c, lib/element.h, lib/errors.c,
+ lib/gstr.c, lib/gstr.h, lib/int.h, lib/libtasn1.h,
+ lib/libtasn1.map, lib/libtasn1.pc.in, lib/parser_aux.c,
+ lib/parser_aux.h, lib/structure.c, lib/structure.h, lib/version.c,
+ m4/update-header-version.m4, src/Makefile.am, src/asn1Coding.c,
+ src/asn1Decoding.c, src/asn1Parser.c, tests/Makefile.am,
+ tests/Test_encoding.asn, tests/Test_encoding.c,
+ tests/Test_errors.c, tests/Test_indefinite.c,
+ tests/Test_parser.asn, tests/Test_parser.c, tests/Test_simple.c,
+ tests/Test_tree.asn, tests/Test_tree.c, tests/crlf, tests/pkix.asn,
+ tests/threadsafety: Bump copyright years.
+
+2012-01-23 Simon Josefsson <address@hidden>
+
+ * GNUmakefile, build-aux/gnupload, build-aux/pmccabe.css,
+ build-aux/pmccabe2html, build-aux/snippet/arg-nonnull.h,
+ build-aux/snippet/c++defs.h, build-aux/snippet/warn-on-use.h,
+ build-aux/update-copyright, build-aux/useless-if-before-free,
+ build-aux/vc-list-files, doc/fdl-1.3.texi, doc/gendocs_template,
+ gl/Makefile.am, gl/errno.in.h, gl/fstat.c, gl/ftell.c, gl/ftello.c,
+ gl/getopt.c, gl/getopt.in.h, gl/getopt1.c, gl/getopt_int.h,
+ gl/gettext.h, gl/lseek.c, gl/m4/00gnulib.m4, gl/m4/autobuild.m4,
+ gl/m4/errno_h.m4, gl/m4/extensions.m4, gl/m4/fseeko.m4,
+ gl/m4/fstat.m4, gl/m4/ftell.m4, gl/m4/ftello.m4, gl/m4/getopt.m4,
+ gl/m4/gnulib-cache.m4, gl/m4/gnulib-common.m4,
+ gl/m4/gnulib-comp.m4, gl/m4/gnulib-tool.m4, gl/m4/include_next.m4,
+ gl/m4/largefile.m4, gl/m4/longlong.m4, gl/m4/lseek.m4,
+ gl/m4/malloc.m4, gl/m4/manywarnings.m4, gl/m4/msvc-inval.m4,
+ gl/m4/msvc-nothrow.m4, gl/m4/multiarch.m4, gl/m4/nocrash.m4,
+ gl/m4/read-file.m4, gl/m4/realloc.m4, gl/m4/ssize_t.m4,
+ gl/m4/stdarg.m4, gl/m4/stddef_h.m4, gl/m4/stdint.m4,
+ gl/m4/stdio_h.m4, gl/m4/stdlib_h.m4, gl/m4/sys_stat_h.m4,
+ gl/m4/time_h.m4, gl/m4/unistd_h.m4, gl/m4/valgrind-tests.m4,
+ gl/m4/version-etc.m4, gl/m4/warn-on-use.m4, gl/m4/warnings.m4,
+ gl/m4/wchar_t.m4, gl/malloc.c, gl/msvc-inval.c, gl/msvc-inval.h,
+ gl/msvc-nothrow.c, gl/msvc-nothrow.h, gl/progname.c, gl/progname.h,
+ gl/read-file.c, gl/read-file.h, gl/realloc.c, gl/stdarg.in.h,
+ gl/stddef.in.h, gl/stdint.in.h, gl/stdio-impl.h, gl/stdio.in.h,
+ gl/stdlib.in.h, gl/sys_stat.in.h, gl/time.in.h, gl/unistd.in.h,
+ gl/version-etc-fsf.c, gl/version-etc.c, gl/version-etc.h,
+ lib/gllib/Makefile.am, lib/gllib/dummy.c, lib/gllib/stddef.in.h,
+ lib/gllib/stdint.in.h, lib/gllib/string.in.h,
+ lib/gllib/strverscmp.c, lib/glm4/00gnulib.m4,
+ lib/glm4/extensions.m4, lib/glm4/gnulib-cache.m4,
+ lib/glm4/gnulib-common.m4, lib/glm4/gnulib-comp.m4,
+ lib/glm4/gnulib-tool.m4, lib/glm4/include_next.m4,
+ lib/glm4/ld-version-script.m4, lib/glm4/longlong.m4,
+ lib/glm4/multiarch.m4, lib/glm4/stddef_h.m4, lib/glm4/stdint.m4,
+ lib/glm4/string_h.m4, lib/glm4/strverscmp.m4,
+ lib/glm4/visibility.m4, lib/glm4/warn-on-use.m4,
+ lib/glm4/wchar_t.m4, maint.mk: Update gnulib files.
+
+2011-12-06 Simon Josefsson <address@hidden>
+
+ * gl/Makefile.am, gl/m4/getopt.m4, gl/m4/gnulib-comp.m4,
+ gl/m4/manywarnings.m4, gl/m4/unistd_h.m4, gl/unistd.in.h, maint.mk:
+ Update gnulib files.
+
+2011-12-06 Simon Josefsson <address@hidden>
+
+ * configure.ac: Drop unnecessary configure.ac checks.
+
+2011-12-06 Simon Josefsson <address@hidden>
+
+ * NEWS, configure.ac, lib/libtasn1.h: Bump versions.
+
+2011-11-25 Simon Josefsson <address@hidden>
+
+ * doc/announce.txt: Update for 2.11.
+
+2011-11-25 Simon Josefsson <address@hidden>
+
+ * doc/announce.txt: Update for 2.10.
+
+2011-11-25 Simon Josefsson <address@hidden>
+
+ * ChangeLog: Generated.
+
2011-11-25 Simon Josefsson <address@hidden>
* NEWS: Version 2.11.
@@ -4264,8 +4460,7 @@
* Initial revision
----------------------------------------------------------------------
- Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2010,
- 2011 Free Software Foundation, Inc.
+ Copyright (C) 2002-2012 Free Software Foundation, Inc.
Copying and distribution of this file, with or without modification,
are permitted in any medium without royalty provided the copyright
notice and this notice are preserved.
diff --git a/NEWS b/NEWS
index 2037055..48c2528 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
GNU Libtasn1 NEWS -*- outline -*-
-* Noteworthy changes in release 2.12 (????-??-??) [?]
+* Noteworthy changes in release 2.12 (2012-03-19) [stable]
- Cleanup license headers.
- build: Update gnulib files.
- Corrected DER decoding issue (reported by Matthew Hall).
diff --git a/build-aux/gnupload b/build-aux/gnupload
index eb450a0..40a59d3 100755
--- a/build-aux/gnupload
+++ b/build-aux/gnupload
@@ -3,7 +3,7 @@
scriptversion=2012-01-15.15; # UTC
-# Copyright (C) 2004-2010, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2004-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/examples/CertificateExample.c b/examples/CertificateExample.c
index 9972467..cd45f97 100644
--- a/examples/CertificateExample.c
+++ b/examples/CertificateExample.c
@@ -447,11 +447,11 @@ create_certificate (ASN1_TYPE cert_def, unsigned char
*der, int *der_len)
str, 1);
result =
asn1_create_element (cert_def, "PKIX1Implicit88.Dss-Parms", ¶m);
- str2 = (const unsigned char *) "\xd4\x38"; /* only an example */
+ str2 = (const unsigned char *) "\xd4\x38"; /* only an example */
result = asn1_write_value (param, "p", str2, 128);
- str2 = (const unsigned char *) "\xd4\x38"; /* only an example */
+ str2 = (const unsigned char *) "\xd4\x38"; /* only an example */
result = asn1_write_value (param, "q", str2, 20);
- str2 = (const unsigned char *) "\xd4\x38"; /* only an example */
+ str2 = (const unsigned char *) "\xd4\x38"; /* only an example */
result = asn1_write_value (param, "g", str2, 128);
*der_len = max_len;
result = asn1_der_coding (param, "", der, der_len, errorDescription);
@@ -463,7 +463,7 @@ create_certificate (ASN1_TYPE cert_def, unsigned char *der,
int *der_len)
/* subjectPublicKey */
- str2 = (const unsigned char *) "\x02\x81"; /* only an example */
+ str2 = (const unsigned char *) "\x02\x81"; /* only an example */
result =
asn1_write_value (cert1,
"tbsCertificate.subjectPublicKeyInfo.subjectPublicKey",
diff --git a/lib/coding.c b/lib/coding.c
index 8b72eba..307dd40 100644
--- a/lib/coding.c
+++ b/lib/coding.c
@@ -256,7 +256,7 @@ _asn1_objectid_der (unsigned char *str, unsigned char *der,
int *der_len)
char *temp, *n_end, *n_start;
unsigned char bit7;
unsigned long val, val1 = 0;
- int str_len = _asn1_strlen(str);
+ int str_len = _asn1_strlen (str);
max_len = *der_len;
@@ -266,7 +266,7 @@ _asn1_objectid_der (unsigned char *str, unsigned char *der,
int *der_len)
memcpy (temp, str, str_len);
temp[str_len] = '.';
- temp[str_len+1] = 0;
+ temp[str_len + 1] = 0;
counter = 0;
n_start = temp;
diff --git a/lib/decoding.c b/lib/decoding.c
index 968fa96..eaca0d2 100644
--- a/lib/decoding.c
+++ b/lib/decoding.c
@@ -1031,10 +1031,10 @@ asn1_der_decoding (ASN1_TYPE * element, const void
*ider, int len,
len2 =
asn1_get_length_der (der + counter, len - counter, &len3);
if (len2 < 0)
- {
+ {
result = ASN1_DER_ERROR;
goto cleanup;
- }
+ }
_asn1_set_value (p, der + counter, len3 + len2);
counter += len3 + len2;
@@ -1045,7 +1045,7 @@ asn1_der_decoding (ASN1_TYPE * element, const void *ider,
int len,
_asn1_get_objectid_der (der + counter, len - counter, &len2,
temp, sizeof (temp));
if (result != ASN1_SUCCESS)
- goto cleanup;
+ goto cleanup;
tlen = strlen (temp);
if (tlen > 0)
@@ -1070,7 +1070,7 @@ asn1_der_decoding (ASN1_TYPE * element, const void *ider,
int len,
len3 = len - counter;
result = _asn1_get_octet_string (der + counter, p, &len3);
if (result != ASN1_SUCCESS)
- goto cleanup;
+ goto cleanup;
counter += len3;
move = RIGHT;
@@ -1079,10 +1079,10 @@ asn1_der_decoding (ASN1_TYPE * element, const void
*ider, int len,
len2 =
asn1_get_length_der (der + counter, len - counter, &len3);
if (len2 < 0)
- {
+ {
result = ASN1_DER_ERROR;
goto cleanup;
- }
+ }
_asn1_set_value (p, der + counter, len3 + len2);
counter += len3 + len2;
@@ -1092,10 +1092,10 @@ asn1_der_decoding (ASN1_TYPE * element, const void
*ider, int len,
len2 =
asn1_get_length_der (der + counter, len - counter, &len3);
if (len2 < 0)
- {
+ {
result = ASN1_DER_ERROR;
goto cleanup;
- }
+ }
_asn1_set_value (p, der + counter, len3 + len2);
counter += len3 + len2;
@@ -1118,10 +1118,10 @@ asn1_der_decoding (ASN1_TYPE * element, const void
*ider, int len,
}
}
else
- {
+ {
result = ASN1_DER_ERROR;
goto cleanup;
- }
+ }
counter += 2;
}
else
@@ -1142,7 +1142,7 @@ asn1_der_decoding (ASN1_TYPE * element, const void *ider,
int len,
{
result = ASN1_DER_ERROR;
goto cleanup;
- }
+ }
counter += len2;
if (len3 > 0)
{
@@ -1183,10 +1183,10 @@ asn1_der_decoding (ASN1_TYPE * element, const void
*ider, int len,
if (len2 == -1)
{ /* indefinite length method */
if ((counter + 2) > len)
- {
+ {
result = ASN1_DER_ERROR;
goto cleanup;
- }
+ }
if ((der[counter]) || der[counter + 1])
{
@@ -1227,7 +1227,7 @@ asn1_der_decoding (ASN1_TYPE * element, const void *ider,
int len,
{
result = ASN1_DER_ERROR;
goto cleanup;
- }
+ }
counter += len2;
if (len3)
{
@@ -1258,24 +1258,24 @@ asn1_der_decoding (ASN1_TYPE * element, const void
*ider, int len,
if (asn1_get_tag_der
(der + counter, len - counter, &class, &len2,
&tag) != ASN1_SUCCESS)
- {
+ {
result = ASN1_DER_ERROR;
goto cleanup;
- }
+ }
if (counter + len2 > len)
- {
+ {
result = ASN1_DER_ERROR;
goto cleanup;
- }
+ }
len4 =
asn1_get_length_der (der + counter + len2,
len - counter - len2, &len3);
if (len4 < -1)
- {
+ {
result = ASN1_DER_ERROR;
goto cleanup;
- }
+ }
if (len4 != -1)
{
len2 += len4;
@@ -1311,7 +1311,7 @@ asn1_der_decoding (ASN1_TYPE * element, const void *ider,
int len,
{
result = ASN1_DER_ERROR;
goto cleanup;
- }
+ }
}
}
move = RIGHT;
@@ -1657,10 +1657,10 @@ asn1_der_decoding_element (ASN1_TYPE * structure, const
char *elementName,
len2 =
asn1_get_length_der (der + counter, len - counter, &len3);
if (len2 < 0)
- {
+ {
result = ASN1_DER_ERROR;
goto cleanup;
- }
+ }
if (state == FOUND)
{
@@ -1668,7 +1668,7 @@ asn1_der_decoding_element (ASN1_TYPE * structure, const
char *elementName,
{
result = ASN1_DER_ERROR;
goto cleanup;
- }
+ }
_asn1_set_value (p, der + counter, len3 + len2);
if (p == nodeFound)
@@ -1702,7 +1702,7 @@ asn1_der_decoding_element (ASN1_TYPE * structure, const
char *elementName,
{
result = ASN1_DER_ERROR;
goto cleanup;
- }
+ }
len2 += len3;
}
@@ -1733,7 +1733,7 @@ asn1_der_decoding_element (ASN1_TYPE * structure, const
char *elementName,
{
result = ASN1_DER_ERROR;
goto cleanup;
- }
+ }
len2 += len3;
}
@@ -1761,10 +1761,10 @@ asn1_der_decoding_element (ASN1_TYPE * structure, const
char *elementName,
len2 =
asn1_get_length_der (der + counter, len - counter, &len3);
if (len2 < 0)
- {
+ {
result = ASN1_DER_ERROR;
goto cleanup;
- }
+ }
if (state == FOUND)
{
@@ -1772,7 +1772,7 @@ asn1_der_decoding_element (ASN1_TYPE * structure, const
char *elementName,
{
result = ASN1_DER_ERROR;
goto cleanup;
- }
+ }
_asn1_set_value (p, der + counter, len3 + len2);
if (p == nodeFound)
@@ -1785,17 +1785,17 @@ asn1_der_decoding_element (ASN1_TYPE * structure, const
char *elementName,
len2 =
asn1_get_length_der (der + counter, len - counter, &len3);
if (len2 < 0)
- {
+ {
result = ASN1_DER_ERROR;
goto cleanup;
- }
+ }
if (state == FOUND)
{
if (len3 + len2 > len - counter)
{
result = ASN1_DER_ERROR;
goto cleanup;
- }
+ }
_asn1_set_value (p, der + counter, len3 + len2);
if (p == nodeFound)
@@ -1839,10 +1839,10 @@ asn1_der_decoding_element (ASN1_TYPE * structure, const
char *elementName,
asn1_get_length_der (der + counter, len - counter,
&len2);
if (len3 < 0)
- {
+ {
result = ASN1_DER_ERROR;
goto cleanup;
- }
+ }
counter += len2 + len3;
move = RIGHT;
}
@@ -1852,10 +1852,10 @@ asn1_der_decoding_element (ASN1_TYPE * structure, const
char *elementName,
asn1_get_length_der (der + counter, len - counter,
&len2);
if (len3 < 0)
- {
+ {
result = ASN1_DER_ERROR;
goto cleanup;
- }
+ }
counter += len2;
if (len3 > 0)
{
@@ -1922,10 +1922,10 @@ asn1_der_decoding_element (ASN1_TYPE * structure, const
char *elementName,
asn1_get_length_der (der + counter, len - counter,
&len2);
if (len3 < 0)
- {
+ {
result = ASN1_DER_ERROR;
goto cleanup;
- }
+ }
counter += len2 + len3;
move = RIGHT;
}
@@ -1935,10 +1935,10 @@ asn1_der_decoding_element (ASN1_TYPE * structure, const
char *elementName,
asn1_get_length_der (der + counter, len - counter,
&len2);
if (len3 < 0)
- {
+ {
result = ASN1_DER_ERROR;
goto cleanup;
- }
+ }
counter += len2;
if (len3)
{
@@ -1964,25 +1964,25 @@ asn1_der_decoding_element (ASN1_TYPE * structure, const
char *elementName,
if (asn1_get_tag_der
(der + counter, len - counter, &class, &len2,
&tag) != ASN1_SUCCESS)
- {
+ {
result = ASN1_DER_ERROR;
goto cleanup;
- }
+ }
if (counter + len2 > len)
- {
+ {
result = ASN1_DER_ERROR;
goto cleanup;
- }
+ }
len4 =
asn1_get_length_der (der + counter + len2,
len - counter - len2, &len3);
if (len4 < -1)
- {
+ {
result = ASN1_DER_ERROR;
goto cleanup;
- }
+ }
if (len4 != -1)
{
diff --git a/lib/errors.c b/lib/errors.c
index 7878c50..76611d8 100644
--- a/lib/errors.c
+++ b/lib/errors.c
@@ -21,7 +21,7 @@
#include <int.h>
#ifdef STDC_HEADERS
-# include <stdarg.h>
+#include <stdarg.h>
#endif
#define LIBTASN1_ERROR_ENTRY(name) { #name, name }
diff --git a/lib/int.h b/lib/int.h
index fcaf0d8..82de579 100644
--- a/lib/int.h
+++ b/lib/int.h
@@ -23,7 +23,7 @@
#define INT_H
#ifdef HAVE_CONFIG_H
-# include <config.h>
+#include <config.h>
#endif
#include <string.h>
@@ -33,7 +33,7 @@
#include <stdint.h>
#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
+#include <sys/types.h>
#endif
#include <libtasn1.h>
diff --git a/lib/parser_aux.c b/lib/parser_aux.c
index ce55253..2e1f7ee 100644
--- a/lib/parser_aux.c
+++ b/lib/parser_aux.c
@@ -718,7 +718,8 @@ _asn1_expand_object_id (ASN1_TYPE node)
{
_asn1_str_cpy (name2, sizeof (name2), name_root);
_asn1_str_cat (name2, sizeof (name2), ".");
- _asn1_str_cat (name2, sizeof (name2), (char *) p2->value);
+ _asn1_str_cat (name2, sizeof (name2),
+ (char *) p2->value);
p3 = asn1_find_node (node, name2);
if (!p3 || (type_field (p3->type) != TYPE_OBJECT_ID) ||
!(p3->type & CONST_ASSIGN))
diff --git a/lib/version.c b/lib/version.c
index fb17223..83d70c9 100644
--- a/lib/version.c
+++ b/lib/version.c
@@ -20,7 +20,7 @@
*/
#ifdef HAVE_CONFIG_H
-# include <config.h>
+#include <config.h>
#endif
#include <string.h> /* for strverscmp */
diff --git a/maint.mk b/maint.mk
index a97e0bd..951b358 100644
--- a/maint.mk
+++ b/maint.mk
@@ -455,7 +455,8 @@ sc_prohibit_quotearg_without_use:
# Don't include quote.h unless you use one of its functions.
sc_prohibit_quote_without_use:
- @h='quote.h' re='\<quote(_n)? *\(' $(_sc_header_without_use)
+ @h='quote.h' re='\<quote((_n)? *\(|_quoting_options\>)' \
+ $(_sc_header_without_use)
# Don't include this header unless you use one of its functions.
sc_prohibit_long_options_without_use:
diff --git a/src/asn1Coding.c b/src/asn1Coding.c
index 131db7b..9ddb0a4 100644
--- a/src/asn1Coding.c
+++ b/src/asn1Coding.c
@@ -33,9 +33,9 @@
/* This feature is available in gcc versions 2.5 and later. */
#if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5)
-# define ATTR_NO_RETRUN
+#define ATTR_NO_RETRUN
#else
-# define ATTR_NO_RETRUN __attribute__ ((__noreturn__))
+#define ATTR_NO_RETRUN __attribute__ ((__noreturn__))
#endif
ATTR_NO_RETRUN static void
@@ -319,7 +319,8 @@ main (int argc, char *argv[])
if (outputFile == NULL)
{
- printf ("asn1Coding: output file '%s' not available\n",
outputFileName);
+ printf ("asn1Coding: output file '%s' not available\n",
+ outputFileName);
free (der);
free (inputFileAsnName);
free (inputFileAssignmentName);
diff --git a/src/asn1Decoding.c b/src/asn1Decoding.c
index c1f0876..2fa97a9 100644
--- a/src/asn1Decoding.c
+++ b/src/asn1Decoding.c
@@ -34,9 +34,9 @@
/* This feature is available in gcc versions 2.5 and later. */
#if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5)
-# define ATTR_NO_RETRUN
+#define ATTR_NO_RETRUN
#else
-# define ATTR_NO_RETRUN __attribute__ ((__noreturn__))
+#define ATTR_NO_RETRUN __attribute__ ((__noreturn__))
#endif
ATTR_NO_RETRUN static void
diff --git a/src/asn1Parser.c b/src/asn1Parser.c
index 37c9960..e14da83 100644
--- a/src/asn1Parser.c
+++ b/src/asn1Parser.c
@@ -33,9 +33,9 @@
/* This feature is available in gcc versions 2.5 and later. */
#if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5)
-# define ATTR_NO_RETRUN
+#define ATTR_NO_RETRUN
#else
-# define ATTR_NO_RETRUN __attribute__ ((__noreturn__))
+#define ATTR_NO_RETRUN __attribute__ ((__noreturn__))
#endif
ATTR_NO_RETRUN static void
diff --git a/tests/Test_overflow.c b/tests/Test_overflow.c
index 2136899..747507f 100644
--- a/tests/Test_overflow.c
+++ b/tests/Test_overflow.c
@@ -66,7 +66,8 @@ main (void)
puts ("OK: asn1_get_length_der intnum");
else
{
- printf ("ERROR: asn1_get_length_der intnum (l %ld len %d)\n", l, len);
+ printf ("ERROR: asn1_get_length_der intnum (l %ld len %d)\n", l,
+ len);
return 1;
}
}
@@ -84,7 +85,8 @@ main (void)
puts ("OK: asn1_get_length_der overflow");
else
{
- printf ("ERROR: asn1_get_length_der overflow (l %ld len %d)\n", l, len);
+ printf ("ERROR: asn1_get_length_der overflow (l %ld len %d)\n", l,
+ len);
return 1;
}
}
diff --git a/tests/Test_simple.c b/tests/Test_simple.c
index 73d5178..9224036 100644
--- a/tests/Test_simple.c
+++ b/tests/Test_simple.c
@@ -35,45 +35,45 @@ struct tv
};
static const struct tv tv[] = {
- { 0, "", 2, "\x01\x00" },
- { 1, "\x00", 3, "\x02\x07\x00" },
- { 2, "\x00", 3, "\x02\x06\x00" },
- { 3, "\x00", 3, "\x02\x05\x00" },
- { 4, "\x00", 3, "\x02\x04\x00" },
- { 5, "\x00", 3, "\x02\x03\x00" },
- { 6, "\x00", 3, "\x02\x02\x00" },
- { 7, "\x00", 3, "\x02\x01\x00" },
- { 8, "\x00\x00", 3, "\x02\x00\x00" },
- { 9, "\x00\x00", 4, "\x03\x07\x00\x00" },
- { 10, "\x00\x00", 4, "\x03\x06\x00\x00" },
- { 11, "\x00\x00", 4, "\x03\x05\x00\x00" },
- { 12, "\x00\x00", 4, "\x03\x04\x00\x00" },
- { 13, "\x00\x00", 4, "\x03\x03\x00\x00" },
- { 14, "\x00\x00", 4, "\x03\x02\x00\x00" },
- { 15, "\x00\x00", 4, "\x03\x01\x00\x00" },
- { 16, "\x00\x00", 4, "\x03\x00\x00\x00" },
- { 17, "\x00\x00\x00", 5, "\x04\x07\x00\x00\x00" },
- { 18, "\x00\x00\x00", 5, "\x04\x06\x00\x00\x00" },
- { 19, "\x00\x00\x00", 5, "\x04\x05\x00\x00\x00" },
- { 1, "\xFF", 3, "\x02\x07\x80" },
- { 2, "\xFF", 3, "\x02\x06\xc0" },
- { 3, "\xFF", 3, "\x02\x05\xe0" },
- { 4, "\xFF", 3, "\x02\x04\xf0" },
- { 5, "\xFF", 3, "\x02\x03\xf8" },
- { 6, "\xFF", 3, "\x02\x02\xfc" },
- { 7, "\xFF", 3, "\x02\x01\xfe" },
- { 8, "\xFF\xFF", 3, "\x02\x00\xff" },
- { 9, "\xFF\xFF", 4, "\x03\x07\xff\x80" },
- { 10, "\xFF\xFF", 4, "\x03\x06\xff\xc0" },
- { 11, "\xFF\xFF", 4, "\x03\x05\xff\xe0" },
- { 12, "\xFF\xFF", 4, "\x03\x04\xff\xf0" },
- { 13, "\xFF\xFF", 4, "\x03\x03\xff\xf8" },
- { 14, "\xFF\xFF", 4, "\x03\x02\xff\xfc" },
- { 15, "\xFF\xFF", 4, "\x03\x01\xff\xfe" },
- { 16, "\xFF\xFF", 4, "\x03\x00\xff\xff" },
- { 17, "\xFF\xFF\xFF", 5, "\x04\x07\xff\xff\x80" },
- { 18, "\xFF\xFF\xFF", 5, "\x04\x06\xff\xff\xc0" },
- { 19, "\xFF\xFF\xFF", 5, "\x04\x05\xff\xff\xe0" },
+ {0, "", 2, "\x01\x00"},
+ {1, "\x00", 3, "\x02\x07\x00"},
+ {2, "\x00", 3, "\x02\x06\x00"},
+ {3, "\x00", 3, "\x02\x05\x00"},
+ {4, "\x00", 3, "\x02\x04\x00"},
+ {5, "\x00", 3, "\x02\x03\x00"},
+ {6, "\x00", 3, "\x02\x02\x00"},
+ {7, "\x00", 3, "\x02\x01\x00"},
+ {8, "\x00\x00", 3, "\x02\x00\x00"},
+ {9, "\x00\x00", 4, "\x03\x07\x00\x00"},
+ {10, "\x00\x00", 4, "\x03\x06\x00\x00"},
+ {11, "\x00\x00", 4, "\x03\x05\x00\x00"},
+ {12, "\x00\x00", 4, "\x03\x04\x00\x00"},
+ {13, "\x00\x00", 4, "\x03\x03\x00\x00"},
+ {14, "\x00\x00", 4, "\x03\x02\x00\x00"},
+ {15, "\x00\x00", 4, "\x03\x01\x00\x00"},
+ {16, "\x00\x00", 4, "\x03\x00\x00\x00"},
+ {17, "\x00\x00\x00", 5, "\x04\x07\x00\x00\x00"},
+ {18, "\x00\x00\x00", 5, "\x04\x06\x00\x00\x00"},
+ {19, "\x00\x00\x00", 5, "\x04\x05\x00\x00\x00"},
+ {1, "\xFF", 3, "\x02\x07\x80"},
+ {2, "\xFF", 3, "\x02\x06\xc0"},
+ {3, "\xFF", 3, "\x02\x05\xe0"},
+ {4, "\xFF", 3, "\x02\x04\xf0"},
+ {5, "\xFF", 3, "\x02\x03\xf8"},
+ {6, "\xFF", 3, "\x02\x02\xfc"},
+ {7, "\xFF", 3, "\x02\x01\xfe"},
+ {8, "\xFF\xFF", 3, "\x02\x00\xff"},
+ {9, "\xFF\xFF", 4, "\x03\x07\xff\x80"},
+ {10, "\xFF\xFF", 4, "\x03\x06\xff\xc0"},
+ {11, "\xFF\xFF", 4, "\x03\x05\xff\xe0"},
+ {12, "\xFF\xFF", 4, "\x03\x04\xff\xf0"},
+ {13, "\xFF\xFF", 4, "\x03\x03\xff\xf8"},
+ {14, "\xFF\xFF", 4, "\x03\x02\xff\xfc"},
+ {15, "\xFF\xFF", 4, "\x03\x01\xff\xfe"},
+ {16, "\xFF\xFF", 4, "\x03\x00\xff\xff"},
+ {17, "\xFF\xFF\xFF", 5, "\x04\x07\xff\xff\x80"},
+ {18, "\xFF\xFF\xFF", 5, "\x04\x06\xff\xff\xc0"},
+ {19, "\xFF\xFF\xFF", 5, "\x04\x05\xff\xff\xe0"},
};
int
@@ -115,8 +115,7 @@ main (int argc, char *argv[])
}
#endif
- if (der_len != tv[i].derlen
- || memcmp (der, tv[i].der, der_len) != 0)
+ if (der_len != tv[i].derlen || memcmp (der, tv[i].der, der_len) != 0)
{
fprintf (stderr, "asn1_bit_der iter %ld\n", i);
return 1;
@@ -140,7 +139,7 @@ main (int argc, char *argv[])
STRING value "011011100101110111" can be any of the following,
among others, depending on the choice of padding bits, the form
of length octets [...]".
- */
+ */
/* 03 04 06 6e 5d c0 DER encoding */
hooks/post-receive
--
GNU libtasn1
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU libtasn1 branch, master, updated. libtasn1_2_11-31-g95ed3fd,
Simon Josefsson <=