Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package fipscheck for openSUSE:Factory checked in at 2022-11-04 17:31:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fipscheck (Old) and /work/SRC/openSUSE:Factory/.fipscheck.new.2275 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fipscheck" Fri Nov 4 17:31:24 2022 rev:11 rq:1032909 version:1.7.0 Changes: -------- --- /work/SRC/openSUSE:Factory/fipscheck/fipscheck.changes 2020-11-26 23:08:42.624789064 +0100 +++ /work/SRC/openSUSE:Factory/.fipscheck.new.2275/fipscheck.changes 2022-11-04 17:31:26.419692057 +0100 @@ -1,0 +2,8 @@ +Wed Nov 2 14:30:29 UTC 2022 - Marcus Meissner <meiss...@suse.com> + +- updated to 1.7.0 (from a different supplier) + - openssl 3 support +- dropped fipscheck-dont_generate_manpages.patch (not needed) +- dropped fipscheck-fips.h_not_needed.patch (not needed) + +------------------------------------------------------------------- Old: ---- fipscheck-1.5.0.tar.bz2 fipscheck-dont_generate_manpages.patch fipscheck-fips.h_not_needed.patch New: ---- fipscheck-1.7.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fipscheck.spec ++++++ --- /var/tmp/diff_new_pack.QQEqvU/_old 2022-11-04 17:31:26.967695006 +0100 +++ /var/tmp/diff_new_pack.QQEqvU/_new 2022-11-04 17:31:26.971695027 +0100 @@ -1,7 +1,7 @@ # # spec file for package fipscheck # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,16 +20,14 @@ %global soversion 1.2.1 %global somajor 1 Name: fipscheck -Version: 1.5.0 +Version: 1.7.0 Release: 0 Summary: A library for integrity verification of FIPS validated modules License: BSD-2-Clause Group: Development/Libraries/C and C++ -URL: https://releases.pagure.org/%{name}/ -Source0: https://releases.pagure.org/fipscheck/%{name}-%{version}.tar.bz2 +URL: https://github.com/LairdCP/fipscheck +Source0: fipscheck-%version.tar.bz2 Source1: baselibs.conf -Patch1: fipscheck-dont_generate_manpages.patch -Patch2: fipscheck-fips.h_not_needed.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool @@ -59,8 +57,6 @@ %prep %setup -q -%patch1 -p1 -%patch2 -p1 %build %configure --disable-static ++++++ fipscheck-1.5.0.tar.bz2 -> fipscheck-1.7.0.tar.bz2 ++++++ ++++ 3247 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/fipscheck-1.5.0/INSTALL new/fipscheck-1.7.0/INSTALL --- old/fipscheck-1.5.0/INSTALL 2017-02-23 15:05:20.000000000 +0100 +++ new/fipscheck-1.7.0/INSTALL 2022-11-02 15:44:26.000000000 +0100 @@ -1,8 +1,8 @@ Installation Instructions ************************* -Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation, -Inc. + Copyright (C) 1994-1996, 1999-2002, 2004-2016 Free Software +Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright @@ -12,97 +12,96 @@ Basic Installation ================== - Briefly, the shell command `./configure && make && make install' + Briefly, the shell command './configure && make && make install' should configure, build, and install this package. The following -more-detailed instructions are generic; see the `README' file for +more-detailed instructions are generic; see the 'README' file for instructions specific to this package. Some packages provide this -`INSTALL' file but do not implement all of the features documented +'INSTALL' file but do not implement all of the features documented below. The lack of an optional feature in a given package is not necessarily a bug. More recommendations for GNU packages can be found in *note Makefile Conventions: (standards)Makefile Conventions. - The `configure' shell script attempts to guess correct values for + The 'configure' shell script attempts to guess correct values for various system-dependent variables used during compilation. It uses -those values to create a `Makefile' in each directory of the package. -It may also create one or more `.h' files containing system-dependent -definitions. Finally, it creates a shell script `config.status' that +those values to create a 'Makefile' in each directory of the package. +It may also create one or more '.h' files containing system-dependent +definitions. Finally, it creates a shell script 'config.status' that you can run in the future to recreate the current configuration, and a -file `config.log' containing compiler output (useful mainly for -debugging `configure'). +file 'config.log' containing compiler output (useful mainly for +debugging 'configure'). - It can also use an optional file (typically called `config.cache' -and enabled with `--cache-file=config.cache' or simply `-C') that saves -the results of its tests to speed up reconfiguring. Caching is -disabled by default to prevent problems with accidental use of stale -cache files. + It can also use an optional file (typically called 'config.cache' and +enabled with '--cache-file=config.cache' or simply '-C') that saves the +results of its tests to speed up reconfiguring. Caching is disabled by +default to prevent problems with accidental use of stale cache files. If you need to do unusual things to compile the package, please try -to figure out how `configure' could check whether to do them, and mail -diffs or instructions to the address given in the `README' so they can +to figure out how 'configure' could check whether to do them, and mail +diffs or instructions to the address given in the 'README' so they can be considered for the next release. If you are using the cache, and at -some point `config.cache' contains results you don't want to keep, you +some point 'config.cache' contains results you don't want to keep, you may remove or edit it. - The file `configure.ac' (or `configure.in') is used to create -`configure' by a program called `autoconf'. You need `configure.ac' if -you want to change it or regenerate `configure' using a newer version -of `autoconf'. + The file 'configure.ac' (or 'configure.in') is used to create +'configure' by a program called 'autoconf'. You need 'configure.ac' if +you want to change it or regenerate 'configure' using a newer version of +'autoconf'. The simplest way to compile this package is: - 1. `cd' to the directory containing the package's source code and type - `./configure' to configure the package for your system. + 1. 'cd' to the directory containing the package's source code and type + './configure' to configure the package for your system. - Running `configure' might take a while. While running, it prints + Running 'configure' might take a while. While running, it prints some messages telling which features it is checking for. - 2. Type `make' to compile the package. + 2. Type 'make' to compile the package. - 3. Optionally, type `make check' to run any self-tests that come with + 3. Optionally, type 'make check' to run any self-tests that come with the package, generally using the just-built uninstalled binaries. - 4. Type `make install' to install the programs and any data files and + 4. Type 'make install' to install the programs and any data files and documentation. When installing into a prefix owned by root, it is recommended that the package be configured and built as a regular - user, and only the `make install' phase executed with root + user, and only the 'make install' phase executed with root privileges. - 5. Optionally, type `make installcheck' to repeat any self-tests, but + 5. Optionally, type 'make installcheck' to repeat any self-tests, but this time using the binaries in their final installed location. This target does not install anything. Running this target as a - regular user, particularly if the prior `make install' required + regular user, particularly if the prior 'make install' required root privileges, verifies that the installation completed correctly. 6. You can remove the program binaries and object files from the - source code directory by typing `make clean'. To also remove the - files that `configure' created (so you can compile the package for - a different kind of computer), type `make distclean'. There is - also a `make maintainer-clean' target, but that is intended mainly + source code directory by typing 'make clean'. To also remove the + files that 'configure' created (so you can compile the package for + a different kind of computer), type 'make distclean'. There is + also a 'make maintainer-clean' target, but that is intended mainly for the package's developers. If you use it, you may have to get all sorts of other programs in order to regenerate files that came with the distribution. - 7. Often, you can also type `make uninstall' to remove the installed + 7. Often, you can also type 'make uninstall' to remove the installed files again. In practice, not all packages have tested that uninstallation works correctly, even though it is required by the GNU Coding Standards. - 8. Some packages, particularly those that use Automake, provide `make + 8. Some packages, particularly those that use Automake, provide 'make distcheck', which can by used by developers to test that all other - targets like `make install' and `make uninstall' work correctly. + targets like 'make install' and 'make uninstall' work correctly. This target is generally not run by end users. Compilers and Options ===================== Some systems require unusual options for compilation or linking that -the `configure' script does not know about. Run `./configure --help' +the 'configure' script does not know about. Run './configure --help' for details on some of the pertinent environment variables. - You can give `configure' initial values for configuration parameters -by setting variables in the command line or in the environment. Here -is an example: + You can give 'configure' initial values for configuration parameters +by setting variables in the command line or in the environment. Here is +an example: ./configure CC=c99 CFLAGS=-g LIBS=-lposix @@ -113,21 +112,21 @@ You can compile the package for more than one kind of computer at the same time, by placing the object files for each architecture in their -own directory. To do this, you can use GNU `make'. `cd' to the +own directory. To do this, you can use GNU 'make'. 'cd' to the directory where you want the object files and executables to go and run -the `configure' script. `configure' automatically checks for the -source code in the directory that `configure' is in and in `..'. This -is known as a "VPATH" build. +the 'configure' script. 'configure' automatically checks for the source +code in the directory that 'configure' is in and in '..'. This is known +as a "VPATH" build. - With a non-GNU `make', it is safer to compile the package for one + With a non-GNU 'make', it is safer to compile the package for one architecture at a time in the source code directory. After you have -installed the package for one architecture, use `make distclean' before +installed the package for one architecture, use 'make distclean' before reconfiguring for another architecture. On MacOS X 10.5 and later systems, you can create libraries and executables that work on multiple system types--known as "fat" or -"universal" binaries--by specifying multiple `-arch' options to the -compiler but only a single `-arch' option to the preprocessor. Like +"universal" binaries--by specifying multiple '-arch' options to the +compiler but only a single '-arch' option to the preprocessor. Like this: ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ @@ -136,105 +135,104 @@ This is not guaranteed to produce working output in all cases, you may have to build one architecture at a time and combine the results -using the `lipo' tool if you have problems. +using the 'lipo' tool if you have problems. Installation Names ================== - By default, `make install' installs the package's commands under -`/usr/local/bin', include files under `/usr/local/include', etc. You -can specify an installation prefix other than `/usr/local' by giving -`configure' the option `--prefix=PREFIX', where PREFIX must be an + By default, 'make install' installs the package's commands under +'/usr/local/bin', include files under '/usr/local/include', etc. You +can specify an installation prefix other than '/usr/local' by giving +'configure' the option '--prefix=PREFIX', where PREFIX must be an absolute file name. You can specify separate installation prefixes for architecture-specific files and architecture-independent files. If you -pass the option `--exec-prefix=PREFIX' to `configure', the package uses +pass the option '--exec-prefix=PREFIX' to 'configure', the package uses PREFIX as the prefix for installing programs and libraries. Documentation and other data files still use the regular prefix. In addition, if you use an unusual directory layout you can give -options like `--bindir=DIR' to specify different values for particular -kinds of files. Run `configure --help' for a list of the directories -you can set and what kinds of files go in them. In general, the -default for these options is expressed in terms of `${prefix}', so that -specifying just `--prefix' will affect all of the other directory +options like '--bindir=DIR' to specify different values for particular +kinds of files. Run 'configure --help' for a list of the directories +you can set and what kinds of files go in them. In general, the default +for these options is expressed in terms of '${prefix}', so that +specifying just '--prefix' will affect all of the other directory specifications that were not explicitly provided. The most portable way to affect installation locations is to pass the -correct locations to `configure'; however, many packages provide one or +correct locations to 'configure'; however, many packages provide one or both of the following shortcuts of passing variable assignments to the -`make install' command line to change installation locations without +'make install' command line to change installation locations without having to reconfigure or recompile. The first method involves providing an override variable for each -affected directory. For example, `make install +affected directory. For example, 'make install prefix=/alternate/directory' will choose an alternate location for all directory configuration variables that were expressed in terms of -`${prefix}'. Any directories that were specified during `configure', -but not in terms of `${prefix}', must each be overridden at install -time for the entire installation to be relocated. The approach of -makefile variable overrides for each directory variable is required by -the GNU Coding Standards, and ideally causes no recompilation. -However, some platforms have known limitations with the semantics of -shared libraries that end up requiring recompilation when using this -method, particularly noticeable in packages that use GNU Libtool. - - The second method involves providing the `DESTDIR' variable. For -example, `make install DESTDIR=/alternate/directory' will prepend -`/alternate/directory' before all installation names. The approach of -`DESTDIR' overrides is not required by the GNU Coding Standards, and +'${prefix}'. Any directories that were specified during 'configure', +but not in terms of '${prefix}', must each be overridden at install time +for the entire installation to be relocated. The approach of makefile +variable overrides for each directory variable is required by the GNU +Coding Standards, and ideally causes no recompilation. However, some +platforms have known limitations with the semantics of shared libraries +that end up requiring recompilation when using this method, particularly +noticeable in packages that use GNU Libtool. + + The second method involves providing the 'DESTDIR' variable. For +example, 'make install DESTDIR=/alternate/directory' will prepend +'/alternate/directory' before all installation names. The approach of +'DESTDIR' overrides is not required by the GNU Coding Standards, and does not work on platforms that have drive letters. On the other hand, it does better at avoiding recompilation issues, and works well even -when some directory options were not specified in terms of `${prefix}' -at `configure' time. +when some directory options were not specified in terms of '${prefix}' +at 'configure' time. Optional Features ================= If the package supports it, you can cause programs to be installed -with an extra prefix or suffix on their names by giving `configure' the -option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. +with an extra prefix or suffix on their names by giving 'configure' the +option '--program-prefix=PREFIX' or '--program-suffix=SUFFIX'. - Some packages pay attention to `--enable-FEATURE' options to -`configure', where FEATURE indicates an optional part of the package. -They may also pay attention to `--with-PACKAGE' options, where PACKAGE -is something like `gnu-as' or `x' (for the X Window System). The -`README' should mention any `--enable-' and `--with-' options that the + Some packages pay attention to '--enable-FEATURE' options to +'configure', where FEATURE indicates an optional part of the package. +They may also pay attention to '--with-PACKAGE' options, where PACKAGE +is something like 'gnu-as' or 'x' (for the X Window System). The +'README' should mention any '--enable-' and '--with-' options that the package recognizes. - For packages that use the X Window System, `configure' can usually + For packages that use the X Window System, 'configure' can usually find the X include and library files automatically, but if it doesn't, -you can use the `configure' options `--x-includes=DIR' and -`--x-libraries=DIR' to specify their locations. +you can use the 'configure' options '--x-includes=DIR' and +'--x-libraries=DIR' to specify their locations. Some packages offer the ability to configure how verbose the -execution of `make' will be. For these packages, running `./configure +execution of 'make' will be. For these packages, running './configure --enable-silent-rules' sets the default to minimal output, which can be -overridden with `make V=1'; while running `./configure +overridden with 'make V=1'; while running './configure --disable-silent-rules' sets the default to verbose, which can be -overridden with `make V=0'. +overridden with 'make V=0'. Particular systems ================== - On HP-UX, the default C compiler is not ANSI C compatible. If GNU -CC is not installed, it is recommended to use the following options in + On HP-UX, the default C compiler is not ANSI C compatible. If GNU CC +is not installed, it is recommended to use the following options in order to use an ANSI C compiler: ./configure CC="cc -Ae -D_XOPEN_SOURCE=500" and if that doesn't work, install pre-built binaries of GCC for HP-UX. - HP-UX `make' updates targets which have the same time stamps as -their prerequisites, which makes it generally unusable when shipped -generated files such as `configure' are involved. Use GNU `make' -instead. + HP-UX 'make' updates targets which have the same time stamps as their +prerequisites, which makes it generally unusable when shipped generated +files such as 'configure' are involved. Use GNU 'make' instead. On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot -parse its `<wchar.h>' header file. The option `-nodtk' can be used as -a workaround. If GNU CC is not installed, it is therefore recommended -to try +parse its '<wchar.h>' header file. The option '-nodtk' can be used as a +workaround. If GNU CC is not installed, it is therefore recommended to +try ./configure CC="cc" @@ -242,26 +240,26 @@ ./configure CC="cc -nodtk" - On Solaris, don't put `/usr/ucb' early in your `PATH'. This + On Solaris, don't put '/usr/ucb' early in your 'PATH'. This directory contains several dysfunctional programs; working variants of -these programs are available in `/usr/bin'. So, if you need `/usr/ucb' -in your `PATH', put it _after_ `/usr/bin'. +these programs are available in '/usr/bin'. So, if you need '/usr/ucb' +in your 'PATH', put it _after_ '/usr/bin'. - On Haiku, software installed for all users goes in `/boot/common', -not `/usr/local'. It is recommended to use the following options: + On Haiku, software installed for all users goes in '/boot/common', +not '/usr/local'. It is recommended to use the following options: ./configure --prefix=/boot/common Specifying the System Type ========================== - There may be some features `configure' cannot figure out + There may be some features 'configure' cannot figure out automatically, but needs to determine by the type of machine the package will run on. Usually, assuming the package is built to be run on the -_same_ architectures, `configure' can figure that out, but if it prints +_same_ architectures, 'configure' can figure that out, but if it prints a message saying it cannot guess the machine type, give it the -`--build=TYPE' option. TYPE can either be a short name for the system -type, such as `sun4', or a canonical name which has the form: +'--build=TYPE' option. TYPE can either be a short name for the system +type, such as 'sun4', or a canonical name which has the form: CPU-COMPANY-SYSTEM @@ -270,101 +268,101 @@ OS KERNEL-OS - See the file `config.sub' for the possible values of each field. If -`config.sub' isn't included in this package, then this package doesn't + See the file 'config.sub' for the possible values of each field. If +'config.sub' isn't included in this package, then this package doesn't need to know the machine type. If you are _building_ compiler tools for cross-compiling, you should -use the option `--target=TYPE' to select the type of system they will +use the option '--target=TYPE' to select the type of system they will produce code for. If you want to _use_ a cross compiler, that generates code for a platform different from the build platform, you should specify the "host" platform (i.e., that on which the generated programs will -eventually be run) with `--host=TYPE'. +eventually be run) with '--host=TYPE'. Sharing Defaults ================ - If you want to set default values for `configure' scripts to share, -you can create a site shell script called `config.site' that gives -default values for variables like `CC', `cache_file', and `prefix'. -`configure' looks for `PREFIX/share/config.site' if it exists, then -`PREFIX/etc/config.site' if it exists. Or, you can set the -`CONFIG_SITE' environment variable to the location of the site script. -A warning: not all `configure' scripts look for a site script. + If you want to set default values for 'configure' scripts to share, +you can create a site shell script called 'config.site' that gives +default values for variables like 'CC', 'cache_file', and 'prefix'. +'configure' looks for 'PREFIX/share/config.site' if it exists, then +'PREFIX/etc/config.site' if it exists. Or, you can set the +'CONFIG_SITE' environment variable to the location of the site script. +A warning: not all 'configure' scripts look for a site script. Defining Variables ================== Variables not defined in a site shell script can be set in the -environment passed to `configure'. However, some packages may run +environment passed to 'configure'. However, some packages may run configure again during the build, and the customized values of these variables may be lost. In order to avoid this problem, you should set -them in the `configure' command line, using `VAR=value'. For example: +them in the 'configure' command line, using 'VAR=value'. For example: ./configure CC=/usr/local2/bin/gcc -causes the specified `gcc' to be used as the C compiler (unless it is +causes the specified 'gcc' to be used as the C compiler (unless it is overridden in the site shell script). -Unfortunately, this technique does not work for `CONFIG_SHELL' due to -an Autoconf limitation. Until the limitation is lifted, you can use -this workaround: +Unfortunately, this technique does not work for 'CONFIG_SHELL' due to an +Autoconf limitation. Until the limitation is lifted, you can use this +workaround: CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash -`configure' Invocation +'configure' Invocation ====================== - `configure' recognizes the following options to control how it + 'configure' recognizes the following options to control how it operates. -`--help' -`-h' - Print a summary of all of the options to `configure', and exit. +'--help' +'-h' + Print a summary of all of the options to 'configure', and exit. -`--help=short' -`--help=recursive' +'--help=short' +'--help=recursive' Print a summary of the options unique to this package's - `configure', and exit. The `short' variant lists options used - only in the top level, while the `recursive' variant lists options - also present in any nested packages. - -`--version' -`-V' - Print the version of Autoconf used to generate the `configure' + 'configure', and exit. The 'short' variant lists options used only + in the top level, while the 'recursive' variant lists options also + present in any nested packages. + +'--version' +'-V' + Print the version of Autoconf used to generate the 'configure' script, and exit. -`--cache-file=FILE' +'--cache-file=FILE' Enable the cache: use and save the results of the tests in FILE, - traditionally `config.cache'. FILE defaults to `/dev/null' to + traditionally 'config.cache'. FILE defaults to '/dev/null' to disable caching. -`--config-cache' -`-C' - Alias for `--cache-file=config.cache'. - -`--quiet' -`--silent' -`-q' +'--config-cache' +'-C' + Alias for '--cache-file=config.cache'. + +'--quiet' +'--silent' +'-q' Do not print messages saying which checks are being made. To - suppress all normal output, redirect it to `/dev/null' (any error + suppress all normal output, redirect it to '/dev/null' (any error messages will still be shown). -`--srcdir=DIR' +'--srcdir=DIR' Look for the package's source code in directory DIR. Usually - `configure' can determine that directory automatically. + 'configure' can determine that directory automatically. -`--prefix=DIR' - Use DIR as the installation prefix. *note Installation Names:: - for more details, including other options available for fine-tuning - the installation locations. +'--prefix=DIR' + Use DIR as the installation prefix. *note Installation Names:: for + more details, including other options available for fine-tuning the + installation locations. -`--no-create' -`-n' +'--no-create' +'-n' Run the configure checks, but stop before creating any output files. -`configure' also accepts some other, not widely useful, options. Run -`configure --help' for more details. +'configure' also accepts some other, not widely useful, options. Run +'configure --help' for more details. 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/fipscheck-1.5.0/Makefile.am new/fipscheck-1.7.0/Makefile.am --- old/fipscheck-1.5.0/Makefile.am 2017-02-23 15:54:58.000000000 +0100 +++ new/fipscheck-1.7.0/Makefile.am 2022-11-02 15:46:35.000000000 +0100 @@ -1,4 +1,6 @@ -SUBDIRS = src man +SUBDIRS = src + +SUBDIRS += man ACLOCAL_AMFLAGS = -I m4 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/fipscheck-1.5.0/compile new/fipscheck-1.7.0/compile --- old/fipscheck-1.5.0/compile 2017-02-23 15:05:20.000000000 +0100 +++ new/fipscheck-1.7.0/compile 2022-11-02 15:44:26.000000000 +0100 @@ -1,9 +1,9 @@ #! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2012-10-14.11; # UTC +scriptversion=2016-01-11.22; # UTC -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2017 Free Software Foundation, Inc. # Written by Tom Tromey <tro...@cygnus.com>. # # This program is free software; you can redistribute it and/or modify @@ -255,7 +255,8 @@ echo "compile $scriptversion" exit $? ;; - cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \ + icl | *[/\\]icl | icl.exe | *[/\\]icl.exe ) func_cl_wrapper "$@" # Doesn't return... ;; esac @@ -342,6 +343,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # 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/fipscheck-1.5.0/config.h.in new/fipscheck-1.7.0/config.h.in --- old/fipscheck-1.5.0/config.h.in 2017-02-23 15:49:18.000000000 +0100 +++ new/fipscheck-1.7.0/config.h.in 2022-11-02 15:44:26.000000000 +0100 @@ -78,9 +78,6 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION -/* Define as the return type of signal handlers (`int' or `void'). */ -#undef RETSIGTYPE - /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS 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/fipscheck-1.5.0/configure.ac new/fipscheck-1.7.0/configure.ac --- old/fipscheck-1.5.0/configure.ac 2017-02-23 15:40:43.000000000 +0100 +++ new/fipscheck-1.7.0/configure.ac 2022-11-02 15:27:49.000000000 +0100 @@ -3,13 +3,13 @@ # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: -# +# # 1. Redistributions of source code must retain the above copyright notice, # this list of conditions and the following disclaimer. # 2. Redistributions in binary form must reproduce the above copyright notice, # this list of conditions and the following disclaimer in the documentation # and/or other materials provided with the distribution. -# +# # THIS SOFTWARE IS PROVIDED BY RED HAT, INC. ''AS IS'' AND ANY EXPRESS OR # IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF # MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO @@ -20,22 +20,34 @@ # LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE # OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# +# # The views and conclusions contained in the software and documentation are those # of the authors and should not be interpreted as representing official policies, # either expressed or implied, of Red Hat, Inc. -AC_INIT([fipscheck],[1.5.0],[tm...@redhat.com]) -AC_CONFIG_HEADER([config.h]) -AC_PREREQ(2.60) +AC_INIT([fipscheck],[1.7.0],[supp...@lairdconnect.com]) +AC_CONFIG_HEADERS([config.h]) +AC_PREREQ([2.69]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip]) +AC_ARG_ENABLE([docs], + AS_HELP_STRING([--enable-docs], [Enable man genereation @<:@default=yes@:>@]), + [case "${enableval}" in + yes) enable_docs=true ;; + no) enable_docs=false ;; + *) AC_MSG_ERROR([bad value ${enableval} for --enable-docs]) ;; + esac],[enable_docs=true]) +AM_CONDITIONAL([ENABLE_DOCS], [test x$enable_docs = xtrue]) + dnl Check for _GNU_SOURCE AC_USE_SYSTEM_EXTENSIONS -AM_PROG_LIBTOOL +LT_INIT([disable-static]) + +_LT_TAGVAR(hardcode_libdir_flag_spec, )="" +_LT_TAGVAR(hardcode_minus_L, )=yes PKG_PROG_PKG_CONFIG() @@ -66,7 +78,6 @@ dnl Checks for typedefs, structures, and compiler characteristics. AC_C_CONST -AC_TYPE_SIGNAL AC_TYPE_UID_T AC_TYPE_MODE_T AC_TYPE_OFF_T @@ -74,12 +85,11 @@ AC_TYPE_SIZE_T AC_STRUCT_TM -dnl Checks for the existence of libdl - on BSD and Tru64 its part of libc +dnl Checks for the existence of libdl - on BSD and Tru64 its part of libc AC_CHECK_LIB([dl], [dlopen], LIBDL="-ldl", LIBDL="") AC_SUBST(LIBDL) - -dnl This isn't a strictly correct use of --with, OTOH it is better +dnl This is not a strictly correct use of --with, OTOH it is better dnl than having separate and conflicting --with-nss and --with-openssl dnl options. Rather than be "smart" and guess the crypto library dnl based on what is installed, this logic simply barfs on an error. @@ -93,13 +103,13 @@ dnl Check for the existence of the slected crypto library with FIPS mode AS_CASE($with_crypto, [openssl|ssl], [ + PKG_CHECK_MODULES([CRYPTO],[libcrypto],[],[AC_MSG_ERROR([OpenSSL library with FIPS mode support is required])]) + CRYPTO_LIBS=-lcrypto AC_DEFINE([WITH_OPENSSL], [1], [use HMAC from the OpenSSL crypto library]) - AC_CHECK_LIB([crypto], [FIPS_mode], [CRYPTO_LIBS=-lcrypto], - [AC_MSG_ERROR([OpenSSL library with FIPS mode support is required])]) ], [nss], [ - PKG_CHECK_MODULES([CRYPTO],[nss],[],[AC_MSG_ERROR([NSS library with FIPS mode support is required])]) - CRYPTO_LIBS="$CRYPTO_LIBS -lfreebl" + PKG_CHECK_MODULES([CRYPTO],[nss],[],[AC_MSG_ERROR([NSS library with FIPS mode support is required])]) + CRYPTO_LIBS="$CRYPTO_LIBS -lfreebl" AC_DEFINE([WITH_NSS], [1], [use HMAC from the NSS crypto library]) ], [AC_MSG_ERROR([The --with-crypto library "$with_crypto" is not known])]) 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/fipscheck-1.5.0/fipscheck.spec new/fipscheck-1.7.0/fipscheck.spec --- old/fipscheck-1.5.0/fipscheck.spec 2017-02-23 15:53:25.000000000 +0100 +++ new/fipscheck-1.7.0/fipscheck.spec 2022-11-02 15:28:05.000000000 +0100 @@ -1,6 +1,6 @@ Summary: A library for integrity verification of FIPS validated modules Name: fipscheck -Version: 1.5.0 +Version: 1.7.0 Release: 1%{?dist} License: BSD Group: System Environment/Libraries 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/fipscheck-1.5.0/m4/libtool.m4 new/fipscheck-1.7.0/m4/libtool.m4 --- old/fipscheck-1.5.0/m4/libtool.m4 2017-02-23 15:05:17.000000000 +0100 +++ new/fipscheck-1.7.0/m4/libtool.m4 2022-11-02 15:44:22.000000000 +0100 @@ -728,7 +728,6 @@ cat <<_LT_EOF >> "$cfgfile" #! $SHELL # Generated automatically by $as_me ($PACKAGE) $VERSION -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: # NOTE: Changes made to this file will be lost: look at ltmain.sh. # Provide generalized library-building support services. @@ -2867,9 +2866,6 @@ # before this can be enabled. hardcode_into_libs=yes - # Add ABI-specific directories to the system library path. - sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" - # Ideally, we could use ldconfig to report *all* directores which are # searched for libraries, however this is still not possible. Aside from not # being certain /sbin/ldconfig is available, command @@ -2878,7 +2874,7 @@ # appending ld.so.conf contents (and includes) to the search path. if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on 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/fipscheck-1.5.0/man/FIPSCHECK_fips_module_installed.3 new/fipscheck-1.7.0/man/FIPSCHECK_fips_module_installed.3 --- old/fipscheck-1.5.0/man/FIPSCHECK_fips_module_installed.3 2017-02-23 15:05:41.000000000 +0100 +++ new/fipscheck-1.7.0/man/FIPSCHECK_fips_module_installed.3 2022-11-02 15:47:14.000000000 +0100 @@ -1 +1 @@ -.so man3/FIPSCHECK_verify.3 +.so FIPSCHECK_verify.3 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/fipscheck-1.5.0/man/FIPSCHECK_get_binary_path.3 new/fipscheck-1.7.0/man/FIPSCHECK_get_binary_path.3 --- old/fipscheck-1.5.0/man/FIPSCHECK_get_binary_path.3 2017-02-23 15:05:41.000000000 +0100 +++ new/fipscheck-1.7.0/man/FIPSCHECK_get_binary_path.3 2022-11-02 15:47:14.000000000 +0100 @@ -1 +1 @@ -.so man3/FIPSCHECK_verify.3 +.so FIPSCHECK_verify.3 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/fipscheck-1.5.0/man/FIPSCHECK_get_library_path.3 new/fipscheck-1.7.0/man/FIPSCHECK_get_library_path.3 --- old/fipscheck-1.5.0/man/FIPSCHECK_get_library_path.3 2017-02-23 15:05:41.000000000 +0100 +++ new/fipscheck-1.7.0/man/FIPSCHECK_get_library_path.3 2022-11-02 15:47:14.000000000 +0100 @@ -1 +1 @@ -.so man3/FIPSCHECK_verify.3 +.so FIPSCHECK_verify.3 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/fipscheck-1.5.0/man/FIPSCHECK_kernel_fips_mode.3 new/fipscheck-1.7.0/man/FIPSCHECK_kernel_fips_mode.3 --- old/fipscheck-1.5.0/man/FIPSCHECK_kernel_fips_mode.3 2017-02-23 15:05:41.000000000 +0100 +++ new/fipscheck-1.7.0/man/FIPSCHECK_kernel_fips_mode.3 2022-11-02 15:47:14.000000000 +0100 @@ -1 +1 @@ -.so man3/FIPSCHECK_verify.3 +.so FIPSCHECK_verify.3 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/fipscheck-1.5.0/man/FIPSCHECK_verify.3 new/fipscheck-1.7.0/man/FIPSCHECK_verify.3 --- old/fipscheck-1.5.0/man/FIPSCHECK_verify.3 2017-02-23 15:05:41.000000000 +0100 +++ new/fipscheck-1.7.0/man/FIPSCHECK_verify.3 2022-11-02 15:47:14.000000000 +0100 @@ -1,7 +1,7 @@ '\" t .\" Title: FIPSCHECK .\" Author: [see the "AUTHOR" section] -.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/> +.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> .\" Date: 16 April 2012 .\" Manual: fipscheck .\" Source: fipscheck @@ -126,7 +126,7 @@ .PP \fBfipscheck\fR(8), \fBfipshmac\fR(8), -\m[blue]\fBhttps://fedorahosted\&.org/fipscheck/\fR\m[] +\m[blue]\fBhttps://github\&.com/LairdCP/fipscheck/\fR\m[] .SH "AUTHOR" .PP Tomas Mraz <tmraz@redhat\&.com>\&. 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/fipscheck-1.5.0/man/FIPSCHECK_verify_ex.3 new/fipscheck-1.7.0/man/FIPSCHECK_verify_ex.3 --- old/fipscheck-1.5.0/man/FIPSCHECK_verify_ex.3 2017-02-23 15:05:41.000000000 +0100 +++ new/fipscheck-1.7.0/man/FIPSCHECK_verify_ex.3 2022-11-02 15:47:14.000000000 +0100 @@ -1 +1 @@ -.so man3/FIPSCHECK_verify.3 +.so FIPSCHECK_verify.3 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/fipscheck-1.5.0/man/FIPSCHECK_verify_files.3 new/fipscheck-1.7.0/man/FIPSCHECK_verify_files.3 --- old/fipscheck-1.5.0/man/FIPSCHECK_verify_files.3 2017-02-23 15:05:41.000000000 +0100 +++ new/fipscheck-1.7.0/man/FIPSCHECK_verify_files.3 2022-11-02 15:47:14.000000000 +0100 @@ -1 +1 @@ -.so man3/FIPSCHECK_verify.3 +.so FIPSCHECK_verify.3 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/fipscheck-1.5.0/man/FIPSCHECK_verify_files_ex.3 new/fipscheck-1.7.0/man/FIPSCHECK_verify_files_ex.3 --- old/fipscheck-1.5.0/man/FIPSCHECK_verify_files_ex.3 2017-02-23 15:05:41.000000000 +0100 +++ new/fipscheck-1.7.0/man/FIPSCHECK_verify_files_ex.3 2022-11-02 15:47:14.000000000 +0100 @@ -1 +1 @@ -.so man3/FIPSCHECK_verify.3 +.so FIPSCHECK_verify.3 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/fipscheck-1.5.0/man/fipscheck.3.xml new/fipscheck-1.7.0/man/fipscheck.3.xml --- old/fipscheck-1.5.0/man/fipscheck.3.xml 2017-02-23 15:05:01.000000000 +0100 +++ new/fipscheck-1.7.0/man/fipscheck.3.xml 2022-11-02 15:27:49.000000000 +0100 @@ -157,7 +157,7 @@ <refsect1 id='see_also'><title>SEE ALSO</title> <para><citerefentry><refentrytitle>fipscheck</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>fipshmac</refentrytitle><manvolnum>8</manvolnum></citerefentry>, -<ulink url='https://fedorahosted.org/fipscheck/'>https://fedorahosted.org/fipscheck/</ulink></para> +<ulink url='https://github.com/LairdCP/fipscheck/'>https://github.com/LairdCP/fipscheck/</ulink></para> </refsect1> <refsect1 id='author'><title>AUTHOR</title> 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/fipscheck-1.5.0/man/fipscheck.8 new/fipscheck-1.7.0/man/fipscheck.8 --- old/fipscheck-1.5.0/man/fipscheck.8 2017-02-23 15:05:42.000000000 +0100 +++ new/fipscheck-1.7.0/man/fipscheck.8 2022-11-02 15:47:15.000000000 +0100 @@ -1,7 +1,7 @@ '\" t .\" Title: fipscheck .\" Author: [see the "AUTHOR" section] -.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/> +.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> .\" Date: April 11, 2012 .\" Manual: fipscheck .\" Source: fipscheck @@ -75,7 +75,7 @@ .PP \fBfipshmac\fR(8), \fBfipscheck.h\fR(3), -\m[blue]\fBhttps://fedorahosted\&.org/fipscheck/\fR\m[] +\m[blue]\fBhttps://github\&.com/LairdCP/fipscheck/\fR\m[] .SH "AUTHOR" .PP Tomas Mraz <tmraz@redhat\&.com>\&. 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/fipscheck-1.5.0/man/fipscheck.8.xml new/fipscheck-1.7.0/man/fipscheck.8.xml --- old/fipscheck-1.5.0/man/fipscheck.8.xml 2017-02-23 15:05:01.000000000 +0100 +++ new/fipscheck-1.7.0/man/fipscheck.8.xml 2022-11-02 15:27:49.000000000 +0100 @@ -79,7 +79,7 @@ <para><citerefentry> <refentrytitle>fipshmac</refentrytitle> <manvolnum>8</manvolnum></citerefentry>, <citerefentry> <refentrytitle>fipscheck.h</refentrytitle> <manvolnum>3</manvolnum></citerefentry>, -<ulink url='https://fedorahosted.org/fipscheck/'>https://fedorahosted.org/fipscheck/</ulink> +<ulink url='https://github.com/LairdCP/fipscheck/'>https://github.com/LairdCP/fipscheck/</ulink> </para> </refsect1> 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/fipscheck-1.5.0/man/fipscheck.h.3 new/fipscheck-1.7.0/man/fipscheck.h.3 --- old/fipscheck-1.5.0/man/fipscheck.h.3 2017-02-23 15:05:41.000000000 +0100 +++ new/fipscheck-1.7.0/man/fipscheck.h.3 2022-11-02 15:47:14.000000000 +0100 @@ -1 +1 @@ -.so man3/FIPSCHECK_verify.3 +.so FIPSCHECK_verify.3 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/fipscheck-1.5.0/man/fipshmac.8 new/fipscheck-1.7.0/man/fipshmac.8 --- old/fipscheck-1.5.0/man/fipshmac.8 2017-02-23 15:05:42.000000000 +0100 +++ new/fipscheck-1.7.0/man/fipshmac.8 2022-11-02 15:47:16.000000000 +0100 @@ -1,7 +1,7 @@ '\" t .\" Title: fipshmac .\" Author: [see the "AUTHOR" section] -.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/> +.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> .\" Date: April 11, 2012 .\" Manual: fipshmac .\" Source: fipscheck @@ -65,7 +65,7 @@ .PP \fBfipscheck\fR(8), \fBfipscheck.h\fR(3), -\m[blue]\fBhttps://fedorahosted\&.org/fipscheck/\fR\m[] +\m[blue]\fBhttps://github\&.com/LairdCP/fipscheck/\fR\m[] .SH "AUTHOR" .PP Tomas Mraz <tmraz@redhat\&.com>\&. 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/fipscheck-1.5.0/man/fipshmac.8.xml new/fipscheck-1.7.0/man/fipshmac.8.xml --- old/fipscheck-1.5.0/man/fipshmac.8.xml 2017-02-23 15:05:01.000000000 +0100 +++ new/fipscheck-1.7.0/man/fipshmac.8.xml 2022-11-02 15:27:49.000000000 +0100 @@ -57,7 +57,7 @@ <para> <citerefentry> <refentrytitle>fipscheck</refentrytitle> <manvolnum>8</manvolnum></citerefentry>, <citerefentry> <refentrytitle>fipscheck.h</refentrytitle> <manvolnum>3</manvolnum></citerefentry>, -<ulink url='https://fedorahosted.org/fipscheck/'>https://fedorahosted.org/fipscheck/</ulink> +<ulink url='https://github.com/LairdCP/fipscheck/'>https://github.com/LairdCP/fipscheck/</ulink> </para> </refsect1> 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/fipscheck-1.5.0/missing new/fipscheck-1.7.0/missing --- old/fipscheck-1.5.0/missing 2017-02-23 15:05:20.000000000 +0100 +++ new/fipscheck-1.7.0/missing 2022-11-02 15:44:26.000000000 +0100 @@ -1,9 +1,9 @@ #! /bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2013-10-28.13; # UTC +scriptversion=2016-01-11.22; # UTC -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2017 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <pin...@iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -210,6 +210,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # 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/fipscheck-1.5.0/src/filehmac.c new/fipscheck-1.7.0/src/filehmac.c --- old/fipscheck-1.5.0/src/filehmac.c 2017-02-23 15:31:42.000000000 +0100 +++ new/fipscheck-1.7.0/src/filehmac.c 2022-11-02 15:27:49.000000000 +0100 @@ -5,13 +5,13 @@ * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: - * + * * 1. Redistributions of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright notice, * this list of conditions and the following disclaimer in the documentation * and/or other materials provided with the distribution. - * + * * THIS SOFTWARE IS PROVIDED BY RED HAT, INC. ''AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO @@ -22,7 +22,7 @@ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * + * * The views and conclusions contained in the software and documentation are those * of the authors and should not be interpreted as representing official policies, * either expressed or implied, of Red Hat, Inc. @@ -41,9 +41,12 @@ #include <sys/wait.h> #if defined(WITH_OPENSSL) -#include <openssl/fips.h> +#if OPENSSL_VERSION_NUMBER >= 0x30000000L +#include <openssl/provider.h> #include <openssl/evp.h> +#else #include <openssl/hmac.h> +#endif #elif defined(WITH_NSS) #include <nss.h> #include <sechash.h> @@ -167,7 +170,7 @@ child = fork(); if (child == 0) { - char * args[] = { NULL, NULL, NULL, NULL }; + char *args[] = { NULL, NULL, NULL, NULL }; args[0] = PATH_PRELINK; args[1] = "--verify"; @@ -175,7 +178,7 @@ close(fds[0]); if (dup2(fds[1], STDOUT_FILENO) == -1) { - exit(126); + exit(126); } execv(PATH_PRELINK, args); @@ -183,7 +186,7 @@ exit(127); } else if (child > 0) { *prelink = child; - + close(fds[1]); rpipe = fdopen(fds[0], "r"); return rpipe; @@ -196,10 +199,110 @@ } #endif +#if defined(WITH_OPENSSL) && OPENSSL_VERSION_NUMBER >= 0x30000000L int compute_file_hmac(const char *path, void **buf, size_t *hmaclen, int force_fips) { + static OSSL_PROVIDER *fips = NULL; FILE *f = NULL; + +#ifdef CALL_PRELINK + int prelink = 0; +#endif + int rv = -1; + OSSL_PARAM params[2]; + unsigned char rbuf[READ_BUFFER_LENGTH]; + size_t len; + unsigned int hlen; + + if (force_fips && fips != NULL) { + fips = OSSL_PROVIDER_load(NULL, "fips"); + if (fips == NULL) { + debug_log("Failed to load FIPS provider\n"); + return -1; + } + } + +#ifdef CALL_PRELINK + if (access(PATH_PRELINK, X_OK) == 0) { + f = spawn_prelink(path, &prelink); + } + + if (!prelink && f == NULL) { + f = fopen(path, "r"); + } +#else + f = fopen(path, "r"); +#endif + + if (f == NULL) { + debug_log("Failed to open '%s'", path); + goto end; + } + + EVP_MAC *mac = EVP_MAC_fetch(NULL, "HMAC", force_fips ? "provider=fips" : NULL); + if (mac == NULL) { + debug_log("Failed to allocate memory for HMAC"); + goto end; + } + + EVP_MAC_CTX *c = EVP_MAC_CTX_new(mac); + if (c == NULL) { + debug_log("Failed to allocate memory for HMAC_CTX"); + goto end; + } + + EVP_MAC_free(mac); + + params[0] = OSSL_PARAM_construct_utf8_string("digest", "SHA256", 0); + params[1] = OSSL_PARAM_construct_end(); + + EVP_MAC_init(c, hmackey, sizeof(hmackey) - 1, params); + + while ((len = fread(rbuf, 1, sizeof(rbuf), f)) != 0) + EVP_MAC_update(c, rbuf, len); + + EVP_MAC_final(c, rbuf, &hlen, sizeof(rbuf)); + EVP_MAC_CTX_free(c); + + *buf = malloc(hlen); + if (*buf == NULL) { + debug_log("Failed to allocate memory"); + goto end; + } + + *hmaclen = hlen; + + memcpy(*buf, rbuf, hlen); + + rv = 0; + +end: + if (f) + fclose(f); + +#ifdef CALL_PRELINK + if (prelink) { + int ret; + int status; + + while ((ret = waitpid(prelink, &status, 0)) == -1 && /* wait for prelink to complete */ + errno == EINTR); + if (ret <= 0 || !WIFEXITED(status) || WEXITSTATUS(status) != 0) { + debug_log("prelink failed"); + rv = -1; + } + } +#endif + + return rv; +} +#else +int +compute_file_hmac(const char *path, void **buf, size_t *hmaclen, int force_fips) +{ + FILE *f = NULL; + #ifdef CALL_PRELINK int prelink = 0; #endif @@ -216,7 +319,7 @@ #if defined(WITH_NSS) /* - * While, technically, NSS_NoDB_Init() is idenpotent, perform + * While, technically, NSS_NoDB_Init() is idempotent, perform * an explicit test. */ if (!NSS_IsInitialized()) { @@ -243,7 +346,7 @@ if (SECMOD_DeleteInternalModule(internal->commonName) != SECSuccess) { errno = 0; debug_log("SECMOD_DeleteInternalModule(%s) failed", - internal->commonName); + internal->commonName); return -1; } if (!PK11_IsFIPS()) { @@ -262,9 +365,9 @@ if (!prelink && f == NULL) { #endif - f = fopen(path, "r"); + f = fopen(path, "r"); #ifdef CALL_PRELINK - } +} #endif if (f == NULL) { @@ -278,7 +381,7 @@ debug_log("Failed to allocate memory for HMAC_CTX"); goto end; } - HMAC_Init(c, hmackey, sizeof(hmackey)-1, EVP_sha256()); + HMAC_Init_ex(c, hmackey, sizeof(hmackey) - 1, EVP_sha256(), NULL); #elif defined(WITH_NSS) errno = 0; hash = HASH_GetHashObject(HASH_AlgSHA256); @@ -297,9 +400,8 @@ HMAC_Begin(c); #endif - while ((len=fread(rbuf, 1, sizeof(rbuf), f)) != 0) { + while ((len = fread(rbuf, 1, sizeof(rbuf), f)) != 0) HMAC_Update(c, rbuf, len); - } len = sizeof(rbuf); /* reuse rbuf for hmac */ @@ -321,13 +423,13 @@ rv = 0; end: + if (c != NULL) { #if defined(WITH_OPENSSL) - HMAC_CTX_free(c); + HMAC_CTX_free(c); #elif defined(WITH_NSS) - if (c != NULL) { HMAC_Destroy(c, PR_TRUE); - } #endif + } if (f) fclose(f); @@ -337,8 +439,8 @@ int ret; int status; - while ((ret=waitpid(prelink, &status, 0)) == -1 && /* wait for prelink to complete */ - errno == EINTR); + while ((ret = waitpid(prelink, &status, 0)) == -1 && /* wait for prelink to complete */ + errno == EINTR); if (ret <= 0 || !WIFEXITED(status) || WEXITSTATUS(status) != 0) { debug_log("prelink failed"); rv = -1; @@ -348,6 +450,7 @@ return rv; } +#endif static const char conv[] = "0123456789abcdef"; @@ -356,7 +459,7 @@ { char *hex, *p; unsigned char *src = buf; - + hex = malloc(len * 2 + 1); if (hex == NULL) return 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/fipscheck-1.5.0/src/fipshmac.c new/fipscheck-1.7.0/src/fipshmac.c --- old/fipscheck-1.5.0/src/fipshmac.c 2017-02-23 15:05:01.000000000 +0100 +++ new/fipscheck-1.7.0/src/fipshmac.c 2022-11-02 15:27:49.000000000 +0100 @@ -43,8 +43,8 @@ int rv = 0; char *hmac = NULL; size_t hmaclen; - void *buf; - char *hex; + void *buf = NULL; + char *hex = NULL; hmacpath = make_hmac_path(path, destdir, hmac_suffix); @@ -53,13 +53,6 @@ return 5; } - hf = fopen(hmacpath, "w"); - if (hf == NULL) { - debug_log("Cannot open hmac file '%s'", hmacpath); - free(hmacpath); - return 3; - } - if (compute_file_hmac(path, &buf, &hmaclen, 0) < 0) { rv = 4; goto end; @@ -67,25 +60,32 @@ if ((hex=bin2hex(buf, hmaclen)) == NULL) { debug_log("Cannot convert hmac to hexadecimal"); - free(buf); rv = 5; goto end; } + hf = fopen(hmacpath, "w"); + if (hf == NULL) { + debug_log("Cannot open hmac file '%s'", hmacpath); + rv = 3; + goto end; + } + if (fprintf(hf, "%s\n", hex) < hmaclen*2) { debug_log("Cannot write to hmac file '%s'", hmacpath); rv = 6; } - free(buf); - free(hex); - -end: - free(hmac); if (fclose(hf) != 0) { debug_log("Failure during closing hmac file '%s'", hmacpath); rv = 7; } + +end: + free(buf); + free(hex); + free(hmac); + if (rv != 0) { unlink(hmacpath); }
