Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libfcrypto for openSUSE:Factory checked in at 2024-04-15 20:17:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libfcrypto (Old) and /work/SRC/openSUSE:Factory/.libfcrypto.new.26366 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libfcrypto" Mon Apr 15 20:17:22 2024 rev:10 rq:1167728 version:20240414 Changes: -------- --- /work/SRC/openSUSE:Factory/libfcrypto/libfcrypto.changes 2024-02-07 18:49:21.620748867 +0100 +++ /work/SRC/openSUSE:Factory/.libfcrypto.new.26366/libfcrypto.changes 2024-04-15 20:23:42.416214879 +0200 @@ -1,0 +2,6 @@ +Sun Apr 14 11:26:04 UTC 2024 - Jan Engelhardt <jeng...@inai.de> + +- Update to release 20240414 + * No changelog was provided + +------------------------------------------------------------------- Old: ---- libfcrypto-alpha-20240115.tar.gz libfcrypto-alpha-20240115.tar.gz.asc New: ---- libfcrypto-alpha-20240414.tar.gz libfcrypto-alpha-20240414.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libfcrypto.spec ++++++ --- /var/tmp/diff_new_pack.w9iMPL/_old 2024-04-15 20:23:42.920233435 +0200 +++ /var/tmp/diff_new_pack.w9iMPL/_new 2024-04-15 20:23:42.920233435 +0200 @@ -20,7 +20,7 @@ Name: libfcrypto %define lname libfcrypto1 -Version: 20240115 +Version: 20240414 Release: 0 Summary: Library for encryption formats License: LGPL-3.0-or-later @@ -29,14 +29,14 @@ Source: https://github.com/libyal/libfcrypto/releases/download/%version/libfcrypto-alpha-%version.tar.gz Source2: https://github.com/libyal/libfcrypto/releases/download/%version/libfcrypto-alpha-%version.tar.gz.asc Source9: %name.keyring -BuildRequires: %{python_module devel} -BuildRequires: %{python_module setuptools} +BuildRequires: %python_module devel +BuildRequires: %python_module setuptools BuildRequires: c_compiler BuildRequires: gettext-tools >= 0.21 BuildRequires: libtool BuildRequires: pkg-config BuildRequires: python-rpm-macros -BuildRequires: pkgconfig(libcerror) >= 20240101 +BuildRequires: pkgconfig(libcerror) >= 20240413 %python_subpackages # Various notes: https://en.opensuse.org/libyal @@ -70,7 +70,6 @@ %build %{python_expand # -# see libcdata for version-sc echo "V_%version { global: *; };" >v.sym %configure --disable-static --disable-rpath \ --enable-wide-character-type \ @@ -92,8 +91,7 @@ # and that no longer works when using version-script make check || : -%post -n %lname -p /sbin/ldconfig -%postun -n %lname -p /sbin/ldconfig +%ldconfig_scriptlets -n %lname %files -n %lname %license COPYING* ++++++ libfcrypto-alpha-20240115.tar.gz -> libfcrypto-alpha-20240414.tar.gz ++++++ ++++ 2056 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libfcrypto-20240115/Makefile.am new/libfcrypto-20240414/Makefile.am --- old/libfcrypto-20240115/Makefile.am 2023-12-03 10:03:56.000000000 +0100 +++ new/libfcrypto-20240414/Makefile.am 2024-04-14 11:52:55.000000000 +0200 @@ -48,8 +48,15 @@ $(SETUP_PY_FILES) \ $(SPEC_FILES) -MAINTAINERCLEANFILES = \ - Makefile.in +DISTCLEANFILES = \ + config.status \ + config.cache \ + config.log \ + libfcrypto.pc \ + libfcrypto.spec \ + Makefile \ + Makefile.in \ + po/Makevars pkgconfigdir = $(libdir)/pkgconfig @@ -67,15 +74,3 @@ (cd $(srcdir)/libfcrypto && $(MAKE) $(AM_MAKEFLAGS)) (cd $(srcdir)/po && $(MAKE) $(AM_MAKEFLAGS)) -distclean: clean - -rm -f Makefile - -rm -f config.status - -rm -f config.cache - -rm -f config.log - -rm -f libfcrypto.pc - -rm -f libfcrypto.spec - @for dir in ${subdirs}; do \ - (cd $$dir && $(MAKE) distclean) \ - || case "$(MFLAGS)" in *k*) fail=yes;; *) exit 1;; esac; \ - done && test -z "$$fail" - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libfcrypto-20240115/common/Makefile.am new/libfcrypto-20240414/common/Makefile.am --- old/libfcrypto-20240115/common/Makefile.am 2024-01-15 05:20:15.000000000 +0100 +++ new/libfcrypto-20240414/common/Makefile.am 2024-04-14 11:52:08.000000000 +0200 @@ -1,4 +1,5 @@ -AM_CPPFLAGS = -I$(top_srcdir)/include +AM_CPPFLAGS = \ + -I../include -I../include -I$(top_srcdir)/include EXTRA_DIST = \ byte_stream.h \ @@ -15,11 +16,9 @@ types.h.in \ wide_string.h -MAINTAINERCLEANFILES = \ +DISTCLEANFILES = \ + config.h \ + types.h \ + Makefile \ Makefile.in -distclean: clean - -rm -f config.h - -rm -f types.h - -rm -f Makefile - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libfcrypto-20240115/common/config.h new/libfcrypto-20240414/common/config.h --- old/libfcrypto-20240115/common/config.h 2024-01-15 05:23:03.000000000 +0100 +++ new/libfcrypto-20240414/common/config.h 2024-04-14 12:08:00.000000000 +0200 @@ -287,7 +287,7 @@ #define PACKAGE_NAME "libfcrypto" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "libfcrypto 20240115" +#define PACKAGE_STRING "libfcrypto 20240414" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "libfcrypto" @@ -296,7 +296,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "20240115" +#define PACKAGE_VERSION "20240414" /* The size of `int', as computed by sizeof. */ #define SIZEOF_INT 4 @@ -322,7 +322,7 @@ /* #undef STRERROR_R_CHAR_P */ /* Version number of package */ -#define VERSION "20240115" +#define VERSION "20240414" /* Number of bits in a file offset, on hosts where this is settable. */ /* #undef _FILE_OFFSET_BITS */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libfcrypto-20240115/configure.ac new/libfcrypto-20240414/configure.ac --- old/libfcrypto-20240115/configure.ac 2024-01-15 05:20:15.000000000 +0100 +++ new/libfcrypto-20240414/configure.ac 2024-04-14 11:51:41.000000000 +0200 @@ -2,7 +2,7 @@ AC_INIT( [libfcrypto], - [20240115], + [20240414], [joachim.m...@gmail.com]) AC_CONFIG_SRCDIR( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libfcrypto-20240115/dpkg/changelog new/libfcrypto-20240414/dpkg/changelog --- old/libfcrypto-20240115/dpkg/changelog 2024-01-15 05:23:28.000000000 +0100 +++ new/libfcrypto-20240414/dpkg/changelog 2024-04-14 12:08:49.000000000 +0200 @@ -1,5 +1,5 @@ -libfcrypto (20240115-1) unstable; urgency=low +libfcrypto (20240414-1) unstable; urgency=low * Auto-generated - -- Joachim Metz <joachim.m...@gmail.com> Mon, 15 Jan 2024 05:23:27 +0100 + -- Joachim Metz <joachim.m...@gmail.com> Sun, 14 Apr 2024 12:08:46 +0200 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libfcrypto-20240115/include/Makefile.am new/libfcrypto-20240414/include/Makefile.am --- old/libfcrypto-20240115/include/Makefile.am 2024-01-15 05:20:15.000000000 +0100 +++ new/libfcrypto-20240414/include/Makefile.am 2024-04-14 11:52:08.000000000 +0200 @@ -14,13 +14,11 @@ libfcrypto/features.h.in \ libfcrypto/types.h.in -MAINTAINERCLEANFILES = \ +DISTCLEANFILES = \ + libfcrypto.h \ + libfcrypto/definitions.h \ + libfcrypto/features.h \ + libfcrypto/types.h \ + Makefile \ Makefile.in -distclean: clean - -rm -f libfcrypto.h - -rm -f libfcrypto/definitions.h - -rm -f libfcrypto/features.h - -rm -f libfcrypto/types.h - -rm -f Makefile - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libfcrypto-20240115/include/libfcrypto/definitions.h new/libfcrypto-20240414/include/libfcrypto/definitions.h --- old/libfcrypto-20240115/include/libfcrypto/definitions.h 2024-01-15 05:23:28.000000000 +0100 +++ new/libfcrypto-20240414/include/libfcrypto/definitions.h 2024-04-14 12:08:49.000000000 +0200 @@ -24,11 +24,11 @@ #include <libfcrypto/types.h> -#define LIBFCRYPTO_VERSION 20240115 +#define LIBFCRYPTO_VERSION 20240414 /* The version string */ -#define LIBFCRYPTO_VERSION_STRING "20240115" +#define LIBFCRYPTO_VERSION_STRING "20240414" /* The crypt modes */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libfcrypto-20240115/libcerror/Makefile.am new/libfcrypto-20240414/libcerror/Makefile.am --- old/libfcrypto-20240115/libcerror/Makefile.am 2024-01-15 05:23:16.000000000 +0100 +++ new/libfcrypto-20240414/libcerror/Makefile.am 2024-04-14 12:08:28.000000000 +0200 @@ -1,7 +1,7 @@ if HAVE_LOCAL_LIBCERROR AM_CPPFLAGS = \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/common + -I../include -I$(top_srcdir)/include \ + -I../common -I$(top_srcdir)/common noinst_LTLIBRARIES = libcerror.la @@ -15,12 +15,10 @@ libcerror_unused.h endif -MAINTAINERCLEANFILES = \ +DISTCLEANFILES = \ + Makefile \ Makefile.in -distclean: clean - -rm -f Makefile - sources-local: $(BUILT_SOURCES) splint-local: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libfcrypto-20240115/libcerror/libcerror_definitions.h new/libfcrypto-20240414/libcerror/libcerror_definitions.h --- old/libfcrypto-20240115/libcerror/libcerror_definitions.h 2024-01-15 05:23:16.000000000 +0100 +++ new/libfcrypto-20240414/libcerror/libcerror_definitions.h 2024-04-14 12:08:28.000000000 +0200 @@ -35,11 +35,11 @@ */ #else -#define LIBCERROR_VERSION 20240101 +#define LIBCERROR_VERSION 20240413 /* The libcerror version string */ -#define LIBCERROR_VERSION_STRING "20240101" +#define LIBCERROR_VERSION_STRING "20240413" /* The error domains */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libfcrypto-20240115/libfcrypto/Makefile.am new/libfcrypto-20240414/libfcrypto/Makefile.am --- old/libfcrypto-20240115/libfcrypto/Makefile.am 2024-01-14 08:04:21.000000000 +0100 +++ new/libfcrypto-20240414/libfcrypto/Makefile.am 2024-04-14 11:55:17.000000000 +0200 @@ -1,6 +1,6 @@ AM_CPPFLAGS = \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/common \ + -I../include -I$(top_srcdir)/include \ + -I../common -I$(top_srcdir)/common \ @LIBCERROR_CPPFLAGS@ \ @LIBFCRYPTO_DLL_EXPORT@ @@ -30,14 +30,12 @@ libfcrypto.rc \ libfcrypto.rc.in -MAINTAINERCLEANFILES = \ +DISTCLEANFILES = \ + libfcrypto_definitions.h \ + libfcrypto.rc \ + Makefile \ Makefile.in -distclean: clean - -rm -f libfcrypto_definitions.h - -rm -f libfcrypto.rc - -rm -f Makefile - sources-local: $(BUILT_SOURCES) splint-local: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libfcrypto-20240115/libfcrypto/libfcrypto.rc new/libfcrypto-20240414/libfcrypto/libfcrypto.rc --- old/libfcrypto-20240115/libfcrypto/libfcrypto.rc 2024-01-15 05:23:28.000000000 +0100 +++ new/libfcrypto-20240414/libfcrypto/libfcrypto.rc 2024-04-14 12:08:49.000000000 +0200 @@ -22,12 +22,12 @@ BLOCK "040904E4" BEGIN VALUE "FileDescription", "Library to support encryption formats\0" - VALUE "FileVersion", "20240115" "\0" + VALUE "FileVersion", "20240414" "\0" VALUE "InternalName", "libfcrypto.dll\0" VALUE "LegalCopyright", "(C) 2017-2024, Joachim Metz <joachim.m...@gmail.com>\0" VALUE "OriginalFilename", "libfcrypto.dll\0" VALUE "ProductName", "libfcrypto\0" - VALUE "ProductVersion", "20240115" "\0" + VALUE "ProductVersion", "20240414" "\0" VALUE "Comments", "For more information visit https://github.com/libyal/libfcrypto/\0"; END END diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libfcrypto-20240115/libfcrypto/libfcrypto_definitions.h new/libfcrypto-20240414/libfcrypto/libfcrypto_definitions.h --- old/libfcrypto-20240115/libfcrypto/libfcrypto_definitions.h 2024-01-15 05:23:28.000000000 +0100 +++ new/libfcrypto-20240414/libfcrypto/libfcrypto_definitions.h 2024-04-14 12:08:49.000000000 +0200 @@ -36,11 +36,11 @@ #else #include <byte_stream.h> -#define LIBFCRYPTO_VERSION 20240115 +#define LIBFCRYPTO_VERSION 20240414 /* The version string */ -#define LIBFCRYPTO_VERSION_STRING "20240115" +#define LIBFCRYPTO_VERSION_STRING "20240414" /* The crypt modes */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libfcrypto-20240115/libfcrypto.spec new/libfcrypto-20240414/libfcrypto.spec --- old/libfcrypto-20240115/libfcrypto.spec 2024-01-15 05:23:28.000000000 +0100 +++ new/libfcrypto-20240414/libfcrypto.spec 2024-04-14 12:08:49.000000000 +0200 @@ -1,5 +1,5 @@ Name: libfcrypto -Version: 20240115 +Version: 20240414 Release: 1 Summary: Library to support encryption formats Group: System Environment/Libraries @@ -80,6 +80,6 @@ %{_libdir}/python3*/site-packages/*.so %changelog -* Mon Jan 15 2024 Joachim Metz <joachim.m...@gmail.com> 20240115-1 +* Sun Apr 14 2024 Joachim Metz <joachim.m...@gmail.com> 20240414-1 - Auto-generated diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libfcrypto-20240115/m4/common.m4 new/libfcrypto-20240414/m4/common.m4 --- old/libfcrypto-20240115/m4/common.m4 2023-12-03 10:04:04.000000000 +0100 +++ new/libfcrypto-20240414/m4/common.m4 2024-03-30 05:38:22.000000000 +0100 @@ -1,6 +1,6 @@ dnl Checks for common headers and functions dnl -dnl Version: 20181117 +dnl Version: 20240308 dnl Function to test if a certain feature was disabled AC_DEFUN([AX_COMMON_ARG_DISABLE], @@ -26,7 +26,7 @@ [$1], [AS_HELP_STRING( [--enable-$1], - [$3 [default=$4]])], + [$3 @<:@default=$4@:>@])], [ac_cv_enable_$2=$enableval], [ac_cv_enable_$2=$4])dnl @@ -43,7 +43,7 @@ [$1], [AS_HELP_STRING( [--with-$1[[=$5]]], - [$3 [default=$4]])], + [$3 @<:@default=$4@:>@])], [ac_cv_with_$2=$withval], [ac_cv_with_$2=$4])dnl diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libfcrypto-20240115/m4/libcerror.m4 new/libfcrypto-20240414/m4/libcerror.m4 --- old/libfcrypto-20240115/m4/libcerror.m4 2023-12-03 10:04:04.000000000 +0100 +++ new/libfcrypto-20240414/m4/libcerror.m4 2024-04-14 11:51:44.000000000 +0200 @@ -1,6 +1,6 @@ dnl Checks for libcerror required headers and functions dnl -dnl Version: 20190308 +dnl Version: 20240413 dnl Function to detect if libcerror is available dnl ac_libcerror_dummy is used to prevent AC_CHECK_LIB adding unnecessary -l<library> arguments @@ -10,8 +10,10 @@ [ac_cv_libcerror=no], [ac_cv_libcerror=check dnl Check if the directory provided as parameter exists + dnl For both --with-libcerror which returns "yes" and --with-libcerror= which returns "" + dnl treat them as auto-detection. AS_IF( - [test "x$ac_cv_with_libcerror" != x && test "x$ac_cv_with_libcerror" != xauto-detect], + [test "x$ac_cv_with_libcerror" != x && test "x$ac_cv_with_libcerror" != xauto-detect && test "x$ac_cv_with_libcerror" != xyes], [AS_IF( [test -d "$ac_cv_with_libcerror"], [CFLAGS="$CFLAGS -I${ac_cv_with_libcerror}/include" @@ -99,8 +101,9 @@ ac_cv_libcerror_LIBADD="-lcerror"]) ]) + AS_IF( - [test "x$ac_cv_with_libcerror" != x && test "x$ac_cv_with_libcerror" != xauto-detect && test "x$ac_cv_libcerror" != xyes], + [test "x$ac_cv_libcerror" != xyes && test "x$ac_cv_with_libcerror" != x && test "x$ac_cv_with_libcerror" != xauto-detect && test "x$ac_cv_with_libcerror" != xyes], [AC_MSG_FAILURE( [unable to find supported libcerror in directory: $ac_cv_with_libcerror], [1]) @@ -166,7 +169,7 @@ ]) ]) - ac_cv_libcerror_CPPFLAGS="-I../libcerror"; + ac_cv_libcerror_CPPFLAGS="-I../libcerror -I\$(top_srcdir)/libcerror"; ac_cv_libcerror_LIBADD="../libcerror/libcerror.la"; ac_cv_libcerror=local diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libfcrypto-20240115/manuals/Makefile.am new/libfcrypto-20240414/manuals/Makefile.am --- old/libfcrypto-20240115/manuals/Makefile.am 2023-12-03 10:04:04.000000000 +0100 +++ new/libfcrypto-20240414/manuals/Makefile.am 2024-04-14 11:53:36.000000000 +0200 @@ -4,9 +4,7 @@ EXTRA_DIST = \ libfcrypto.3 -MAINTAINERCLEANFILES = \ +DISTCLEANFILES = \ + Makefile \ Makefile.in -distclean: clean - -rm -f Makefile - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libfcrypto-20240115/msvscpp/Makefile.am new/libfcrypto-20240414/msvscpp/Makefile.am --- old/libfcrypto-20240115/msvscpp/Makefile.am 2024-01-15 05:20:17.000000000 +0100 +++ new/libfcrypto-20240414/msvscpp/Makefile.am 2024-04-14 11:53:26.000000000 +0200 @@ -13,9 +13,7 @@ EXTRA_DIST = \ $(MSVSCPP_FILES) -MAINTAINERCLEANFILES = \ +DISTCLEANFILES = \ + Makefile \ Makefile.in -distclean: clean - -rm -f Makefile - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libfcrypto-20240115/ossfuzz/Makefile.am new/libfcrypto-20240414/ossfuzz/Makefile.am --- old/libfcrypto-20240115/ossfuzz/Makefile.am 2024-01-14 12:33:35.000000000 +0100 +++ new/libfcrypto-20240414/ossfuzz/Makefile.am 2024-04-14 11:53:48.000000000 +0200 @@ -1,14 +1,25 @@ if HAVE_LIB_FUZZING_ENGINE AM_CPPFLAGS = \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/common + -I../include -I$(top_srcdir)/include \ + -I../common -I$(top_srcdir)/common bin_PROGRAMS = \ + crypt_blowfish_cbc_fuzzer \ crypt_blowfish_ecb_fuzzer \ + crypt_des3_cbc_fuzzer \ + crypt_des3_ecb_fuzzer \ crypt_rc4_fuzzer \ crypt_serpent_cbc_fuzzer \ crypt_serpent_ecb_fuzzer +crypt_blowfish_cbc_fuzzer_SOURCES = \ + crypt_blowfish_cbc_fuzzer.cc \ + ossfuzz_libfcrypto.h + +crypt_blowfish_cbc_fuzzer_LDADD = \ + @LIB_FUZZING_ENGINE@ \ + ../libfcrypto/libfcrypto.la + crypt_blowfish_ecb_fuzzer_SOURCES = \ crypt_blowfish_ecb_fuzzer.cc \ ossfuzz_libfcrypto.h @@ -17,6 +28,22 @@ @LIB_FUZZING_ENGINE@ \ ../libfcrypto/libfcrypto.la +crypt_des3_cbc_fuzzer_SOURCES = \ + crypt_des3_cbc_fuzzer.cc \ + ossfuzz_libfcrypto.h + +crypt_des3_cbc_fuzzer_LDADD = \ + @LIB_FUZZING_ENGINE@ \ + ../libfcrypto/libfcrypto.la + +crypt_des3_ecb_fuzzer_SOURCES = \ + crypt_des3_ecb_fuzzer.cc \ + ossfuzz_libfcrypto.h + +crypt_des3_ecb_fuzzer_LDADD = \ + @LIB_FUZZING_ENGINE@ \ + ../libfcrypto/libfcrypto.la + crypt_rc4_fuzzer_SOURCES = \ crypt_rc4_fuzzer.cc \ ossfuzz_libfcrypto.h @@ -42,15 +69,19 @@ ../libfcrypto/libfcrypto.la endif -MAINTAINERCLEANFILES = \ +DISTCLEANFILES = \ + Makefile \ Makefile.in -distclean: clean - -rm -f Makefile - splint-local: + @echo "Running splint on crypt_blowfish_cbc_fuzzer ..." + -splint -preproc -redef $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(crypt_blowfish_cbc_fuzzer_SOURCES) @echo "Running splint on crypt_blowfish_ecb_fuzzer ..." -splint -preproc -redef $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(crypt_blowfish_ecb_fuzzer_SOURCES) + @echo "Running splint on crypt_des3_cbc_fuzzer ..." + -splint -preproc -redef $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(crypt_des3_cbc_fuzzer_SOURCES) + @echo "Running splint on crypt_des3_ecb_fuzzer ..." + -splint -preproc -redef $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(crypt_des3_ecb_fuzzer_SOURCES) @echo "Running splint on crypt_rc4_fuzzer ..." -splint -preproc -redef $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(crypt_rc4_fuzzer_SOURCES) @echo "Running splint on crypt_serpent_cbc_fuzzer ..." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libfcrypto-20240115/ossfuzz/crypt_blowfish_cbc_fuzzer.cc new/libfcrypto-20240414/ossfuzz/crypt_blowfish_cbc_fuzzer.cc --- old/libfcrypto-20240115/ossfuzz/crypt_blowfish_cbc_fuzzer.cc 1970-01-01 01:00:00.000000000 +0100 +++ new/libfcrypto-20240414/ossfuzz/crypt_blowfish_cbc_fuzzer.cc 2024-04-14 11:51:43.000000000 +0200 @@ -0,0 +1,76 @@ +/* + * OSS-Fuzz target for libfcrypto Blowfish-CBC crypt function + * + * Copyright (C) 2011-2024, Joachim Metz <joachim.m...@gmail.com> + * + * Refer to AUTHORS for acknowledgements. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser 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 Lesser General Public License + * along with this program. If not, see <https://www.gnu.org/licenses/>. + */ + +#include <stddef.h> +#include <stdint.h> + +/* Note that some of the OSS-Fuzz engines use C++ + */ +extern "C" { + +#include "ossfuzz_libfcrypto.h" + +int LLVMFuzzerTestOneInput( + const uint8_t *data, + size_t size ) +{ + uint8_t encrypted_data[ 64 ]; + + uint8_t initialization_vector[ 8 ] = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07 }; + uint8_t key[ 4 ] = { 0x00, 0x01, 0x02, 0x03 }; + + libfcrypto_blowfish_context_t *context = NULL; + + if( libfcrypto_blowfish_context_initialize( + &context, + NULL ) != 1 ) + { + return( 0 ); + } + if( libfcrypto_blowfish_context_set_key( + context, + key, + 32, + NULL ) != 1 ) + { + goto on_error_libfcrypto; + } + libfcrypto_blowfish_crypt_cbc( + context, + LIBFCRYPTO_BLOWFISH_CRYPT_MODE_ENCRYPT, + initialization_vector, + 8, + data, + size, + encrypted_data, + 64, + NULL ); + +on_error_libfcrypto: + libfcrypto_blowfish_context_free( + &context, + NULL ); + + return( 0 ); +} + +} /* extern "C" */ + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libfcrypto-20240115/ossfuzz/crypt_des3_cbc_fuzzer.cc new/libfcrypto-20240414/ossfuzz/crypt_des3_cbc_fuzzer.cc --- old/libfcrypto-20240115/ossfuzz/crypt_des3_cbc_fuzzer.cc 1970-01-01 01:00:00.000000000 +0100 +++ new/libfcrypto-20240414/ossfuzz/crypt_des3_cbc_fuzzer.cc 2024-04-14 11:51:43.000000000 +0200 @@ -0,0 +1,76 @@ +/* + * OSS-Fuzz target for libfcrypto DES3-CBC crypt function + * + * Copyright (C) 2011-2024, Joachim Metz <joachim.m...@gmail.com> + * + * Refer to AUTHORS for acknowledgements. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser 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 Lesser General Public License + * along with this program. If not, see <https://www.gnu.org/licenses/>. + */ + +#include <stddef.h> +#include <stdint.h> + +/* Note that some of the OSS-Fuzz engines use C++ + */ +extern "C" { + +#include "ossfuzz_libfcrypto.h" + +int LLVMFuzzerTestOneInput( + const uint8_t *data, + size_t size ) +{ + uint8_t encrypted_data[ 64 ]; + + uint8_t initialization_vector[ 8 ] = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07 }; + uint8_t key[ 8 ] = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07 }; + + libfcrypto_des3_context_t *context = NULL; + + if( libfcrypto_des3_context_initialize( + &context, + NULL ) != 1 ) + { + return( 0 ); + } + if( libfcrypto_des3_context_set_key( + context, + key, + 64, + NULL ) != 1 ) + { + goto on_error_libfcrypto; + } + libfcrypto_des3_crypt_cbc( + context, + LIBFCRYPTO_DES3_CRYPT_MODE_ENCRYPT, + initialization_vector, + 8, + data, + size, + encrypted_data, + 64, + NULL ); + +on_error_libfcrypto: + libfcrypto_des3_context_free( + &context, + NULL ); + + return( 0 ); +} + +} /* extern "C" */ + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libfcrypto-20240115/ossfuzz/crypt_des3_ecb_fuzzer.cc new/libfcrypto-20240414/ossfuzz/crypt_des3_ecb_fuzzer.cc --- old/libfcrypto-20240115/ossfuzz/crypt_des3_ecb_fuzzer.cc 1970-01-01 01:00:00.000000000 +0100 +++ new/libfcrypto-20240414/ossfuzz/crypt_des3_ecb_fuzzer.cc 2024-04-14 11:51:43.000000000 +0200 @@ -0,0 +1,73 @@ +/* + * OSS-Fuzz target for libfcrypto DES3-ECB crypt function + * + * Copyright (C) 2011-2024, Joachim Metz <joachim.m...@gmail.com> + * + * Refer to AUTHORS for acknowledgements. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser 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 Lesser General Public License + * along with this program. If not, see <https://www.gnu.org/licenses/>. + */ + +#include <stddef.h> +#include <stdint.h> + +/* Note that some of the OSS-Fuzz engines use C++ + */ +extern "C" { + +#include "ossfuzz_libfcrypto.h" + +int LLVMFuzzerTestOneInput( + const uint8_t *data, + size_t size ) +{ + uint8_t encrypted_data[ 64 ]; + + uint8_t key[ 8 ] = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07 }; + + libfcrypto_des3_context_t *context = NULL; + + if( libfcrypto_des3_context_initialize( + &context, + NULL ) != 1 ) + { + return( 0 ); + } + if( libfcrypto_des3_context_set_key( + context, + key, + 64, + NULL ) != 1 ) + { + goto on_error_libfcrypto; + } + libfcrypto_des3_crypt_ecb( + context, + LIBFCRYPTO_DES3_CRYPT_MODE_ENCRYPT, + data, + size, + encrypted_data, + 64, + NULL ); + +on_error_libfcrypto: + libfcrypto_des3_context_free( + &context, + NULL ); + + return( 0 ); +} + +} /* extern "C" */ + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libfcrypto-20240115/ossfuzz/crypt_serpent_cbc_fuzzer.cc new/libfcrypto-20240414/ossfuzz/crypt_serpent_cbc_fuzzer.cc --- old/libfcrypto-20240115/ossfuzz/crypt_serpent_cbc_fuzzer.cc 2024-01-15 05:20:15.000000000 +0100 +++ new/libfcrypto-20240414/ossfuzz/crypt_serpent_cbc_fuzzer.cc 2024-04-14 11:51:43.000000000 +0200 @@ -33,9 +33,10 @@ size_t size ) { uint8_t encrypted_data[ 64 ]; + uint8_t initialization_vector[ 16 ] = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f }; - uint8_t key[ 16 ] = { + uint8_t key[ 16 ] = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f }; libfcrypto_serpent_context_t *context = NULL; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libfcrypto-20240115/ossfuzz/crypt_serpent_ecb_fuzzer.cc new/libfcrypto-20240414/ossfuzz/crypt_serpent_ecb_fuzzer.cc --- old/libfcrypto-20240115/ossfuzz/crypt_serpent_ecb_fuzzer.cc 2024-01-15 05:20:15.000000000 +0100 +++ new/libfcrypto-20240414/ossfuzz/crypt_serpent_ecb_fuzzer.cc 2024-04-14 11:51:43.000000000 +0200 @@ -34,7 +34,7 @@ { uint8_t encrypted_data[ 64 ]; - uint8_t key[ 16 ] = { + uint8_t key[ 16 ] = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f }; libfcrypto_serpent_context_t *context = NULL; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libfcrypto-20240115/pyfcrypto/Makefile.am new/libfcrypto-20240414/pyfcrypto/Makefile.am --- old/libfcrypto-20240115/pyfcrypto/Makefile.am 2024-01-14 12:10:31.000000000 +0100 +++ new/libfcrypto-20240414/pyfcrypto/Makefile.am 2024-04-14 11:53:09.000000000 +0200 @@ -1,7 +1,7 @@ if HAVE_PYTHON AM_CFLAGS = \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/common \ + -I../include -I$(top_srcdir)/include \ + -I../common -I$(top_srcdir)/common \ @LIBCERROR_CPPFLAGS@ \ @LIBFCRYPTO_DLL_IMPORT@ @@ -30,9 +30,7 @@ endif -MAINTAINERCLEANFILES = \ +DISTCLEANFILES = \ + Makefile \ Makefile.in -distclean: clean - -rm -f Makefile - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libfcrypto-20240115/setup.cfg new/libfcrypto-20240414/setup.cfg --- old/libfcrypto-20240115/setup.cfg 2024-01-15 05:23:28.000000000 +0100 +++ new/libfcrypto-20240414/setup.cfg 2024-04-14 12:08:49.000000000 +0200 @@ -1,6 +1,6 @@ [metadata] name = libfcrypto-python -version = 20240115 +version = 20240414 description = Python bindings module for libfcrypto long_description = Python bindings module for libfcrypto long_description_content_type = text/plain diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libfcrypto-20240115/tests/Makefile.am new/libfcrypto-20240414/tests/Makefile.am --- old/libfcrypto-20240115/tests/Makefile.am 2024-01-15 05:20:15.000000000 +0100 +++ new/libfcrypto-20240414/tests/Makefile.am 2024-04-14 11:55:35.000000000 +0200 @@ -1,6 +1,6 @@ AM_CPPFLAGS = \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/common \ + -I../include -I$(top_srcdir)/include \ + -I../common -I$(top_srcdir)/common \ @LIBCERROR_CPPFLAGS@ \ @LIBFCRYPTO_DLL_IMPORT@ @@ -101,9 +101,7 @@ fcrypto_test_support_LDADD = \ ../libfcrypto/libfcrypto.la -MAINTAINERCLEANFILES = \ +DISTCLEANFILES = \ + Makefile \ Makefile.in -distclean: clean - -rm -f Makefile - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libfcrypto-20240115/tests/fcrypto_test_blowfish_context.c new/libfcrypto-20240414/tests/fcrypto_test_blowfish_context.c --- old/libfcrypto-20240115/tests/fcrypto_test_blowfish_context.c 2024-01-15 05:22:04.000000000 +0100 +++ new/libfcrypto-20240414/tests/fcrypto_test_blowfish_context.c 2024-04-14 11:52:05.000000000 +0200 @@ -36,6 +36,130 @@ #include "../libfcrypto/libfcrypto_blowfish_context.h" +typedef struct fcrypto_test_blowfish_test_vector fcrypto_test_blowfish_test_vector_t; + +struct fcrypto_test_blowfish_test_vector +{ + /* The key + */ + uint8_t key[ 8 ]; + + /* The unencrypted data + */ + uint8_t unencrypted_data[ 8 ]; + + /* The encrypted data + */ + uint8_t encrypted_data[ 8 ]; +}; + +#define FCRYPTO_TEST_BLOWFISH_NUMBER_OF_TEST_VECTORS 34 + +fcrypto_test_blowfish_test_vector_t fcrypto_test_blowfish_test_vectors[ FCRYPTO_TEST_BLOWFISH_NUMBER_OF_TEST_VECTORS ] = { + { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, + { 0x4e, 0xf9, 0x97, 0x45, 0x61, 0x98, 0xdd, 0x78 } }, + { { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }, + { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }, + { 0x51, 0x86, 0x6f, 0xd5, 0xb8, 0x5e, 0xcb, 0x8a } }, + { { 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, + { 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 }, + { 0x7d, 0x85, 0x6f, 0x9a, 0x61, 0x30, 0x63, 0xf2 } }, + { { 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11 }, + { 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11 }, + { 0x24, 0x66, 0xdd, 0x87, 0x8b, 0x96, 0x3c, 0x9d } }, + { { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef }, + { 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11 }, + { 0x61, 0xf9, 0xc3, 0x80, 0x22, 0x81, 0xb0, 0x96 } }, + { { 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11 }, + { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef }, + { 0x7d, 0x0c, 0xc6, 0x30, 0xaf, 0xda, 0x1e, 0xc7 } }, + { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, + { 0x4e, 0xf9, 0x97, 0x45, 0x61, 0x98, 0xdd, 0x78 } }, + { { 0xfe, 0xdc, 0xba, 0x98, 0x76, 0x54, 0x32, 0x10 }, + { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef }, + { 0x0a, 0xce, 0xab, 0x0f, 0xc6, 0xa0, 0xa2, 0x8d } }, + { { 0x7c, 0xa1, 0x10, 0x45, 0x4a, 0x1a, 0x6e, 0x57 }, + { 0x01, 0xa1, 0xd6, 0xd0, 0x39, 0x77, 0x67, 0x42 }, + { 0x59, 0xc6, 0x82, 0x45, 0xeb, 0x05, 0x28, 0x2b } }, + { { 0x01, 0x31, 0xd9, 0x61, 0x9d, 0xc1, 0x37, 0x6e }, + { 0x5c, 0xd5, 0x4c, 0xa8, 0x3d, 0xef, 0x57, 0xda }, + { 0xb1, 0xb8, 0xcc, 0x0b, 0x25, 0x0f, 0x09, 0xa0 } }, + { { 0x07, 0xa1, 0x13, 0x3e, 0x4a, 0x0b, 0x26, 0x86 }, + { 0x02, 0x48, 0xd4, 0x38, 0x06, 0xf6, 0x71, 0x72 }, + { 0x17, 0x30, 0xe5, 0x77, 0x8b, 0xea, 0x1d, 0xa4 } }, + { { 0x38, 0x49, 0x67, 0x4c, 0x26, 0x02, 0x31, 0x9e }, + { 0x51, 0x45, 0x4b, 0x58, 0x2d, 0xdf, 0x44, 0x0a }, + { 0xa2, 0x5e, 0x78, 0x56, 0xcf, 0x26, 0x51, 0xeb } }, + { { 0x04, 0xb9, 0x15, 0xba, 0x43, 0xfe, 0xb5, 0xb6 }, + { 0x42, 0xfd, 0x44, 0x30, 0x59, 0x57, 0x7f, 0xa2 }, + { 0x35, 0x38, 0x82, 0xb1, 0x09, 0xce, 0x8f, 0x1a } }, + { { 0x01, 0x13, 0xb9, 0x70, 0xfd, 0x34, 0xf2, 0xce }, + { 0x05, 0x9b, 0x5e, 0x08, 0x51, 0xcf, 0x14, 0x3a }, + { 0x48, 0xf4, 0xd0, 0x88, 0x4c, 0x37, 0x99, 0x18 } }, + { { 0x01, 0x70, 0xf1, 0x75, 0x46, 0x8f, 0xb5, 0xe6 }, + { 0x07, 0x56, 0xd8, 0xe0, 0x77, 0x47, 0x61, 0xd2 }, + { 0x43, 0x21, 0x93, 0xb7, 0x89, 0x51, 0xfc, 0x98 } }, + { { 0x43, 0x29, 0x7f, 0xad, 0x38, 0xe3, 0x73, 0xfe }, + { 0x76, 0x25, 0x14, 0xb8, 0x29, 0xbf, 0x48, 0x6a }, + { 0x13, 0xf0, 0x41, 0x54, 0xd6, 0x9d, 0x1a, 0xe5 } }, + { { 0x07, 0xa7, 0x13, 0x70, 0x45, 0xda, 0x2a, 0x16 }, + { 0x3b, 0xdd, 0x11, 0x90, 0x49, 0x37, 0x28, 0x02 }, + { 0x2e, 0xed, 0xda, 0x93, 0xff, 0xd3, 0x9c, 0x79 } }, + { { 0x04, 0x68, 0x91, 0x04, 0xc2, 0xfd, 0x3b, 0x2f }, + { 0x26, 0x95, 0x5f, 0x68, 0x35, 0xaf, 0x60, 0x9a }, + { 0xd8, 0x87, 0xe0, 0x39, 0x3c, 0x2d, 0xa6, 0xe3 } }, + { { 0x37, 0xd0, 0x6b, 0xb5, 0x16, 0xcb, 0x75, 0x46 }, + { 0x16, 0x4d, 0x5e, 0x40, 0x4f, 0x27, 0x52, 0x32 }, + { 0x5f, 0x99, 0xd0, 0x4f, 0x5b, 0x16, 0x39, 0x69 } }, + { { 0x1f, 0x08, 0x26, 0x0d, 0x1a, 0xc2, 0x46, 0x5e }, + { 0x6b, 0x05, 0x6e, 0x18, 0x75, 0x9f, 0x5c, 0xca }, + { 0x4a, 0x05, 0x7a, 0x3b, 0x24, 0xd3, 0x97, 0x7b } }, + { { 0x58, 0x40, 0x23, 0x64, 0x1a, 0xba, 0x61, 0x76 }, + { 0x00, 0x4b, 0xd6, 0xef, 0x09, 0x17, 0x60, 0x62 }, + { 0x45, 0x20, 0x31, 0xc1, 0xe4, 0xfa, 0xda, 0x8e } }, + { { 0x02, 0x58, 0x16, 0x16, 0x46, 0x29, 0xb0, 0x07 }, + { 0x48, 0x0d, 0x39, 0x00, 0x6e, 0xe7, 0x62, 0xf2 }, + { 0x75, 0x55, 0xae, 0x39, 0xf5, 0x9b, 0x87, 0xbd } }, + { { 0x49, 0x79, 0x3e, 0xbc, 0x79, 0xb3, 0x25, 0x8f }, + { 0x43, 0x75, 0x40, 0xc8, 0x69, 0x8f, 0x3c, 0xfa }, + { 0x53, 0xc5, 0x5f, 0x9c, 0xb4, 0x9f, 0xc0, 0x19 } }, + { { 0x4f, 0xb0, 0x5e, 0x15, 0x15, 0xab, 0x73, 0xa7 }, + { 0x07, 0x2d, 0x43, 0xa0, 0x77, 0x07, 0x52, 0x92 }, + { 0x7a, 0x8e, 0x7b, 0xfa, 0x93, 0x7e, 0x89, 0xa3 } }, + { { 0x49, 0xe9, 0x5d, 0x6d, 0x4c, 0xa2, 0x29, 0xbf }, + { 0x02, 0xfe, 0x55, 0x77, 0x81, 0x17, 0xf1, 0x2a }, + { 0xcf, 0x9c, 0x5d, 0x7a, 0x49, 0x86, 0xad, 0xb5 } }, + { { 0x01, 0x83, 0x10, 0xdc, 0x40, 0x9b, 0x26, 0xd6 }, + { 0x1d, 0x9d, 0x5c, 0x50, 0x18, 0xf7, 0x28, 0xc2 }, + { 0xd1, 0xab, 0xb2, 0x90, 0x65, 0x8b, 0xc7, 0x78 } }, + { { 0x1c, 0x58, 0x7f, 0x1c, 0x13, 0x92, 0x4f, 0xef }, + { 0x30, 0x55, 0x32, 0x28, 0x6d, 0x6f, 0x29, 0x5a }, + { 0x55, 0xcb, 0x37, 0x74, 0xd1, 0x3e, 0xf2, 0x01 } }, + { { 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01 }, + { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef }, + { 0xfa, 0x34, 0xec, 0x48, 0x47, 0xb2, 0x68, 0xb2 } }, + { { 0x1f, 0x1f, 0x1f, 0x1f, 0x0e, 0x0e, 0x0e, 0x0e }, + { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef }, + { 0xa7, 0x90, 0x79, 0x51, 0x08, 0xea, 0x3c, 0xae } }, + { { 0xe0, 0xfe, 0xe0, 0xfe, 0xf1, 0xfe, 0xf1, 0xfe }, + { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef }, + { 0xc3, 0x9e, 0x07, 0x2d, 0x9f, 0xac, 0x63, 0x1d } }, + { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, + { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }, + { 0x01, 0x49, 0x33, 0xe0, 0xcd, 0xaf, 0xf6, 0xe4 } }, + { { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }, + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, + { 0xf2, 0x1e, 0x9a, 0x77, 0xb7, 0x1c, 0x49, 0xbc } }, + { { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef }, + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, + { 0x24, 0x59, 0x46, 0x88, 0x57, 0x54, 0x36, 0x9a } }, + { { 0xfe, 0xdc, 0xba, 0x98, 0x76, 0x54, 0x32, 0x10 }, + { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }, + { 0x6b, 0x5c, 0x5a, 0x9c, 0x5d, 0x9e, 0x0a, 0x5a } } +}; + /* Tests the libfcrypto_blowfish_context_initialize function * Returns 1 if successful or 0 if not */ @@ -1719,6 +1843,167 @@ return( 0 ); } +/* Tests the libfcrypto_blowfish_crypt function with a test vector + * Returns 1 if successful or 0 if not + */ +int fcrypto_test_blowfish_crypt_with_test_vector( + fcrypto_test_blowfish_test_vector_t *test_vector ) +{ + uint8_t output_data[ 8 ]; + + libcerror_error_t *error = NULL; + libfcrypto_blowfish_context_t *blowfish_context = NULL; + int result = 0; + + FCRYPTO_TEST_ASSERT_IS_NOT_NULL( + "test_vector", + test_vector ); + + result = libfcrypto_blowfish_context_initialize( + &blowfish_context, + &error ); + + FCRYPTO_TEST_ASSERT_EQUAL_INT( + "result", + result, + 1 ); + + FCRYPTO_TEST_ASSERT_IS_NOT_NULL( + "blowfish_context", + blowfish_context ); + + FCRYPTO_TEST_ASSERT_IS_NULL( + "error", + error ); + + result = libfcrypto_blowfish_context_set_key( + blowfish_context, + test_vector->key, + 64, + &error ); + + FCRYPTO_TEST_ASSERT_EQUAL_INT( + "result", + result, + 1 ); + + FCRYPTO_TEST_ASSERT_IS_NULL( + "error", + error ); + + result = libfcrypto_blowfish_crypt_ecb( + blowfish_context, + LIBFCRYPTO_BLOWFISH_CRYPT_MODE_DECRYPT, + test_vector->encrypted_data, + 8, + output_data, + 8, + &error ); + + FCRYPTO_TEST_ASSERT_EQUAL_INT( + "result", + result, + 1 ); + + FCRYPTO_TEST_ASSERT_IS_NULL( + "error", + error ); + + result = memory_compare( + output_data, + test_vector->unencrypted_data, + 8 ); + + FCRYPTO_TEST_ASSERT_EQUAL_INT( + "result", + result, + 0 ); + + result = libfcrypto_blowfish_crypt_ecb( + blowfish_context, + LIBFCRYPTO_BLOWFISH_CRYPT_MODE_ENCRYPT, + test_vector->unencrypted_data, + 8, + output_data, + 8, + &error ); + + FCRYPTO_TEST_ASSERT_EQUAL_INT( + "result", + result, + 1 ); + + FCRYPTO_TEST_ASSERT_IS_NULL( + "error", + error ); + + result = memory_compare( + output_data, + test_vector->encrypted_data, + 8 ); + + FCRYPTO_TEST_ASSERT_EQUAL_INT( + "result", + result, + 0 ); + + result = libfcrypto_blowfish_context_free( + &blowfish_context, + &error ); + + FCRYPTO_TEST_ASSERT_EQUAL_INT( + "result", + result, + 1 ); + + FCRYPTO_TEST_ASSERT_IS_NULL( + "blowfish_context", + blowfish_context ); + + FCRYPTO_TEST_ASSERT_IS_NULL( + "error", + error ); + + return( 1 ); + +on_error: + if( error != NULL ) + { + libcerror_error_free( + &error ); + } + if( blowfish_context != NULL ) + { + libfcrypto_blowfish_context_free( + &blowfish_context, + NULL ); + } + return( 0 ); +} + +/* Tests the libfcrypto_blowfish_crypt function with test vectors + * See: https://www.schneier.com/wp-content/uploads/2015/12/vectors-2.txt + * Returns 1 if successful or 0 if not + */ +int fcrypto_test_blowfish_crypt_with_test_vectors( + void ) +{ + int result = 0; + int test_vector = 0; + + while( test_vector < FCRYPTO_TEST_BLOWFISH_NUMBER_OF_TEST_VECTORS ) + { + result = fcrypto_test_blowfish_crypt_with_test_vector( + &( fcrypto_test_blowfish_test_vectors[ test_vector++ ] ) ); + + if( result == 0 ) + { + break; + } + } + return( result ); +} + /* The main program */ #if defined( HAVE_WIDE_SYSTEM_CHARACTER ) @@ -1774,6 +2059,10 @@ "libfcrypto_blowfish_crypt_ecb", fcrypto_test_blowfish_crypt_ecb ); + FCRYPTO_TEST_RUN( + "libfcrypto_blowfish_crypt_with_test_vectors", + fcrypto_test_blowfish_crypt_with_test_vectors ); + return( EXIT_SUCCESS ); on_error: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libfcrypto-20240115/tests/test_library.sh new/libfcrypto-20240414/tests/test_library.sh --- old/libfcrypto-20240115/tests/test_library.sh 2024-01-15 05:20:15.000000000 +0100 +++ new/libfcrypto-20240414/tests/test_library.sh 2024-04-14 11:51:44.000000000 +0200 @@ -1,7 +1,7 @@ #!/usr/bin/env bash # Tests library functions and types. # -# Version: 20231007 +# Version: 20240413 EXIT_SUCCESS=0; EXIT_FAILURE=1; @@ -141,12 +141,9 @@ exit ${EXIT_IGNORE}; fi -TEST_RUNNER="tests/test_runner.sh"; +TEST_DIRECTORY=`dirname $0`; -if ! test -f "${TEST_RUNNER}"; -then - TEST_RUNNER="./test_runner.sh"; -fi +TEST_RUNNER="${TEST_DIRECTORY}/test_runner.sh"; if ! test -f "${TEST_RUNNER}"; then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libfcrypto-20240115/tests/test_manpage.sh new/libfcrypto-20240414/tests/test_manpage.sh --- old/libfcrypto-20240115/tests/test_manpage.sh 2024-01-15 05:20:15.000000000 +0100 +++ new/libfcrypto-20240414/tests/test_manpage.sh 2024-04-14 11:51:44.000000000 +0200 @@ -1,7 +1,7 @@ #!/usr/bin/env bash # Tests man pages. # -# Version: 20230410 +# Version: 20240413 EXIT_SUCCESS=0; EXIT_FAILURE=1; @@ -45,12 +45,9 @@ exit ${EXIT_IGNORE}; fi -TEST_RUNNER="tests/test_runner.sh"; +TEST_DIRECTORY=`dirname $0`; -if ! test -f "${TEST_RUNNER}"; -then - TEST_RUNNER="./test_runner.sh"; -fi +TEST_RUNNER="${TEST_DIRECTORY}/test_runner.sh"; if ! test -f "${TEST_RUNNER}"; then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libfcrypto-20240115/tests/test_python_module.sh new/libfcrypto-20240414/tests/test_python_module.sh --- old/libfcrypto-20240115/tests/test_python_module.sh 2024-01-15 05:22:04.000000000 +0100 +++ new/libfcrypto-20240414/tests/test_python_module.sh 2024-04-14 11:58:24.000000000 +0200 @@ -1,10 +1,11 @@ #!/usr/bin/env bash # Tests Python module functions and types. # -# Version: 20231005 +# Version: 20240413 EXIT_SUCCESS=0; EXIT_FAILURE=1; +EXIT_NO_TESTS_RAN=5; EXIT_IGNORE=77; TEST_FUNCTIONS="blowfish_context des3_context rc4_context serpent_context support"; @@ -124,12 +125,9 @@ exit ${EXIT_IGNORE}; fi -TEST_RUNNER="tests/test_runner.sh"; +TEST_DIRECTORY=`dirname $0`; -if ! test -f "${TEST_RUNNER}"; -then - TEST_RUNNER="./test_runner.sh"; -fi +TEST_RUNNER="${TEST_DIRECTORY}/test_runner.sh"; if ! test -f "${TEST_RUNNER}"; then @@ -147,7 +145,11 @@ test_python_function "${TEST_FUNCTION}"; RESULT=$?; - if test ${RESULT} -ne ${EXIT_SUCCESS}; + if test ${RESULT} -eq ${EXIT_NO_TESTS_RAN}; + then + RESULT=${EXIT_IGNORE}; + fi + if test ${RESULT} -ne ${EXIT_SUCCESS} && test ${RESULT} -ne ${EXIT_IGNORE}; then break; fi @@ -168,8 +170,11 @@ test_python_function "${TEST_FUNCTION}"; RESULT=$?; fi - - if test ${RESULT} -ne ${EXIT_SUCCESS}; + if test ${RESULT} -eq ${EXIT_NO_TESTS_RAN}; + then + RESULT=${EXIT_IGNORE}; + fi + if test ${RESULT} -ne ${EXIT_SUCCESS} && test ${RESULT} -ne ${EXIT_IGNORE}; then break; fi
