[git] KSBA - branch, master, updated. libksba-1.3.5-13-g457d2f0
by Marcus Brinkmann
cvs at cvs.gnupg.org
Fri Aug 18 20:13:49 CEST 2017
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 "KSBA is a library to access X.509 certificates and CMS data.".
The branch, master has been updated
via 457d2f0c6a1fea394de6d48afb1c1c0189c52878 (commit)
via 982faa2c354a2d23ffd4a0bad584e145faf809bc (commit)
from a1d9b046aec8cedda16a9e24eb8d2ed021f68d5d (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 457d2f0c6a1fea394de6d48afb1c1c0189c52878
Author: Marcus Brinkmann <marcus.brinkmann at ruhr-uni-bochum.de>
Date: Fri Aug 18 20:05:41 2017 +0200
Fix non-maintainer build.
* configure.ac: Always check for gcov program to make sure
the automake variable is defined.
Signed-off-by: Marcus Brinkmann <mb at g10code.com>
diff --git a/configure.ac b/configure.ac
index d66e270..54d4787 100644
--- a/configure.ac
+++ b/configure.ac
@@ -127,9 +127,9 @@ gl_EARLY
AC_PROG_YACC
AX_PROG_BISON([have_bison=yes],[have_bison=no])
+AC_CHECK_PROGS(GCOV, [gcov], gcov)
if test "$USE_MAINTAINER_MODE" = "yes"; then
# gcov coverage reporting
- AC_CHECK_PROGS(GCOV, [gcov], gcov)
AC_TDD_GCOV
AC_SUBST(COVERAGE_CFLAGS)
AC_SUBST(COVERAGE_LDFLAGS)
commit 982faa2c354a2d23ffd4a0bad584e145faf809bc
Author: Marcus Brinkmann <marcus.brinkmann at ruhr-uni-bochum.de>
Date: Fri Aug 18 20:02:04 2017 +0200
Fix all compiler warnings.
* src/asn1-parse.y (import_defs, identifier_list): Comment out unused part
of the grammar that causes a shift-reduce conflict.
* src/cms-parser.c (_ksba_cms_parse_enveloped_data_part_1): Initialize
some variables to help suppress uninitialized use warning.
* src/crl.c (oidstr_issuingDistributionPoint): Comment out unused OID.
* src/gen-help.h (ksba_asn_parse_file, ksba_asn_tree_dump): Add declarations.
Signed-off-by: Marcus Brinkmann <mb at g10code.com>
diff --git a/src/asn1-parse.y b/src/asn1-parse.y
index 3336c43..5bff15c 100755
--- a/src/asn1-parse.y
+++ b/src/asn1-parse.y
@@ -92,7 +92,7 @@ struct parser_control_s {
%param {void *parm}
%define api.pure full
%define parse.error verbose
-%expect 1
+ //%expect 1
%union {
unsigned int constant;
@@ -170,7 +170,7 @@ static void yyerror (void *parm, const char *s);
%type <node> boolean_def any_def size_def2 obj_constant obj_constant_list
%type <node> constant_def type_constant type_constant_list definitions
%type <node> definitions_id Time bit_element bit_element_list set_def
-%type <node> identifier_list imports_def tag_type tag type_assig_right_tag
+%type <node> /* identifier_list */ imports_def tag_type tag type_assig_right_tag
%type <node> type_assig_right_tag_default enumerated_def string_def
%type <node> utf8_string_def numeric_string_def printable_string_def
%type <node> teletex_string_def ia5_string_def universal_string_def
@@ -229,6 +229,7 @@ constant_list: constant { $$=$1; }
}
;
+/*
identifier_list : IDENTIFIER
{
$$ = NEW_NODE (TYPE_IDENTIFIER);
@@ -244,6 +245,7 @@ identifier_list : IDENTIFIER
append_right ($$, node);
}
;
+*/
obj_constant: num_identifier
{
@@ -704,7 +706,8 @@ definitions_id : IDENTIFIER '{' obj_constant_list '}'
imports_def : /* empty */
{ $$=NULL;}
- | IMPORTS identifier_list FROM IDENTIFIER obj_constant_list
+/*
+ | IMPORTS identifier_list FROM IDENTIFIER
{
AsnNode node;
@@ -715,6 +718,7 @@ imports_def : /* empty */
set_down ($$, node);
set_right ($$, $2);
}
+*/
;
explicit_implicit : EXPLICIT { $$ = CONST_EXPLICIT; }
diff --git a/src/cms-parser.c b/src/cms-parser.c
index e4da08c..9c0f836 100644
--- a/src/cms-parser.c
+++ b/src/cms-parser.c
@@ -823,14 +823,14 @@ _ksba_cms_parse_enveloped_data_part_1 (ksba_cms_t cms)
gpg_error_t err;
int env_data_ndef;
unsigned long env_data_len;
- int encr_cont_ndef;
- unsigned long encr_cont_len;
- int has_content;
+ int encr_cont_ndef = 0;
+ unsigned long encr_cont_len = 0;
+ int has_content = 0;
unsigned long off, len;
char *cont_oid = NULL;
char *algo_oid = NULL;
char *algo_parm = NULL;
- size_t algo_parmlen;
+ size_t algo_parmlen = 0;
struct value_tree_s *vt, **vtend;
/* get the version */
diff --git a/src/crl.c b/src/crl.c
index 87a3fa3..daeb222 100644
--- a/src/crl.c
+++ b/src/crl.c
@@ -47,7 +47,9 @@
static const char oidstr_crlNumber[] = "2.5.29.20";
static const char oidstr_crlReason[] = "2.5.29.21";
+#if 0
static const char oidstr_issuingDistributionPoint[] = "2.5.29.28";
+#endif
static const char oidstr_certificateIssuer[] = "2.5.29.29";
static const char oidstr_authorityKeyIdentifier[] = "2.5.29.35";
diff --git a/src/gen-help.h b/src/gen-help.h
index c0a3776..05641f9 100644
--- a/src/gen-help.h
+++ b/src/gen-help.h
@@ -90,6 +90,8 @@ const char *gpg_strerror (int err);
/* Duplicated type definitions from ksba.h. */
typedef struct ksba_asn_tree_s *ksba_asn_tree_t;
-
+int ksba_asn_parse_file (const char *filename, ksba_asn_tree_t *result,
+ int debug);
+void ksba_asn_tree_dump (ksba_asn_tree_t tree, const char *name, FILE *fp);
#endif /*GEN_HELP_H*/
diff --git a/tests/t-dnparser.c b/tests/t-dnparser.c
index ef4ab5d..f100888 100644
--- a/tests/t-dnparser.c
+++ b/tests/t-dnparser.c
@@ -139,7 +139,7 @@ main (int argc, char **argv)
if (argc == 2 && !strcmp (argv[1], "--to-str") )
{ /* Read the DER encoded DN from stdin write the string to stdout */
- fread (inputbuf, 1, sizeof inputbuf, stdin);
+ len = fread (inputbuf, 1, sizeof inputbuf, stdin);
if (!feof (stdin))
fail ("read error or input too large");
@@ -148,7 +148,7 @@ main (int argc, char **argv)
}
else if (argc == 2 && !strcmp (argv[1], "--to-der") )
{ /* Read the String from stdin write the DER encoding to stdout */
- fread (inputbuf, 1, sizeof inputbuf, stdin);
+ len = fread (inputbuf, 1, sizeof inputbuf, stdin);
if (!feof (stdin))
fail ("read error or input too large");
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 2 +-
src/asn1-parse.y | 10 +++++++---
src/cms-parser.c | 8 ++++----
src/crl.c | 2 ++
src/gen-help.h | 4 +++-
tests/t-dnparser.c | 4 ++--
6 files changed, 19 insertions(+), 11 deletions(-)
hooks/post-receive
--
KSBA is a library to access X.509 certificates and CMS data.
http://git.gnupg.org
More information about the Gnupg-commits
mailing list