From 3bbb984370cc6dce46ba9a9f0d650f7d533e2948 Mon Sep 17 00:00:00 2001 From: Andrew Karcher Date: Mon, 14 Sep 2020 13:01:51 -0400 Subject: [PATCH] Update revision for RSA and version number --- configure | 20 ++++++++++---------- configure.ac | 2 +- include/acvp/acvp_lcl.h | 5 +++-- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/configure b/configure index 3097de05..8ba68713 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for libacvp 1.1.0. +# Generated by GNU Autoconf 2.69 for libacvp 1.1.1. # # Report bugs to . # @@ -729,8 +729,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libacvp' PACKAGE_TARNAME='libacvp' -PACKAGE_VERSION='1.1.0' -PACKAGE_STRING='libacvp 1.1.0' +PACKAGE_VERSION='1.1.1' +PACKAGE_STRING='libacvp 1.1.1' PACKAGE_BUGREPORT='https://github.com/cisco/libacvp/issues' PACKAGE_URL='' @@ -1487,7 +1487,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libacvp 1.1.0 to adapt to many kinds of systems. +\`configure' configures libacvp 1.1.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1557,7 +1557,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libacvp 1.1.0:";; + short | recursive ) echo "Configuration of libacvp 1.1.1:";; esac cat <<\_ACEOF @@ -1679,7 +1679,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libacvp configure 1.1.0 +libacvp configure 1.1.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1957,7 +1957,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libacvp $as_me 1.1.0, which was +It was created by libacvp $as_me 1.1.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2856,7 +2856,7 @@ fi # Define the identity of the package. PACKAGE='libacvp' - VERSION='1.1.0' + VERSION='1.1.1' cat >>confdefs.h <<_ACEOF @@ -12021,7 +12021,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libacvp $as_me 1.1.0, which was +This file was extended by libacvp $as_me 1.1.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12078,7 +12078,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libacvp config.status 1.1.0 +libacvp config.status 1.1.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 2435234e..88201dd8 100644 --- a/configure.ac +++ b/configure.ac @@ -13,7 +13,7 @@ # m4_define([libacvp_major_version], [1]) m4_define([libacvp_minor_version], [1]) -m4_define([libacvp_micro_version], [0]) +m4_define([libacvp_micro_version], [1]) AC_INIT([libacvp], [libacvp_major_version.libacvp_minor_version.libacvp_micro_version], [https://github.com/cisco/libacvp/issues]) # Safety checks in case user overwritten --srcdir diff --git a/include/acvp/acvp_lcl.h b/include/acvp/acvp_lcl.h index 0e41af61..064f5c4d 100755 --- a/include/acvp/acvp_lcl.h +++ b/include/acvp/acvp_lcl.h @@ -13,7 +13,7 @@ #include "parson.h" #define ACVP_VERSION "1.0" -#define ACVP_LIBRARY_VERSION "libacvp_oss-1.1.0" +#define ACVP_LIBRARY_VERSION "libacvp_oss-1.1.1" #ifndef ACVP_LOG_ERR @@ -106,6 +106,7 @@ ******************************************************** */ #define ACVP_REVISION_LATEST "1.0" +#define ACVP_REVISION_FIPS186_4 "FIPS186-4" /* AES */ #define ACVP_REV_AES_ECB ACVP_REVISION_LATEST @@ -179,7 +180,7 @@ #define ACVP_REV_DSA ACVP_REVISION_LATEST /* RSA */ -#define ACVP_REV_RSA ACVP_REVISION_LATEST +#define ACVP_REV_RSA ACVP_REVISION_FIPS186_4 /* RSA */ #define ACVP_REV_ECDSA ACVP_REVISION_LATEST