[git] KSBA - branch, master, updated. libksba-1.3.5-16-gd56bddc
by Werner Koch
cvs at cvs.gnupg.org
Tue Oct 23 22:37:59 CEST 2018
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 d56bddc68db86878e1b3497362407c994c2841ca (commit)
via a0bbba1c49286f09c5f2eb3cd788938fac2ed252 (commit)
from af99234b21c98ad1a4eaf2b72fb52de67beba9d3 (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 d56bddc68db86878e1b3497362407c994c2841ca
Author: Werner Koch <wk at gnupg.org>
Date: Tue Oct 23 22:23:08 2018 +0200
Use only one .PHONY target in a Makefile.
* Makefile.am (.PHONY): Move to the end.
--
Fixes-commit: 3e029a4ed0059116febe05924a14009ca622e3c5
Signed-off-by: Werner Koch <wk at gnupg.org>
diff --git a/Makefile.am b/Makefile.am
index f188cda..e8e16bc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -63,7 +63,6 @@ distcheck-hook:
gen_start_date = 2011-12-01T00:00:00
-.PHONY: gen-ChangeLog
gen-ChangeLog:
if test -d $(top_srcdir)/.git; then \
(cd $(top_srcdir) && \
@@ -80,17 +79,17 @@ gen-ChangeLog:
stowinstall:
$(MAKE) $(AM_MAKEFLAGS) install prefix=/usr/local/stow/libksba
+
+
# Coverage targets
if HAVE_GCOV
-.PHONY: clean-coverage
clean-coverage:
@echo Removing old coverage results
-find -name '*.gcda' -print | xargs -r rm
-find -name '*.gcno' -print | xargs -r rm
-rm -rf coverage.info coveragereport
-.PHONY: coverage-html clean-coverage
coverage-html: check
@echo Collecting coverage data with lcov
$(top_srcdir)/autogen.sh --coverage $(LCOV) $(GCOV) $(abs_builddir) \
@@ -101,3 +100,5 @@ coverage-html: check
clean-local: clean-coverage
endif # HAVE_GCOV
+
+.PHONY: gen-ChangeLog clean-coverage coverage-html
commit a0bbba1c49286f09c5f2eb3cd788938fac2ed252
Author: Werner Koch <wk at gnupg.org>
Date: Tue Oct 23 22:14:01 2018 +0200
Fix test for existence of the signing_time
* src/cms.c (build_signed_data_attributes): Fix test.
--
The test predates the introduction of the ksba_isotime_t which
orginally was a standard time_t. Obviously I missed to adjust this
test back in 2003.
GnuPG-bug-id: 4213
Signed-off-by: Werner Koch <wk at gnupg.org>
diff --git a/src/cms.c b/src/cms.c
index 8d80464..c0fac0f 100644
--- a/src/cms.c
+++ b/src/cms.c
@@ -2510,7 +2510,7 @@ build_signed_data_attributes (ksba_cms_t cms)
attridx++;
/* Include the signing time */
- if (certlist->signing_time)
+ if (*certlist->signing_time)
{
attr = _ksba_asn_expand_tree (cms_tree->parse_tree,
"CryptographicMessageSyntax.Attribute");
diff --git a/src/reader.c b/src/reader.c
index 1ae8810..475054e 100644
--- a/src/reader.c
+++ b/src/reader.c
@@ -102,12 +102,12 @@ ksba_reader_set_release_notify (ksba_reader_t r,
/* Clear the error and eof indicators for READER, so that it can be
- continued to use. Also dicards any unread bytes. This is usually
- required if the upper layer want to send to send an EOF to indicate
+ continued to use. Also discards any unread bytes. This is usually
+ required if the upper layer wants to send an EOF to indicate
the logical end of one part of a file. If BUFFER and BUFLEN are
not NULL, possible unread data is copied to a newly allocated
buffer and this buffer is assigned to BUFFER, BUFLEN will be set to
- the length of the unread bytes. */
+ the length of the unread bytes. */
gpg_error_t
ksba_reader_clear (ksba_reader_t r, unsigned char **buffer, size_t *buflen)
{
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 7 ++++---
src/cms.c | 2 +-
src/reader.c | 6 +++---
3 files changed, 8 insertions(+), 7 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