开源软件构建与测试

_service:tar_scm:libksba.spec Changed

_service Changed

_service:tar_scm:libksba-1.6.0.tar.bz2.sig -> _service:tar_scm:libksba-1.6.3.tar.bz2.sig Changed

_service:tar_scm:libksba-1.6.0.tar.bz2/ChangeLog -> _service:tar_scm:libksba-1.6.3.tar.bz2/ChangeLog Changed

@@ -1,3 +1,157 @@
+2022-12-06  Werner Koch  <wk@gnupg.org>
+
+	Release 1.6.3.
+	+ commit bffa9b346071725363a483db547e7dced9721cb5
+
+
+2022-11-23  Werner Koch  <wk@gnupg.org>
+
+	Fix an integer overflow in the CRL signature parser.
+	+ commit f61a5ea4e0f6a80fd4b28ef0174bee77793cf070
+	* src/crl.c (parse_signature): N+N2 now checked for overflow.
+
+	* src/ocsp.c (parse_response_extensions): Do not accept too large
+	values.
+	(parse_single_extensions): Ditto.
+
+2022-11-02  NIIBE Yutaka  <gniibe@fsij.org>
+
+	build: Update m4/libgcrypt.m4.
+	+ commit 4076b60f7cef4fddc3d30f6e6d4078081dbc7167
+	* m4/libgcrypt.m4: Update from libgcrypt master.
+
+2022-11-01  NIIBE Yutaka  <gniibe@fsij.org>
+
+	build: Prefer gpgrt-config when available.
+	+ commit 13307b22882a220d206341e1196e74fd37418c2f
+	* src/ksba.m4: Overriding the decision by --with-libksba-prefix, use
+	gpgrt-config ksba when gpgrt-config is available.
+
+2022-10-24  NIIBE Yutaka  <gniibe@fsij.org>
+
+	build: Update gpg-error.m4.
+	+ commit c3c1627f34234e3d54fe1f3411ac499dd7e3b3b0
+	* m4/gpg-error.m4: Update from libgpg-error 1.46.
+
+2022-10-07  Werner Koch  <wk@gnupg.org>
+
+	Release 1.6.2.
+	+ commit 29814959fe2b65c6d4ac35dea261006a8cad3661
+
+
+2022-10-05  Werner Koch  <wk@gnupg.org>
+
+	Detect a possible overflow directly in the TLV parser.
+	+ commit 4b7d9cd4a018898d7714ce06f3faf2626c14582b
+	* src/ber-help.c (_ksba_ber_read_tl): Check for overflow of a commonly
+	used sum.
+
+2022-09-16  Werner Koch  <wk@gnupg.org>
+
+	Release 1.6.1.
+	+ commit d3c1e063d708a46ef39152256f8b1ea466b61be0
+
+
+2022-07-19  NIIBE Yutaka  <gniibe@fsij.org>
+
+	build: Update config.guess and config.sub.
+	+ commit 466837db84fb318eaaee1aba6cc3939c16a3e2ba
+	* build-aux/config.guess: Update from upstream.
+	* build-aux/config.sub: Ditto.
+
+	build: Support cross compile.
+	+ commit ca9a04569020c51719ab45ebd35a3cbb1f35c6aa
+	* configure.ac (AX_CC_FOR_BUILD): New.
+	* m4/ax_cc_for_build.m4: New.
+	* src/Makefile.am: Use EXEEXT_FOR_BUILD.
+
+2022-06-28  NIIBE Yutaka  <gniibe@fsij.org>
+
+	build: Update gpg-error.m4.
+	+ commit e51d5c7ce81fe3f90039ad970fbb82f751a645fc
+	* m4/gpg-error.m4: Update from libgpg-error.
+
+2022-03-31  NIIBE Yutaka  <gniibe@fsij.org>
+
+	build: When no gpg-error-config, not install ksba-config.
+	+ commit 41000330cdba87afdf9ea0b481e0260dab262a54
+	* configure.ac (USE_GPGRT_CONFIG): New.
+	* src/Makefile.am USE_GPGRT_CONFIG: Conditionalize the install
+	of ksba-config.
+
+2022-03-22  NIIBE Yutaka  <gniibe@fsij.org>
+
+	Fix test of t-cms-parser.
+	+ commit e751d1fa01bd3e593eeccbeffb729176a59ca28c
+	* tests/t-cms-parser.c (one_file): Open the file with binary flag.
+
+2022-02-26  Werner Koch  <wk@gnupg.org>
+
+	ocsp: Accept a server not responding with a nonce.
+	+ commit 24992a4a7a61d93759e1dbd104b845903d4589bf
+	* src/ocsp.h (struct ksba_ocsp_s): Remove good_nonce.
+	* src/ocsp.c (parse_response_extensions): No not set good_nonce.
+	(ksba_ocsp_parse_response): Simplify the check.
+
+	ocsp: Fix detecting the right response item.
+	+ commit c9cde18bc84a1b3bb7de22ca80264c418ffd0fee
+	* src/ocsp.c (ksba_ocsp_prepare_request): Store the value of the
+	integer.
+
+2021-12-22  NIIBE Yutaka  <gniibe@fsij.org>
+
+	build: Update for newer autoconf.
+	+ commit 51b565054096926dc97fc2ebb72c7de05a127dff
+	* configure.ac (AC_PREREQ): Require >= 2.69.
+	(AC_HEADER_STDC): Remove.
+
+2021-11-29  NIIBE Yutaka  <gniibe@fsij.org>
+
+	Silence warning for ksba_isotime_t.
+	+ commit 64ef3144abee7afbc93a87e960b9a79c7b43cfca
+	* src/time.c (_ksba_current_time): Let it return the result.
+
+	Fix ksba.pc to use HTTPS for the URL.
+	+ commit 4898212c705a49da0384ac8f1b44f2d6592a990e
+	* src/ksba.pc.in: Use https.
+
+2021-11-10  NIIBE Yutaka  <gniibe@fsij.org>
+
+	libtool: Link without -flat_namespace for macOS.
+	+ commit 0d7a62c355ea18031daf00490da9f7c9f33683c3
+	* m4/libtool.m4: Not setting 10.0 to MACOSX_DEPLOYMENT_TARGET when not
+	defined.  Only specify -flat_namespace to linker for specific
+	(older) versions and hosts.
+
+2021-10-13  NIIBE Yutaka  <gniibe@fsij.org>
+
+	ASN.1 parser: Provide token table (no more %token-table).
+	+ commit f3b7dd4167779f2694e932ad7c2adba98ff9a21d
+	* src/asn1-parse.y (%token-table): Remove.
+	(token_table): New.
+	(yylex): Use token_table.
+
+2021-09-22  Andreas Metzler  <ametzler@bebt.de>
+
+	build: Use automake primitives to install libksba.def.
+	+ commit ce1de8cb2bcd712381f77519de4da87af42879a4
+	* src/Makekefile.am: Do not use explicit $INSTALL to install
+	libksba.def, fixes windows parallel build error.
+
+2021-08-18  Werner Koch  <wk@gnupg.org>
+
+	Avoid warnings about NULL ptr deref in ASN.1 helpers.
+	+ commit c242f31b6d520a7f87bf36782e4b5c8da7dc045d
+	* src/asn1-func.c (_ksba_asn_set_value): Add extra asserts.  Fix the
+	VALTYPE_BOOL case, which is actually not in Libksba.
+
+2021-08-05  NIIBE Yutaka  <gniibe@fsij.org>
+
+	build: Simplify configure.ac.
+	+ commit 379e787a965148fa5613ccd4e2b8c3c00feb45d9
+	* configure.ac (AC_CHECK_HEADERS): Remove string.h.
+	(AC_CHECK_FUNCS): Remove memmove, strchr, strtol and strtoul.
+
 2021-06-10  Werner Koch  <wk@gnupg.org>
 
 	Release 1.6.0.

_service:tar_scm:libksba-1.6.0.tar.bz2/Makefile.am -> _service:tar_scm:libksba-1.6.3.tar.bz2/Makefile.am Changed

_service:tar_scm:libksba-1.6.0.tar.bz2/Makefile.in -> _service:tar_scm:libksba-1.6.3.tar.bz2/Makefile.in Changed

_service:tar_scm:libksba-1.6.0.tar.bz2/NEWS -> _service:tar_scm:libksba-1.6.3.tar.bz2/NEWS Changed

_service:tar_scm:libksba-1.6.0.tar.bz2/aclocal.m4 -> _service:tar_scm:libksba-1.6.3.tar.bz2/aclocal.m4 Changed

_service:tar_scm:libksba-1.6.0.tar.bz2/build-aux/config.guess -> _service:tar_scm:libksba-1.6.3.tar.bz2/build-aux/config.guess Changed

@@ -1,12 +1,14 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright 1992-2016 Free Software Foundation, Inc.
+#   Copyright 1992-2022 Free Software Foundation, Inc.
 
-timestamp='2016-05-15'
+# shellcheck disable=SC2006,SC2268 # see below for rationale
+
+timestamp='2022-01-09'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful, but
@@ -15,7 +17,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, see <http://www.gnu.org/licenses/>.
+# along with this program; if not, see <https://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -27,11 +29,19 @@
 # Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
 #
 # You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
+# https://git.savannah.gnu.org/cgit/config.git/plain/config.guess
 #
 # Please send patches to <config-patches@gnu.org>.
 
 
+# The "shellcheck disable" line above the timestamp inhibits complaints
+# about features and limitations of the classic Bourne shell that were
+# superseded or lifted in POSIX.  However, this script identifies a wide
+# variety of pre-POSIX systems that do not have POSIX shells at all, and
+# even some reasonably current systems (Solaris 10 as case-in-point) still
+# have a pre-POSIX /bin/sh.
+
+
 me=`echo "$0" | sed -e 's,.*/,,'`
 
 usage="\
@@ -39,7 +49,7 @@
 
 Output the configuration name of the system \`$me' is run on.
 
-Operation modes:
+Options:
   -h, --help         print this help, then exit
   -t, --time-stamp   print date of last modification, then exit
   -v, --version      print version number, then exit
@@ -50,7 +60,7 @@
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright 1992-2016 Free Software Foundation, Inc.
+Copyright 1992-2022 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -84,7 +94,8 @@
   exit 1
 fi
 
-trap 'exit 1' 1 2 15
+# Just in case it came from the environment.
+GUESS=
 
 # CC_FOR_BUILD -- compiler used by this script. Note that the use of a
 # compiler to aid in system detection is discouraged as it requires
@@ -96,66 +107,90 @@
 
 # Portable tmp directory creation inspired by the Autoconf team.
 
-set_cc_for_build='
-trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-: ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-dummy=$tmp/dummy ;
-tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
-case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)    echo "int x;" > $dummy.c ;
-	for c in cc gcc c89 c99 ; do
-	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
-	     CC_FOR_BUILD="$c"; break ;
-	  fi ;
-	done ;
-	if test x"$CC_FOR_BUILD" = x ; then
-	  CC_FOR_BUILD=no_compiler_found ;
-	fi
-	;;
- ,,*)   CC_FOR_BUILD=$CC ;;
- ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ; set_cc_for_build= ;'
+tmp=
+# shellcheck disable=SC2172
+trap 'test -z "$tmp" || rm -fr "$tmp"' 0 1 2 13 15
+
+set_cc_for_build() {
+    # prevent multiple calls if $tmp is already set
+    test "$tmp" && return 0
+    : "${TMPDIR=/tmp}"
+    # shellcheck disable=SC2039,SC3028
+    { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+	{ test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir "$tmp" 2>/dev/null) ; } ||
+	{ tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir "$tmp" 2>/dev/null) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+	{ echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; }
+    dummy=$tmp/dummy
+    case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in
+	,,)    echo "int x;" > "$dummy.c"
+	       for driver in cc gcc c89 c99 ; do
+		   if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
+		       CC_FOR_BUILD=$driver
+		       break
+		   fi
+	       done
+	       if test x"$CC_FOR_BUILD" = x ; then
+		   CC_FOR_BUILD=no_compiler_found
+	       fi
+	       ;;
+	,,*)   CC_FOR_BUILD=$CC ;;
+	,*,*)  CC_FOR_BUILD=$HOST_CC ;;
+    esac
+}
 
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
 # (ghazi@noc.rutgers.edu 1994-08-24)
-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
+if test -f /.attbin/uname ; then
 	PATH=$PATH:/.attbin ; export PATH
 fi
 
 UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
 UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
+UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
-case "${UNAME_SYSTEM}" in
+case $UNAME_SYSTEM in
 Linux|GNU|GNU/*)
-	# If the system lacks a compiler, then just pick glibc.
-	# We could probably try harder.
-	LIBC=gnu
+	LIBC=unknown
 
-	eval $set_cc_for_build
-	cat <<-EOF > $dummy.c
+	set_cc_for_build
+	cat <<-EOF > "$dummy.c"
 	#include <features.h>
 	#if defined(__UCLIBC__)
 	LIBC=uclibc
 	#elif defined(__dietlibc__)
 	LIBC=dietlibc
-	#else
+	#elif defined(__GLIBC__)
 	LIBC=gnu
+	#else
+	#include <stdarg.h>
+	/* First heuristic to detect musl libc.  */
+	#ifdef __DEFINED_va_list
+	LIBC=musl
+	#endif
 	#endif
 	EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
+	cc_set_libc=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
+	eval "$cc_set_libc"
+
+	# Second heuristic to detect musl libc.
+	if  "$LIBC" = unknown  &&
+	   command -v ldd >/dev/null &&
+	   ldd --version 2>&1 | grep -q ^musl; then
+		LIBC=musl
+	fi
+
+	# If the system lacks a compiler, then just pick glibc.
+	# We could probably try harder.
+	if  "$LIBC" = unknown ; then
+		LIBC=gnu
+	fi
 	;;
 esac
 
 # Note: order is significant - the case branches are not exclusive.
 
-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in
     *:NetBSD:*:*)

_service:tar_scm:libksba-1.6.0.tar.bz2/build-aux/config.sub -> _service:tar_scm:libksba-1.6.3.tar.bz2/build-aux/config.sub Changed

@@ -1,12 +1,14 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2016 Free Software Foundation, Inc.
+#   Copyright 1992-2022 Free Software Foundation, Inc.
 
-timestamp='2016-06-20'
+# shellcheck disable=SC2006,SC2268 # see below for rationale
+
+timestamp='2022-01-03'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful, but
@@ -15,7 +17,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, see <http://www.gnu.org/licenses/>.
+# along with this program; if not, see <https://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -33,7 +35,7 @@
 # Otherwise, we print the canonical config type on stdout and succeed.
 
 # You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
+# https://git.savannah.gnu.org/cgit/config.git/plain/config.sub
 
 # This file is supposed to be the same for all GNU packages
 # and recognize all the CPU types, system types and aliases
@@ -50,6 +52,13 @@
 #	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
 # It is wrong to echo any other type of specification.
 
+# The "shellcheck disable" line above the timestamp inhibits complaints
+# about features and limitations of the classic Bourne shell that were
+# superseded or lifted in POSIX.  However, this script identifies a wide
+# variety of pre-POSIX systems that do not have POSIX shells at all, and
+# even some reasonably current systems (Solaris 10 as case-in-point) still
+# have a pre-POSIX /bin/sh.
+
 me=`echo "$0" | sed -e 's,.*/,,'`
 
 usage="\
@@ -57,7 +66,7 @@
 
 Canonicalize a configuration name.
 
-Operation modes:
+Options:
   -h, --help         print this help, then exit
   -t, --time-stamp   print date of last modification, then exit
   -v, --version      print version number, then exit
@@ -67,7 +76,7 @@
 version="\
 GNU config.sub ($timestamp)
 
-Copyright 1992-2016 Free Software Foundation, Inc.
+Copyright 1992-2022 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -89,12 +98,12 @@
     - )	# Use stdin as input.
        break ;;
     -* )
-       echo "$me: invalid option $1$help"
+       echo "$me: invalid option $1$help" >&2
        exit 1 ;;
 
     *local*)
        # First pass through any local machine types.
-       echo $1
+       echo "$1"
        exit ;;
 
     * )
@@ -110,1242 +119,1186 @@
     exit 1;;
 esac
 
-# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
-# Here we must recognize all the valid KERNEL-OS combinations.
-maybe_os=`echo $1 | sed 's/^$.*$-$^-*-^-*$$/\2/'`
-case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
-  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
-  knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
-  kopensolaris*-gnu* | \
-  storm-chaos* | os2-emx* | rtmk-nova*)
-    os=-$maybe_os
-    basic_machine=`echo $1 | sed 's/^$.*$-$^-*-^-*$$/\1/'`
-    ;;
-  android-linux)
-    os=-linux-android
-    basic_machine=`echo $1 | sed 's/^$.*$-$^-*-^-*$$/\1/'`-unknown
-    ;;
-  *)
-    basic_machine=`echo $1 | sed 's/-^-*$//'`
-    if  $basic_machine != $1 
-    then os=`echo $1 | sed 's/.*-/-/'`
-    else os=; fi
-    ;;
-esac
+# Split fields of configuration type
+# shellcheck disable=SC2162
+saved_IFS=$IFS
+IFS="-" read field1 field2 field3 field4 <<EOF
+$1
+EOF
+IFS=$saved_IFS
 
-### Let's recognize common machines as not being operating systems so
-### that things like config.sub decstation-3100 work.  We also
-### recognize some manufacturers as not being operating systems, so we
-### can provide default operating systems below.
-case $os in
-	-sun*os*)
-		# Prevent following clause from handling this invalid input.
-		;;
-	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
-	-att* | -7300* | -3300* | -delta* | -motorola* | -sun234* | \
-	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
-	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-	-c123* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray | -microblaze*)
-		os=
-		basic_machine=$1
-		;;
-	-bluegene*)
-		os=-cnk
-		;;
-	-sim | -cisco | -oki | -wec | -winbond)
-		os=
-		basic_machine=$1
-		;;
-	-scout)
-		;;
-	-wrs)
-		os=-vxworks
-		basic_machine=$1
-		;;
-	-chorusos*)
-		os=-chorusos
-		basic_machine=$1
-		;;
-	-chorusrdb)
-		os=-chorusrdb
-		basic_machine=$1
-		;;
-	-hiux*)
-		os=-hiuxwe2
-		;;
-	-sco6)
-		os=-sco5v6
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco5)
-		os=-sco3.2v5
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco4)
-		os=-sco3.2v4
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2.4-9*)
-		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2v4-9*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco5v6*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco*)
-		os=-sco3.2v2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-udk*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-isc)
-		os=-isc2.2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-clix*)
-		basic_machine=clipper-intergraph
-		;;
-	-isc*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`

_service:tar_scm:libksba-1.6.0.tar.bz2/config.h.in -> _service:tar_scm:libksba-1.6.3.tar.bz2/config.h.in Changed

_service:tar_scm:libksba-1.6.0.tar.bz2/configure -> _service:tar_scm:libksba-1.6.3.tar.bz2/configure Changed

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for libksba 1.6.0.
+# Generated by GNU Autoconf 2.69 for libksba 1.6.3.
 #
 # Report bugs to <https://bugs.gnupg.org>.
 #
@@ -590,8 +590,8 @@
 # Identity of this package.
 PACKAGE_NAME='libksba'
 PACKAGE_TARNAME='libksba'
-PACKAGE_VERSION='1.6.0'
-PACKAGE_STRING='libksba 1.6.0'
+PACKAGE_VERSION='1.6.3'
+PACKAGE_STRING='libksba 1.6.3'
 PACKAGE_BUGREPORT='https://bugs.gnupg.org'
 PACKAGE_URL=''
 
@@ -651,6 +651,8 @@
 ALLOCA_H
 ALLOCA
 LTALLOCA
+USE_GPGRT_CONFIG_FALSE
+USE_GPGRT_CONFIG_TRUE
 GPG_ERROR_MT_LIBS
 GPG_ERROR_MT_CFLAGS
 GPG_ERROR_LIBS
@@ -663,7 +665,6 @@
 HAVE_W32CE_SYSTEM_TRUE
 HAVE_W32_SYSTEM_FALSE
 HAVE_W32_SYSTEM_TRUE
-CC_FOR_BUILD
 COVERAGE_LDFLAGS
 COVERAGE_CFLAGS
 GENHTML
@@ -678,6 +679,8 @@
 LIBKSBA_LT_REVISION
 LIBKSBA_LT_AGE
 LIBKSBA_LT_CURRENT
+EXEEXT_FOR_BUILD
+CC_FOR_BUILD
 MAINT
 MAINTAINER_MODE_FALSE
 MAINTAINER_MODE_TRUE
@@ -1381,7 +1384,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures libksba 1.6.0 to adapt to many kinds of systems.
+\`configure' configures libksba 1.6.3 to adapt to many kinds of systems.
 
 Usage: $0 OPTION... VAR=VALUE...
 
@@ -1452,7 +1455,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libksba 1.6.0:";;
+     short | recursive ) echo "Configuration of libksba 1.6.3:";;
    esac
   cat <<\_ACEOF
 
@@ -1581,7 +1584,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libksba configure 1.6.0
+libksba configure 1.6.3
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2187,7 +2190,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by libksba $as_me 1.6.0, which was
+It was created by libksba $as_me 1.6.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2543,7 +2546,7 @@
 # Please remember to document interface changes in the NEWS file.
 LIBKSBA_LT_CURRENT=22
 LIBKSBA_LT_AGE=14
-LIBKSBA_LT_REVISION=0
+LIBKSBA_LT_REVISION=3
 #-------------------
 # If the API is changed in an incompatible way: increment the next counter.
 KSBA_CONFIG_API_VERSION=1
@@ -3063,7 +3066,7 @@
 
 # Define the identity of the package.
  PACKAGE='libksba'
- VERSION='1.6.0'
+ VERSION='1.6.3'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -7848,16 +7851,11 @@
       _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
     darwin1.*)
       _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-    darwin*) # darwin 5.x on
-      # if running on 10.5 or later, the deployment target defaults
-      # to the OS version, if on x86, and 10.4, the deployment
-      # target defaults to 10.4. Don't you love it?
-      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
-	10.0,*86*-darwin8*|10.0,*-darwin91*)
-	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-	10.012*)
+    darwin*)
+      case ${MACOSX_DEPLOYMENT_TARGET},$host in
+	10.012*,*|,*powerpc*)
 	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-	10.*)
+	*)
 	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
       esac
     ;;
@@ -12434,12 +12432,50 @@
 
 
 
+# We need to compile and run a program on the build machine.
+# Put a plausible default for CC_FOR_BUILD in Makefile.
+if test -z "$CC_FOR_BUILD"; then
+  if test "x$cross_compiling" = "xno"; then
+    CC_FOR_BUILD='$(CC)'
+  else
+    CC_FOR_BUILD=gcc
+  fi
+fi
+
+# Also set EXEEXT_FOR_BUILD.
+if test "x$cross_compiling" = "xno"; then
+  EXEEXT_FOR_BUILD='$(EXEEXT)'
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for build system executable suffix" >&5
+$as_echo_n "checking for build system executable suffix... " >&6; }
+if ${bfd_cv_build_exeext+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  rm -f conftest*
+     echo 'int main () { return 0; }' > conftest.c
+     bfd_cv_build_exeext=
+     ${CC_FOR_BUILD} -o conftest conftest.c 1>&5 2>&5
+     for file in conftest.*; do
+       case $file in
+       *.c | *.o | *.obj | *.ilk | *.pdb) ;;
+       *) bfd_cv_build_exeext=`echo $file | sed -e s/conftest//` ;;
+       esac
+     done
+     rm -f conftest*
+     test x"${bfd_cv_build_exeext}" = x && bfd_cv_build_exeext=no
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $bfd_cv_build_exeext" >&5
+$as_echo "$bfd_cv_build_exeext" >&6; }
+  EXEEXT_FOR_BUILD=""
+  test x"${bfd_cv_build_exeext}" != xno && EXEEXT_FOR_BUILD=${bfd_cv_build_exeext}
+fi
+
 
 
 
 
 
-VERSION_NUMBER=0x010600
+VERSION_NUMBER=0x010603
 
 
 
@@ -14362,6 +14398,10 @@
         fi
         if test -n "$gpgrt_libdir"; then break; fi
       done
+      if test -z "$libdir_candidates"; then
+        # No valid pkgconfig dir in any of the system directories, fallback
+        gpgrt_libdir=${possible_libdir1}
+      fi
     else
       # When we cannot determine system libdir-format, use this:
       gpgrt_libdir=${possible_libdir1}
@@ -14382,6 +14422,7 @@
     fi
   elif test "$GPG_ERROR_CONFIG" != "no"; then
     gpg_error_config_version=`$GPG_ERROR_CONFIG --version`
+    unset GPGRT_CONFIG
   fi
   if test "$GPG_ERROR_CONFIG" != "no"; then
     req_major=`echo $min_gpg_error_version | \
@@ -14468,132 +14509,17 @@
 $as_echo "#define GPG_ERR_SOURCE_DEFAULT GPG_ERR_SOURCE_KSBA" >>confdefs.h
 
 
-
-# Checks for header files.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
-$as_echo_n "checking for ANSI C header files... " >&6; }
-if ${ac_cv_header_stdc+:} false; then :

_service:tar_scm:libksba-1.6.0.tar.bz2/configure.ac -> _service:tar_scm:libksba-1.6.3.tar.bz2/configure.ac Changed

@@ -18,7 +18,7 @@
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 # Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.61)
+AC_PREREQ(2.69)
 min_automake_version="1.14"
 
 
@@ -30,7 +30,7 @@
 m4_define(mym4_package,libksba)
 m4_define(mym4_major, 1)
 m4_define(mym4_minor, 6)
-m4_define(mym4_micro, 0)
+m4_define(mym4_micro, 3)
 
 # Below is m4 magic to extract and compute the git revision number,
 # the decimalized short revision number, a beta version string and a
@@ -52,7 +52,7 @@
 # Please remember to document interface changes in the NEWS file.
 LIBKSBA_LT_CURRENT=22
 LIBKSBA_LT_AGE=14
-LIBKSBA_LT_REVISION=0
+LIBKSBA_LT_REVISION=3
 #-------------------
 # If the API is changed in an incompatible way: increment the next counter.
 KSBA_CONFIG_API_VERSION=1
@@ -112,6 +112,8 @@
 
 AM_MAINTAINER_MODE
 
+# We need to compile and run a program on the build machine.
+AX_CC_FOR_BUILD
 
 AC_SUBST(LIBKSBA_LT_CURRENT)
 AC_SUBST(LIBKSBA_LT_AGE)
@@ -389,10 +391,10 @@
 AC_DEFINE(GPG_ERR_SOURCE_DEFAULT, GPG_ERR_SOURCE_KSBA,
           The default error source for libksba.)
 
+AM_CONDITIONAL(USE_GPGRT_CONFIG, test -n "$GPGRT_CONFIG" \
+                                  -a "$ac_cv_path_GPG_ERROR_CONFIG" = no)
 
 # Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(string.h)
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
@@ -405,7 +407,7 @@
 
 
 # Checks for library functions.
-AC_CHECK_FUNCS(memmove strchr strtol strtoul stpcpy gmtime_r getenv)
+AC_CHECK_FUNCS(stpcpy gmtime_r getenv)
 
 
 # GNUlib checks

_service:tar_scm:libksba-1.6.0.tar.bz2/doc/Makefile.in -> _service:tar_scm:libksba-1.6.3.tar.bz2/doc/Makefile.in Changed

_service:tar_scm:libksba-1.6.0.tar.bz2/doc/ksba.info -> _service:tar_scm:libksba-1.6.3.tar.bz2/doc/ksba.info Changed

@@ -8,8 +8,8 @@
 This file documents the KSBA library to access X.509 and CMS data
 structures.
 
-   This is edition 1.6.0, last updated 12 May 2020, of 'The KSBA
-Reference Manual', for Version 1.6.0.
+   This is edition 1.6.3, last updated 22 November 2022, of 'The KSBA
+Reference Manual', for Version 1.6.3.
 
    Copyright (C) 2002, 2003, 2004 g10 Code GmbH
 
@@ -25,8 +25,8 @@
 Main Menu
 *********
 
-This is edition 1.6.0, last updated 12 May 2020, of 'The KSBA Reference
-Manual', for Version 1.6.0 of the KSBA library.
+This is edition 1.6.3, last updated 22 November 2022, of 'The KSBA
+Reference Manual', for Version 1.6.3 of the KSBA library.
 
    Copyright (C) 2002, 2003, 2004 g10 Code GmbH
 
@@ -228,33 +228,34 @@
 path (via the '-I' option).
 
    However, the path to the include file is determined at the time the
-source is configured.  To solve this problem, 'KSBA' ships with a small
-helper program 'ksba-config' that knows about the path to the include
-file and other configuration options.  The options that need to be added
-to the compiler invocation at compile time are output by the '--cflags'
-option of 'ksba-config'.  The following example shows how it can be used
-at the command line:
-
-     gcc -c foo.c `ksba-config --cflags`
-
-   Adding the output of 'ksba-config --cflags' to the compiler's command
-line will ensure that the compiler can find the 'ksba.h' header file.
+source is configured.  To solve this problem, 'KSBA' ships with
+'ksba.pc' file, that knows about the path to the include file and other
+configuration options.  The options that need to be added to the
+compiler invocation at compile time are output by the '--cflags' option
+of 'pkg-config ksba'.  The following example shows how it can be used at
+the command line:
+
+     gcc -c foo.c `pkg-config --cflags ksba`
+
+   Adding the output of 'pkg-config --cflags ksba' to the compiler's
+command line will ensure that the compiler can find the 'ksba.h' header
+file.
 
    A similar problem occurs when linking the program with the library.
 Again, the compiler has to find the library files.  For this to work,
 the path to the library files has to be added to the library search path
-(via the '-L' option).  For this, the option '--libs' of 'ksba-config'
-can be used.  For convenience, this option also outputs all other
+(via the '-L' option).  For this, the option '--libs' of 'pkg-config
+ksba' can be used.  For convenience, this option also outputs all other
 options that are required to link the program with the 'KSBA' libraries
 (in particular, the '-lksba' option).  The example shows how to link
 'foo.o' with the 'KSBA' libraries to a program 'foo'.
 
-     gcc -o foo foo.o `ksba-config --libs`
+     gcc -o foo foo.o `pkg-config --libs ksba`
 
    Of course you can also combine both examples to a single command by
-specifying both options to 'ksba-config':
+specifying both options to 'pkg-config ksba':
 
-     gcc -o foo foo.c `ksba-config --cflags --libs`
+     gcc -o foo foo.c `pkg-config --cflags --libs ksba`
 
 &#x1f;
 File: ksba.info,  Node: Certificate Handling,  Next: CMS,  Prev: Preparation,  Up: Top
@@ -1870,33 +1871,33 @@
 
 &#x1f;
 Tag Table:
-Node: Top&#x7f;738
-Node: Introduction&#x7f;2768
-Node: Getting Started&#x7f;3046
-Node: Features&#x7f;3912
-Node: Overview&#x7f;5003
-Node: Preparation&#x7f;5252
-Node: Header&#x7f;5735
-Node: Version Check&#x7f;6331
-Node: Building the source&#x7f;7423
-Node: Certificate Handling&#x7f;9267
-Node: Creating certificates&#x7f;10248
-Node: Retrieving attributes&#x7f;12709
-Node: Setting attributes&#x7f;26927
-Node: User data&#x7f;27192
-Node: CMS&#x7f;29112
-Node: CMS Basics&#x7f;29571
-Node: CMS Parser&#x7f;31634
-Node: CRLs&#x7f;35612
-Node: PKCS10&#x7f;35895
-Node: Utilities&#x7f;36156
-Node: Names&#x7f;36560
-Node: OIDs&#x7f;38872
-Node: DNs&#x7f;39076
-Node: Error Handling&#x7f;40207
-Node: Component Labels&#x7f;41562
-Node: Copying&#x7f;43125
-Node: Concept Index&#x7f;80652
-Node: Function and Data Index&#x7f;80780
+Node: Top&#x7f;743
+Node: Introduction&#x7f;2778
+Node: Getting Started&#x7f;3056
+Node: Features&#x7f;3922
+Node: Overview&#x7f;5013
+Node: Preparation&#x7f;5262
+Node: Header&#x7f;5745
+Node: Version Check&#x7f;6341
+Node: Building the source&#x7f;7433
+Node: Certificate Handling&#x7f;9284
+Node: Creating certificates&#x7f;10265
+Node: Retrieving attributes&#x7f;12726
+Node: Setting attributes&#x7f;26944
+Node: User data&#x7f;27209
+Node: CMS&#x7f;29129
+Node: CMS Basics&#x7f;29588
+Node: CMS Parser&#x7f;31651
+Node: CRLs&#x7f;35629
+Node: PKCS10&#x7f;35912
+Node: Utilities&#x7f;36173
+Node: Names&#x7f;36577
+Node: OIDs&#x7f;38889
+Node: DNs&#x7f;39093
+Node: Error Handling&#x7f;40224
+Node: Component Labels&#x7f;41579
+Node: Copying&#x7f;43142
+Node: Concept Index&#x7f;80669
+Node: Function and Data Index&#x7f;80797
 &#x1f;
 End Tag Table

_service:tar_scm:libksba-1.6.0.tar.bz2/doc/ksba.texi -> _service:tar_scm:libksba-1.6.3.tar.bz2/doc/ksba.texi Changed

@@ -259,18 +259,18 @@
 path (via the @option{-I} option).
 
 However, the path to the include file is determined at the time the
-source is configured.  To solve this problem, `KSBA' ships with a small
-helper program @command{ksba-config} that knows about the path to the
-include file and other configuration options.  The options that need to
-be added to the compiler invocation at compile time are output by the
-@option{--cflags} option of @command{ksba-config}.  The following
+source is configured.  To solve this problem, `KSBA' ships with
+@code{ksba.pc} file, that knows about the path to the include file and
+other configuration options.  The options that need to be added to the
+compiler invocation at compile time are output by the
+@option{--cflags} option of @command{pkg-config ksba}.  The following
 example shows how it can be used at the command line:
 
 @example
-gcc -c foo.c `ksba-config --cflags`
+gcc -c foo.c `pkg-config --cflags ksba`
 @end example
 
-Adding the output of @samp{ksba-config --cflags} to the compiler's
+Adding the output of @samp{pkg-config --cflags ksba} to the compiler's
 command line will ensure that the compiler can find the @file{ksba.h}
 header file.
 
@@ -278,21 +278,21 @@
 Again, the compiler has to find the library files.  For this to work,
 the path to the library files has to be added to the library search path
 (via the @option{-L} option).  For this, the option @option{--libs} of
-@command{ksba-config} can be used.  For convenience, this option also
+@command{pkg-config ksba} can be used.  For convenience, this option also
 outputs all other options that are required to link the program with the
 `KSBA' libraries (in particular, the @samp{-lksba} option).  The
 example shows how to link @file{foo.o} with the `KSBA' libraries to a
 program @command{foo}.
 
 @example
-gcc -o foo foo.o `ksba-config --libs`
+gcc -o foo foo.o `pkg-config --libs ksba`
 @end example
 
 Of course you can also combine both examples to a single command by
-specifying both options to @command{ksba-config}:
+specifying both options to @command{pkg-config ksba}:
 
 @example
-gcc -o foo foo.c `ksba-config --cflags --libs`
+gcc -o foo foo.c `pkg-config --cflags --libs ksba`
 @end example

_service:tar_scm:libksba-1.6.0.tar.bz2/doc/stamp-vti -> _service:tar_scm:libksba-1.6.3.tar.bz2/doc/stamp-vti Changed

_service:tar_scm:libksba-1.6.0.tar.bz2/doc/version.texi -> _service:tar_scm:libksba-1.6.3.tar.bz2/doc/version.texi Changed

_service:tar_scm:libksba-1.6.0.tar.bz2/gl/Makefile.in -> _service:tar_scm:libksba-1.6.3.tar.bz2/gl/Makefile.in Changed

_service:tar_scm:libksba-1.6.0.tar.bz2/m4/Makefile.in -> _service:tar_scm:libksba-1.6.3.tar.bz2/m4/Makefile.in Changed

_service:tar_scm:libksba-1.6.3.tar.bz2/m4/ax_cc_for_build.m4 Added

@@ -0,0 +1,77 @@
+# ===========================================================================
+#     https://www.gnu.org/software/autoconf-archive/ax_cc_for_build.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_CC_FOR_BUILD
+#
+# DESCRIPTION
+#
+#   Find a build-time compiler. Sets CC_FOR_BUILD and EXEEXT_FOR_BUILD.
+#
+# LICENSE
+#
+#   Copyright (c) 2010 Reuben Thomas <rrt@sc3d.org>
+#   Copyright (c) 1999 Richard Henderson <rth@redhat.com>
+#
+#   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 the
+#   Free Software Foundation, either version 3 of the License, or (at your
+#   option) any later version.
+#
+#   This program is distributed in the hope that it will be useful, but
+#   WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+#   Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License along
+#   with this program. If not, see <https://www.gnu.org/licenses/>.
+#
+#   As a special exception, the respective Autoconf Macro's copyright owner
+#   gives unlimited permission to copy, distribute and modify the configure
+#   scripts that are the output of Autoconf when processing the Macro. You
+#   need not follow the terms of the GNU General Public License when using
+#   or distributing such scripts, even though portions of the text of the
+#   Macro appear in them. The GNU General Public License (GPL) does govern
+#   all other use of the material that constitutes the Autoconf Macro.
+#
+#   This special exception to the GPL applies to versions of the Autoconf
+#   Macro released by the Autoconf Archive. When you make and distribute a
+#   modified version of the Autoconf Macro, you may extend this special
+#   exception to the GPL to apply to your modified version as well.
+
+#serial 3
+
+dnl Get a default for CC_FOR_BUILD to put into Makefile.
+AC_DEFUN(AX_CC_FOR_BUILD,
+# Put a plausible default for CC_FOR_BUILD in Makefile.
+if test -z "$CC_FOR_BUILD"; then
+  if test "x$cross_compiling" = "xno"; then
+    CC_FOR_BUILD='$(CC)'
+  else
+    CC_FOR_BUILD=gcc
+  fi
+fi
+AC_SUBST(CC_FOR_BUILD)
+# Also set EXEEXT_FOR_BUILD.
+if test "x$cross_compiling" = "xno"; then
+  EXEEXT_FOR_BUILD='$(EXEEXT)'
+else
+  AC_CACHE_CHECK(for build system executable suffix, bfd_cv_build_exeext,
+    rm -f conftest*
+     echo 'int main () { return 0; }' > conftest.c
+     bfd_cv_build_exeext=
+     ${CC_FOR_BUILD} -o conftest conftest.c 1>&5 2>&5
+     for file in conftest.*; do
+       case $file in
+       *.c | *.o | *.obj | *.ilk | *.pdb) ;;
+       *) bfd_cv_build_exeext=`echo $file | sed -e s/conftest//` ;;
+       esac
+     done
+     rm -f conftest*
+     test x"${bfd_cv_build_exeext}" = x && bfd_cv_build_exeext=no)
+  EXEEXT_FOR_BUILD=""
+  test x"${bfd_cv_build_exeext}" != xno && EXEEXT_FOR_BUILD=${bfd_cv_build_exeext}
+fi
+AC_SUBST(EXEEXT_FOR_BUILD))dnl

_service:tar_scm:libksba-1.6.0.tar.bz2/m4/gpg-error.m4 -> _service:tar_scm:libksba-1.6.3.tar.bz2/m4/gpg-error.m4 Changed

_service:tar_scm:libksba-1.6.0.tar.bz2/m4/libgcrypt.m4 -> _service:tar_scm:libksba-1.6.3.tar.bz2/m4/libgcrypt.m4 Changed

_service:tar_scm:libksba-1.6.0.tar.bz2/m4/libtool.m4 -> _service:tar_scm:libksba-1.6.3.tar.bz2/m4/libtool.m4 Changed

_service:tar_scm:libksba-1.6.0.tar.bz2/src/Makefile.am -> _service:tar_scm:libksba-1.6.3.tar.bz2/src/Makefile.am Changed

@@ -28,7 +28,11 @@
              libksba.vers libksba.def \
 	     asn1-parse.c asn1-tables.c $(buildtool_src) ksba.pc.in
 BUILT_SOURCES = asn1-parse.c asn1-tables.c
+if USE_GPGRT_CONFIG
+noinst_SCRIPTS = ksba-config
+else
 bin_SCRIPTS = ksba-config
+endif
 nodist_include_HEADERS = ksba.h
 lib_LTLIBRARIES = libksba.la
 noinst_PROGRAMS = ber-dump
@@ -65,13 +69,12 @@
 export_symbols = -export-symbols $(srcdir)/libksba.def
 extra_ltoptions = -XCClinker -static-libgcc
 
-install-def-file:
-	$(INSTALL) $(srcdir)/libksba.def $(DESTDIR)$(libdir)/libksba.def
-
 uninstall-def-file:
 	-rm $(DESTDIR)$(libdir)/libksba.def
 
 ksba_deps = $(ksba_res) libksba.def
+ksbadefdir = $(libdir)
+ksbadef_DATA = libksba.def
 
 else !HAVE_W32_SYSTEM
 ksba_res =
@@ -79,7 +82,6 @@
 export_symbols =
 extra_ltoptions =
 ksba_deps =
-install-def-file:
 uninstall-def-file:
 endif !HAVE_W32_SYSTEM
 
@@ -123,7 +125,8 @@
 
 asn1-parse.c : asn1-func.h gen-help.h
 
-asn1-gentables: asn1-gentables.c asn1-parse.c asn1-func.c gen-help.c gen-help.h
+asn1-gentables$(EXEEXT_FOR_BUILD): asn1-gentables.c asn1-parse.c asn1-func.c \
+ gen-help.c gen-help.h
 	$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) \
 	        $(CPPFLAGS_FOR_BUILD) -I$(srcdir) -DBUILD_GENTOOLS -o $@ \
 		$(srcdir)/asn1-gentables.c \
@@ -131,12 +134,10 @@
                 $(srcdir)/asn1-func.c      \
                 $(srcdir)/gen-help.c
 
-asn1-tables.c : $(asn1_modules) asn1-gentables
+asn1-tables.c : $(asn1_modules) asn1-gentables$(EXEEXT_FOR_BUILD)
 	@set -e; list=""; \
 	  for file in $(asn1_modules); do list="$$list $(srcdir)/$$file";done;\
-	  ./asn1-gentables $$list > asn1-tables.c
-
+	  ./asn1-gentables$(EXEEXT_FOR_BUILD) $$list > asn1-tables.c
 
-install-data-local: install-def-file
 
 uninstall-local: uninstall-def-file

_service:tar_scm:libksba-1.6.0.tar.bz2/src/Makefile.in -> _service:tar_scm:libksba-1.6.3.tar.bz2/src/Makefile.in Changed

@@ -117,6 +117,7 @@
 	$(top_srcdir)/gl/m4/gnulib.m4 \
 	$(top_srcdir)/gl/m4/valgrind-tests.m4 \
 	$(top_srcdir)/m4/autobuild.m4 \
+	$(top_srcdir)/m4/ax_cc_for_build.m4 \
 	$(top_srcdir)/m4/ax_prog_bison.m4 $(top_srcdir)/m4/gcov.m4 \
 	$(top_srcdir)/m4/gpg-error.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
@@ -158,8 +159,8 @@
          $(am__cd) "$$dir" && rm -f $$files; }; \
   }
 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
-	"$(DESTDIR)$(m4datadir)" "$(DESTDIR)$(pkgconfigdir)" \
-	"$(DESTDIR)$(includedir)"
+	"$(DESTDIR)$(ksbadefdir)" "$(DESTDIR)$(m4datadir)" \
+	"$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(includedir)"
 LTLIBRARIES = $(lib_LTLIBRARIES)
 @HAVE_W32_SYSTEM_TRUE@am__DEPENDENCIES_1 = versioninfo.lo
 am_libksba_la_OBJECTS = visibility.lo reader.lo writer.lo \
@@ -187,7 +188,7 @@
 ber_dump_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(ber_dump_CFLAGS) \
 	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-SCRIPTS = $(bin_SCRIPTS)
+SCRIPTS = $(bin_SCRIPTS) $(noinst_SCRIPTS)
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
@@ -259,7 +260,7 @@
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
-DATA = $(m4data_DATA) $(pkgconfig_DATA)
+DATA = $(ksbadef_DATA) $(m4data_DATA) $(pkgconfig_DATA)
 HEADERS = $(nodist_include_HEADERS)
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 # Read a list of newline-separated strings from the standard input,
@@ -318,6 +319,7 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@
 FGREP = @FGREP@
 GCOV = @GCOV@
 GENHTML = @GENHTML@
@@ -443,7 +445,8 @@
 	     asn1-parse.c asn1-tables.c $(buildtool_src) ksba.pc.in
 
 BUILT_SOURCES = asn1-parse.c asn1-tables.c
-bin_SCRIPTS = ksba-config
+@USE_GPGRT_CONFIG_TRUE@noinst_SCRIPTS = ksba-config
+@USE_GPGRT_CONFIG_FALSE@bin_SCRIPTS = ksba-config
 nodist_include_HEADERS = ksba.h
 lib_LTLIBRARIES = libksba.la
 m4datadir = $(datadir)/aclocal
@@ -469,6 +472,8 @@
 @HAVE_W32_SYSTEM_TRUE@extra_ltoptions = -XCClinker -static-libgcc
 @HAVE_W32_SYSTEM_FALSE@ksba_deps = 
 @HAVE_W32_SYSTEM_TRUE@ksba_deps = $(ksba_res) libksba.def
+@HAVE_W32_SYSTEM_TRUE@ksbadefdir = $(libdir)
+@HAVE_W32_SYSTEM_TRUE@ksbadef_DATA = libksba.def
 libksba_la_LDFLAGS = $(no_undefined) $(export_symbols) $(extra_ltoptions) \
       $(libksba_version_script_cmd) -version-info \
       @LIBKSBA_LT_CURRENT@:@LIBKSBA_LT_REVISION@:@LIBKSBA_LT_AGE@ \
@@ -850,6 +855,27 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
+install-ksbadefDATA: $(ksbadef_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(ksbadef_DATA)'; test -n "$(ksbadefdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(ksbadefdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(ksbadefdir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(ksbadefdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(ksbadefdir)" || exit $$?; \
+	done
+
+uninstall-ksbadefDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(ksbadef_DATA)'; test -n "$(ksbadefdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(ksbadefdir)'; $(am__uninstall_files_from_dir)
 install-m4dataDATA: $(m4data_DATA)
 	@$(NORMAL_INSTALL)
 	@list='$(m4data_DATA)'; test -n "$(m4datadir)" || list=; \
@@ -1005,7 +1031,7 @@
 all-am: Makefile $(PROGRAMS) $(LTLIBRARIES) $(SCRIPTS) $(DATA) \
 		$(HEADERS)
 installdirs:
-	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(m4datadir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(includedir)"; do \
+	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(ksbadefdir)" "$(DESTDIR)$(m4datadir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(includedir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: $(BUILT_SOURCES)
@@ -1100,7 +1126,7 @@
 
 info-am:
 
-install-data-am: install-data-local install-m4dataDATA \
+install-data-am: install-ksbadefDATA install-m4dataDATA \
 	install-nodist_includeHEADERS install-pkgconfigDATA
 
 install-dvi: install-dvi-am
@@ -1180,8 +1206,8 @@
 
 ps-am:
 
-uninstall-am: uninstall-binSCRIPTS uninstall-libLTLIBRARIES \
-	uninstall-local uninstall-m4dataDATA \
+uninstall-am: uninstall-binSCRIPTS uninstall-ksbadefDATA \
+	uninstall-libLTLIBRARIES uninstall-local uninstall-m4dataDATA \
 	uninstall-nodist_includeHEADERS uninstall-pkgconfigDATA
 
 .MAKE: all check install install-am install-exec install-strip
@@ -1192,17 +1218,17 @@
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
 	install install-am install-binSCRIPTS install-data \
-	install-data-am install-data-local install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-libLTLIBRARIES \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-ksbadefDATA install-libLTLIBRARIES \
 	install-m4dataDATA install-man install-nodist_includeHEADERS \
 	install-pdf install-pdf-am install-pkgconfigDATA install-ps \
 	install-ps-am install-strip installcheck installcheck-am \
 	installdirs maintainer-clean maintainer-clean-generic \
 	mostlyclean mostlyclean-compile mostlyclean-generic \
 	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
-	uninstall-am uninstall-binSCRIPTS uninstall-libLTLIBRARIES \
-	uninstall-local uninstall-m4dataDATA \
+	uninstall-am uninstall-binSCRIPTS uninstall-ksbadefDATA \
+	uninstall-libLTLIBRARIES uninstall-local uninstall-m4dataDATA \
 	uninstall-nodist_includeHEADERS uninstall-pkgconfigDATA
 
 .PRECIOUS: Makefile
@@ -1211,17 +1237,14 @@
 @HAVE_W32_SYSTEM_TRUE@.rc.lo:
 @HAVE_W32_SYSTEM_TRUE@	$(LTRCCOMPILE) -i "$<" -o "$@"
 
-@HAVE_W32_SYSTEM_TRUE@install-def-file:
-@HAVE_W32_SYSTEM_TRUE@	$(INSTALL) $(srcdir)/libksba.def $(DESTDIR)$(libdir)/libksba.def
-
 @HAVE_W32_SYSTEM_TRUE@uninstall-def-file:
 @HAVE_W32_SYSTEM_TRUE@	-rm $(DESTDIR)$(libdir)/libksba.def
-@HAVE_W32_SYSTEM_FALSE@install-def-file:
 @HAVE_W32_SYSTEM_FALSE@uninstall-def-file:
 
 asn1-parse.c : asn1-func.h gen-help.h
 
-asn1-gentables: asn1-gentables.c asn1-parse.c asn1-func.c gen-help.c gen-help.h
+asn1-gentables$(EXEEXT_FOR_BUILD): asn1-gentables.c asn1-parse.c asn1-func.c \
+ gen-help.c gen-help.h
 	$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) \
 	        $(CPPFLAGS_FOR_BUILD) -I$(srcdir) -DBUILD_GENTOOLS -o $@ \
 		$(srcdir)/asn1-gentables.c \
@@ -1229,12 +1252,10 @@
                 $(srcdir)/asn1-func.c      \
                 $(srcdir)/gen-help.c
 
-asn1-tables.c : $(asn1_modules) asn1-gentables
+asn1-tables.c : $(asn1_modules) asn1-gentables$(EXEEXT_FOR_BUILD)
 	@set -e; list=""; \
 	  for file in $(asn1_modules); do list="$$list $(srcdir)/$$file";done;\
-	  ./asn1-gentables $$list > asn1-tables.c
-
-install-data-local: install-def-file
+	  ./asn1-gentables$(EXEEXT_FOR_BUILD) $$list > asn1-tables.c
 
 uninstall-local: uninstall-def-file

_service:tar_scm:libksba-1.6.0.tar.bz2/src/asn1-func.c -> _service:tar_scm:libksba-1.6.3.tar.bz2/src/asn1-func.c Changed

@@ -121,8 +121,8 @@
 
 
 /* Change the value field of the node to the content of buffer value
-   of size LEN.  With VALUE of NULL or LEN of 0 the value field is
-   deleted */
+   of size LEN.  With VALUE of NULL or LEN of 0 and a VTYPE of
+   VALTYPE_NULL the value field is deleted */
 void
 _ksba_asn_set_value (AsnNode node,
                      enum asn_value_type vtype, const void *value, size_t len)
@@ -143,15 +143,16 @@
     case VALTYPE_NULL:
       break;
     case VALTYPE_BOOL:
-      return_if_fail (len);
-      node->value.v_bool = !!(const unsigned *)value;
+      return_if_fail (len && value);
+      node->value.v_bool = !!*(const unsigned *)value;
       break;
     case VALTYPE_CSTR:
+      return_if_fail (value);
       node->value.v_cstr = xstrdup (value);
       break;
     case VALTYPE_MEM:
       node->value.v_mem.len = len;
-      if (len)
+      if (len && value)
         {
           node->value.v_mem.buf = xmalloc (len);
           memcpy (node->value.v_mem.buf, value, len);
@@ -160,12 +161,12 @@
           node->value.v_mem.buf = NULL;
       break;
     case VALTYPE_LONG:
-      return_if_fail (sizeof (long) == len);
+      return_if_fail (sizeof (long) == len && value);
       node->value.v_long = *(long *)value;
       break;
 
     case VALTYPE_ULONG:
-      return_if_fail (sizeof (unsigned long) == len);
+      return_if_fail (sizeof (unsigned long) == len && value);
       node->value.v_ulong = *(unsigned long *)value;
       break;

_service:tar_scm:libksba-1.6.0.tar.bz2/src/asn1-parse.c -> _service:tar_scm:libksba-1.6.3.tar.bz2/src/asn1-parse.c Changed

@@ -94,9 +94,6 @@
 /* #define YYDEBUG 1 */
 #define MAX_STRING_LENGTH 129
 
-/* Dummy print so that yytoknum will be defined.  */
-#define YYPRINT(F, N, L)  do { } while (0);
-
 
 /* constants used in the grammar */
 enum {
@@ -115,7 +112,7 @@
 #define PARSECTL ((struct parser_control_s *)parm)
 
 
-#line 119 "asn1-parse.c" /* yacc.c:337  */
+#line 116 "asn1-parse.c" /* yacc.c:337  */
 # ifndef YY_NULLPTR
 #  if defined __cplusplus
 #   if 201103L <= __cplusplus
@@ -202,13 +199,13 @@
 
 union YYSTYPE
 {
-#line 97 "/home/wk/s/libksba/src/asn1-parse.y" /* yacc.c:352  */
+#line 94 "/home/wk/s/libksba/src/asn1-parse.y" /* yacc.c:352  */
 
   unsigned int constant;
   char strMAX_STRING_LENGTH;
   AsnNode node;
 
-#line 212 "asn1-parse.c" /* yacc.c:352  */
+#line 209 "asn1-parse.c" /* yacc.c:352  */
 };
 
 typedef union YYSTYPE YYSTYPE;
@@ -223,7 +220,7 @@
 
 
 /* Second part of user prologue.  */
-#line 103 "/home/wk/s/libksba/src/asn1-parse.y" /* yacc.c:354  */
+#line 100 "/home/wk/s/libksba/src/asn1-parse.y" /* yacc.c:354  */
 
 static AsnNode new_node (struct parser_control_s *parsectl, node_type_t type);
 #define NEW_NODE(a)  (new_node (PARSECTL, (a)))
@@ -238,7 +235,7 @@
 static int yylex (YYSTYPE *lvalp, void *parm);
 static void yyerror (void *parm, const char *s);
 
-#line 242 "asn1-parse.c" /* yacc.c:354  */
+#line 239 "asn1-parse.c" /* yacc.c:354  */
 
 #ifdef short
 # undef short
@@ -531,18 +528,18 @@
   /* YYRLINEYYN -- Source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline =
 {
-       0,   184,   184,   185,   188,   189,   192,   199,   200,   203,
-     204,   207,   208,   211,   216,   224,   225,   250,   255,   263,
-     265,   272,   273,   274,   277,   283,   291,   293,   298,   305,
-     310,   315,   322,   326,   332,   343,   349,   353,   359,   365,
-     374,   378,   384,   388,   396,   397,   404,   405,   412,   414,
-     421,   423,   430,   431,   438,   440,   447,   448,   457,   458,
-     459,   460,   461,   462,   463,   469,   477,   481,   488,   492,
-     500,   508,   514,   519,   526,   527,   528,   529,   530,   531,
-     532,   533,   534,   535,   536,   537,   538,   544,   548,   559,
-     563,   570,   577,   584,   586,   593,   598,   603,   612,   617,
-     622,   631,   638,   642,   654,   661,   668,   677,   686,   687,
-     690,   692,   699,   708,   724,   725,   728
+       0,   179,   179,   180,   183,   184,   187,   194,   195,   198,
+     199,   202,   203,   206,   211,   219,   220,   245,   250,   258,
+     260,   267,   268,   269,   272,   278,   286,   288,   293,   300,
+     305,   310,   317,   321,   327,   338,   344,   348,   354,   360,
+     369,   373,   379,   383,   391,   392,   399,   400,   407,   409,
+     416,   418,   425,   426,   433,   435,   442,   443,   452,   453,
+     454,   455,   456,   457,   458,   464,   472,   476,   483,   487,
+     495,   503,   509,   514,   521,   522,   523,   524,   525,   526,
+     527,   528,   529,   530,   531,   532,   533,   539,   543,   554,
+     558,   565,   572,   579,   581,   588,   593,   598,   607,   612,
+     617,   626,   633,   637,   649,   656,   663,   672,   681,   682,
+     685,   687,   694,   703,   719,   720,   723
 };
 #endif
 
@@ -1480,239 +1477,239 @@
   switch (yyn)
     {
         case 4:
-#line 188 "/home/wk/s/libksba/src/asn1-parse.y" /* yacc.c:1652  */
+#line 183 "/home/wk/s/libksba/src/asn1-parse.y" /* yacc.c:1652  */
     { strcpy((yyval.str),(yyvsp0.str)); }
-#line 1486 "asn1-parse.c" /* yacc.c:1652  */
+#line 1483 "asn1-parse.c" /* yacc.c:1652  */
     break;
 
   case 5:
-#line 189 "/home/wk/s/libksba/src/asn1-parse.y" /* yacc.c:1652  */
+#line 184 "/home/wk/s/libksba/src/asn1-parse.y" /* yacc.c:1652  */
     { strcpy((yyval.str),(yyvsp0.str)); }
-#line 1492 "asn1-parse.c" /* yacc.c:1652  */
+#line 1489 "asn1-parse.c" /* yacc.c:1652  */
     break;
 
   case 6:
-#line 193 "/home/wk/s/libksba/src/asn1-parse.y" /* yacc.c:1652  */
+#line 188 "/home/wk/s/libksba/src/asn1-parse.y" /* yacc.c:1652  */
     {
                   strcpy((yyval.str),"-");
                   strcat((yyval.str),(yyvsp0.str));
                 }
-#line 1501 "asn1-parse.c" /* yacc.c:1652  */
+#line 1498 "asn1-parse.c" /* yacc.c:1652  */
     break;
 
   case 7:
-#line 199 "/home/wk/s/libksba/src/asn1-parse.y" /* yacc.c:1652  */
+#line 194 "/home/wk/s/libksba/src/asn1-parse.y" /* yacc.c:1652  */
     { strcpy((yyval.str),(yyvsp0.str)); }
-#line 1507 "asn1-parse.c" /* yacc.c:1652  */
+#line 1504 "asn1-parse.c" /* yacc.c:1652  */
     break;
 
   case 8:
-#line 200 "/home/wk/s/libksba/src/asn1-parse.y" /* yacc.c:1652  */
+#line 195 "/home/wk/s/libksba/src/asn1-parse.y" /* yacc.c:1652  */
     { strcpy((yyval.str),(yyvsp0.str)); }
-#line 1513 "asn1-parse.c" /* yacc.c:1652  */
+#line 1510 "asn1-parse.c" /* yacc.c:1652  */
     break;
 
   case 9:
-#line 203 "/home/wk/s/libksba/src/asn1-parse.y" /* yacc.c:1652  */
+#line 198 "/home/wk/s/libksba/src/asn1-parse.y" /* yacc.c:1652  */
     {strcpy((yyval.str),(yyvsp0.str));}
-#line 1519 "asn1-parse.c" /* yacc.c:1652  */
+#line 1516 "asn1-parse.c" /* yacc.c:1652  */
     break;
 
   case 10:
-#line 204 "/home/wk/s/libksba/src/asn1-parse.y" /* yacc.c:1652  */
+#line 199 "/home/wk/s/libksba/src/asn1-parse.y" /* yacc.c:1652  */
     {strcpy((yyval.str),(yyvsp0.str));}
-#line 1525 "asn1-parse.c" /* yacc.c:1652  */
+#line 1522 "asn1-parse.c" /* yacc.c:1652  */
     break;
 
   case 11:
-#line 207 "/home/wk/s/libksba/src/asn1-parse.y" /* yacc.c:1652  */
+#line 202 "/home/wk/s/libksba/src/asn1-parse.y" /* yacc.c:1652  */
     {strcpy((yyval.str),(yyvsp0.str));}
-#line 1531 "asn1-parse.c" /* yacc.c:1652  */
+#line 1528 "asn1-parse.c" /* yacc.c:1652  */
     break;
 
   case 12:
-#line 208 "/home/wk/s/libksba/src/asn1-parse.y" /* yacc.c:1652  */
+#line 203 "/home/wk/s/libksba/src/asn1-parse.y" /* yacc.c:1652  */
     {strcpy((yyval.str),(yyvsp0.str));}
-#line 1537 "asn1-parse.c" /* yacc.c:1652  */
+#line 1534 "asn1-parse.c" /* yacc.c:1652  */
     break;
 
   case 13:
-#line 212 "/home/wk/s/libksba/src/asn1-parse.y" /* yacc.c:1652  */
+#line 207 "/home/wk/s/libksba/src/asn1-parse.y" /* yacc.c:1652  */
     {
                           (yyval.node) = NEW_NODE (TYPE_CONSTANT);
                           set_str_value ((yyval.node), (yyvsp-1.str));
                         }
-#line 1546 "asn1-parse.c" /* yacc.c:1652  */
+#line 1543 "asn1-parse.c" /* yacc.c:1652  */
     break;
 
   case 14:
-#line 217 "/home/wk/s/libksba/src/asn1-parse.y" /* yacc.c:1652  */
+#line 212 "/home/wk/s/libksba/src/asn1-parse.y" /* yacc.c:1652  */
     {
                           (yyval.node) = NEW_NODE (TYPE_CONSTANT);
                           set_name ((yyval.node), (yyvsp-3.str));
                           set_str_value ((yyval.node), (yyvsp-1.str));
                         }
-#line 1556 "asn1-parse.c" /* yacc.c:1652  */
+#line 1553 "asn1-parse.c" /* yacc.c:1652  */
     break;
 
   case 15:
-#line 224 "/home/wk/s/libksba/src/asn1-parse.y" /* yacc.c:1652  */
+#line 219 "/home/wk/s/libksba/src/asn1-parse.y" /* yacc.c:1652  */
     { (yyval.node)=(yyvsp0.node); }
-#line 1562 "asn1-parse.c" /* yacc.c:1652  */
+#line 1559 "asn1-parse.c" /* yacc.c:1652  */
     break;
 
   case 16:
-#line 226 "/home/wk/s/libksba/src/asn1-parse.y" /* yacc.c:1652  */
+#line 221 "/home/wk/s/libksba/src/asn1-parse.y" /* yacc.c:1652  */
     {
                     (yyval.node) = (yyvsp-2.node);
                     append_right ((yyvsp-2.node), (yyvsp0.node));
                   }

_service:tar_scm:libksba-1.6.0.tar.bz2/src/asn1-parse.y -> _service:tar_scm:libksba-1.6.3.tar.bz2/src/asn1-parse.y Changed

@@ -66,9 +66,6 @@
 /* #define YYDEBUG 1 */
 #define MAX_STRING_LENGTH 129
 
-/* Dummy print so that yytoknum will be defined.  */
-#define YYPRINT(F, N, L)  do { } while (0);
-
 
 /* constants used in the grammar */
 enum {
@@ -115,8 +112,6 @@
 static void yyerror (void *parm, const char *s);
 %}
 
-%token-table
-
 %token ASSIG           "::="
 %token <str> NUM
 %token <str> IDENTIFIER
@@ -764,6 +759,56 @@
 %%
 
 &#xc;
+struct token_table_s {
+  const char *word;
+  int token;
+};
+
+static struct token_table_s token_table = {
+  { "::=",             ASSIG           },
+  { "ANY",             ANY             },
+  { "APPLICATION",     APPLICATION     },
+  { "BEGIN",           ksba_BEGIN      },
+  { "BIT",             BIT             },
+  { "BMPString",       BMPSTRING       },
+  { "BOOLEAN",         ksba_BOOLEAN    },
+  { "BY",              BY              },
+  { "CHOICE",          CHOICE          },
+  { "DEFAULT",         DEFAULT         },
+  { "DEFINED",         DEFINED         },
+  { "DEFINITIONS",     DEFINITIONS     },
+  { "END",             ksba_END        },
+  { "ENUMERATED",      ENUMERATED      },
+  { "EXPLICIT",        EXPLICIT        },
+  { "FALSE",           ksba_FALSE      },
+  { "FROM",            FROM            },
+  { "GeneralizedTime", GeneralizedTime },
+  { "IA5String",       IA5STRING       },
+  { "IDENTIFIER",      STR_IDENTIFIER  },
+  { "IMPLICIT",        IMPLICIT        },
+  { "IMPORTS",         IMPORTS         },
+  { "INTEGER",         INTEGER         },
+  { "NULL",            TOKEN_NULL      },
+  { "NumericString",   NUMERICSTRING   },
+  { "OBJECT",          OBJECT          },
+  { "OCTET",           OCTET           },
+  { "OF",              OF              },
+  { "OPTIONAL",        OPTIONAL        },
+  { "PRIVATE",         PRIVATE         },
+  { "PrintableString", PRINTABLESTRING },
+  { "SEQUENCE",        SEQUENCE        },
+  { "SET",             SET             },
+  { "SIZE",            SIZE            },
+  { "STRING",          STRING          },
+  { "TAGS",            TAGS            },
+  { "TRUE",            ksba_TRUE       },
+  { "TeletexString",   TELETEXSTRING   },
+  { "UNIVERSAL",       UNIVERSAL       },
+  { "UTCTime",         UTCTime         },
+  { "UTF8String",      UTF8STRING      },
+  { "UniversalString", UNIVERSALSTRING },
+};
+
 /*************************************************************/
 /*  Function: yylex                                          */
 /*  Description: looks for tokens in file_asn1 pointer file. */
@@ -775,7 +820,6 @@
 {
   int c,counter=0,k;
   char stringMAX_STRING_LENGTH;
-  size_t len;
   FILE *fp = PARSECTL->fp;
 
   if (!PARSECTL->lineno)
@@ -852,13 +896,10 @@
         }
 
       /* Is STRING a keyword? */
-      len = strlen (string);
-      for (k = 0; k < YYNTOKENS; k++)
+      for (k = 0; k < DIM (token_table); k++)
         {
-          if (yytnamek && yytnamek0 == '\"'
-              && !strncmp (yytnamek + 1, string, len)
-              && yytnameklen + 1 == '\"' && !yytnameklen + 2)
-            return yytoknumk;
+          if (!strcmp (token_tablek.word, string))
+            return token_tablek.token;
         }
 
       /* STRING is an IDENTIFIER */

_service:tar_scm:libksba-1.6.0.tar.bz2/src/ber-help.c -> _service:tar_scm:libksba-1.6.3.tar.bz2/src/ber-help.c Changed

_service:tar_scm:libksba-1.6.0.tar.bz2/src/convert.h -> _service:tar_scm:libksba-1.6.3.tar.bz2/src/convert.h Changed

_service:tar_scm:libksba-1.6.0.tar.bz2/src/crl.c -> _service:tar_scm:libksba-1.6.3.tar.bz2/src/crl.c Changed

_service:tar_scm:libksba-1.6.0.tar.bz2/src/ksba.h -> _service:tar_scm:libksba-1.6.3.tar.bz2/src/ksba.h Changed

_service:tar_scm:libksba-1.6.0.tar.bz2/src/ksba.m4 -> _service:tar_scm:libksba-1.6.3.tar.bz2/src/ksba.m4 Changed

_service:tar_scm:libksba-1.6.0.tar.bz2/src/ksba.pc.in -> _service:tar_scm:libksba-1.6.3.tar.bz2/src/ksba.pc.in Changed

_service:tar_scm:libksba-1.6.0.tar.bz2/src/ocsp.c -> _service:tar_scm:libksba-1.6.3.tar.bz2/src/ocsp.c Changed

@@ -278,7 +278,7 @@
   if (err)
     goto leave;
 
-  /* Write OID and and nonce.  */
+  /* Write OID and nonce.  */
   err = ksba_oid_from_str (oidstr_ocsp_nonce, &buf, &buflen);
   if (err)
     goto leave;
@@ -358,6 +358,7 @@
   unsigned char *p;
   const unsigned char *der;
   size_t derlen;
+  struct tag_info ti;
   ksba_writer_t w1 = NULL;
   ksba_writer_t w2 = NULL;
   ksba_writer_t w3 = NULL;
@@ -423,16 +424,24 @@
         err = ksba_writer_write (w1, der, derlen);
       if (err)
         goto leave;
-      xfree (ri->serialno);
-      ri->serialno = xtrymalloc (derlen);
-      if (!ri->serialno)
-        {
-          err = gpg_error_from_syserror ();
-          goto leave;
-        }
-      memcpy (ri->serialno, der, derlen);
-      ri->serialnolen = derlen;
+      /* Store the integer value.  */
+      {
+        const unsigned char *tmpder = der;
+        size_t tmpderlen = derlen;
 
+        err = parse_integer (&tmpder, &tmpderlen, &ti);
+        if (err)
+          goto leave;
+        xfree (ri->serialno);
+        ri->serialno = xtrymalloc (tmpderlen);
+        if (!ri->serialno)
+          {
+            err = gpg_error_from_syserror ();
+            goto leave;
+          }
+        memcpy (ri->serialno, tmpder, tmpderlen);
+        ri->serialnolen = tmpderlen;
+      }
 
       /* Now write it out as a sequence to the outer certID object. */
       p = ksba_writer_snatch_mem (w1, &derlen);
@@ -711,8 +720,12 @@
           if (ocsp->noncelen != ti.length
               || memcmp (ocsp->nonce, data, ti.length))
             ocsp->bad_nonce = 1;
-          else
-            ocsp->good_nonce = 1;
+        }
+      if (ti.length > (1<<24))
+        {
+          /* Bail out on much too large objects.  */
+          err = gpg_error (GPG_ERR_BAD_BER);
+          goto leave;
         }
       ex = xtrymalloc (sizeof *ex + strlen (oid) + ti.length);
       if (!ex)
@@ -781,6 +794,12 @@
       err = parse_octet_string (&data, &datalen, &ti);
       if (err)
         goto leave;
+      if (ti.length > (1<<24))
+        {
+          /* Bail out on much too large objects.  */
+          err = gpg_error (GPG_ERR_BAD_BER);
+          goto leave;
+        }
       ex = xtrymalloc (sizeof *ex + strlen (oid) + ti.length);
       if (!ex)
         {
@@ -953,7 +972,7 @@
   assert (n <= *datalen);
   *data += n;
   *datalen -= n;
-  /*   fprintf (stderr, "algorithmIdentifier is `%s'\n", oid); */
+  /* gpgrt_log_debug ("algorithmIdentifier is `%s'\n", oid); */
   look_for_request = !strcmp (oid, oidstr_sha1);
   xfree (oid);
 
@@ -994,10 +1013,10 @@
       for (request_item = ocsp->requestlist;
            request_item; request_item = request_item->next)
         if (!memcmp (request_item->issuer_name_hash, name_hash, 20)
-             && !memcmp (request_item->issuer_key_hash, key_hash, 20)
-             && request_item->serialnolen == serialnolen
+            && !memcmp (request_item->issuer_key_hash, key_hash, 20)
+            && request_item->serialnolen == serialnolen
             && !memcmp (request_item->serialno, serialno, serialnolen))
-          break; /* Got it. */
+            break; /* Got it. */
     }
 
 
@@ -1103,9 +1122,8 @@
   err = parse_asntime_into_isotime (data, datalen, this_update);
   if (err)
     return err;
-/*   fprintf (stderr, "thisUpdate=%s\n", this_update); */
   if (request_item)
-      _ksba_copy_time (request_item->this_update, this_update);
+    _ksba_copy_time (request_item->this_update, this_update);
 
   /* nextUpdate is optional. */
   if (*data >= endptr)
@@ -1121,7 +1139,6 @@
       err = parse_asntime_into_isotime (data, datalen, next_update);
       if (err)
         return err;
-/*       fprintf (stderr, "nextUpdate=%s\n", next_update); */
       if (request_item)
         _ksba_copy_time (request_item->next_update, next_update);
     }
@@ -1434,7 +1451,6 @@
   ocsp->received_certs = NULL;
   ocsp->hash_length = 0;
   ocsp->bad_nonce = 0;
-  ocsp->good_nonce = 0;
   xfree (ocsp->responder_id.name);
   ocsp->responder_id.name = NULL;
   xfree (ocsp->responder_id.keyid);
@@ -1456,9 +1472,12 @@
   /* FIXME: find duplicates in the request list and set them to the
      same status. */
 
-  if (*response_status == KSBA_OCSP_RSPSTATUS_SUCCESS)
-    if (ocsp->bad_nonce || (ocsp->noncelen && !ocsp->good_nonce))
-      *response_status = KSBA_OCSP_RSPSTATUS_REPLAYED;
+  /* We used to assume that the server needs to return a nonce, but
+   * that is not true (see for example RFC-8954).  Thus we do not
+   * check the former good_nonce flag anymore.  */
+  if (*response_status == KSBA_OCSP_RSPSTATUS_SUCCESS
+      && ocsp->bad_nonce)
+    *response_status = KSBA_OCSP_RSPSTATUS_REPLAYED;
 
   return err;
 }

_service:tar_scm:libksba-1.6.0.tar.bz2/src/ocsp.h -> _service:tar_scm:libksba-1.6.3.tar.bz2/src/ocsp.h Changed

_service:tar_scm:libksba-1.6.0.tar.bz2/src/time.c -> _service:tar_scm:libksba-1.6.3.tar.bz2/src/time.c Changed

_service:tar_scm:libksba-1.6.0.tar.bz2/tests/Makefile.in -> _service:tar_scm:libksba-1.6.3.tar.bz2/tests/Makefile.in Changed

_service:tar_scm:libksba-1.6.0.tar.bz2/tests/t-cms-parser.c -> _service:tar_scm:libksba-1.6.3.tar.bz2/tests/t-cms-parser.c Changed

Changes of Revision 2