From 85948eee7e5d9b4eb07236c53fe4b76db6fbffe3 Mon Sep 17 00:00:00 2001 From: Andrew Karcher Date: Tue, 8 Sep 2020 16:53:07 -0400 Subject: [PATCH 1/2] Fixes for make dist and other small changes --- Makefile.am | 9 +++++---- Makefile.in | 4 ++-- README.md | 1 + app/app_main.c | 2 +- src/acvp_build_register.c | 6 ++++-- 5 files changed, 13 insertions(+), 9 deletions(-) diff --git a/Makefile.am b/Makefile.am index 869640f0..d809fe14 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,14 +1,10 @@ ACLOCAL_AMFLAGS = -I m4 AUTOMAKE_OPTIONS=foreign -dist_data_DATA = README.md -EXTRA_DIST = ms docker certs scripts docs metadata murl - if UNIT_TEST_SUPPORTED TEST_DIR=test endif - if APP_NOT_SUPPORTED APP_DIR= else @@ -21,5 +17,10 @@ else LIB_DIR=src endif +##dist_data_DATA includes files to be installed to the /share folder +##SUBDIRS references code that needs to be built and their files only. These files are included in dist. +##EXTRA_DIST is not referenced for building code but for creating the dist and includes NON-code files as well. +dist_data_DATA = README.md +EXTRA_DIST = ms docker certs scripts docs metadata murl test SUBDIRS = safe_c_stub $(LIB_DIR) $(APP_DIR) $(TEST_DIR) diff --git a/Makefile.in b/Makefile.in index e5b851ca..f831ca25 100644 --- a/Makefile.in +++ b/Makefile.in @@ -369,13 +369,13 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I m4 AUTOMAKE_OPTIONS = foreign -dist_data_DATA = README.md -EXTRA_DIST = ms docker certs scripts docs metadata murl @UNIT_TEST_SUPPORTED_TRUE@TEST_DIR = test @APP_NOT_SUPPORTED_FALSE@APP_DIR = app @APP_NOT_SUPPORTED_TRUE@APP_DIR = @LIB_NOT_SUPPORTED_FALSE@LIB_DIR = src @LIB_NOT_SUPPORTED_TRUE@LIB_DIR = +dist_data_DATA = README.md +EXTRA_DIST = ms docker certs scripts docs metadata murl test SUBDIRS = safe_c_stub $(LIB_DIR) $(APP_DIR) $(TEST_DIR) all: all-recursive diff --git a/README.md b/README.md index 1dacd23c..c09fc203 100644 --- a/README.md +++ b/README.md @@ -414,3 +414,4 @@ This package was initially written by John Foley of Cisco Systems. | **Safe Primes** | | | **SafePrimes KeyGen** | N | N | | **SafePrimes KeyVer** | N | N | + diff --git a/app/app_main.c b/app/app_main.c index 1397fb2d..46060d4b 100755 --- a/app/app_main.c +++ b/app/app_main.c @@ -22,8 +22,8 @@ #ifdef ACVP_NO_RUNTIME # include "app_fips_lcl.h" -# include "app_fips_init_lcl.h" +# include "app_fips_init_lcl.h" #ifdef fips_selftest_fail extern int fips_selftest_fail; #else diff --git a/src/acvp_build_register.c b/src/acvp_build_register.c index b8053f13..dbcc065a 100644 --- a/src/acvp_build_register.c +++ b/src/acvp_build_register.c @@ -541,8 +541,10 @@ static ACVP_RESULT acvp_build_sym_cipher_register_cap(JSON_Object *cap_obj, ACVP * Set the supported lengths (could be pt, ct, data, etc. * see alg spec for more details) */ - json_object_set_value(cap_obj, "payloadLen", json_value_init_array()); - opts_arr = json_object_get_array(cap_obj, "payloadLen"); + if (cap_entry->cipher != ACVP_AES_GMAC) { + json_object_set_value(cap_obj, "payloadLen", json_value_init_array()); + opts_arr = json_object_get_array(cap_obj, "payloadLen"); + } sl_list = sym_cap->ptlen; while (sl_list) { From 58d70e387688c313521b597259199f9ffcead659 Mon Sep 17 00:00:00 2001 From: Andrew Karcher Date: Tue, 8 Sep 2020 17:04:53 -0400 Subject: [PATCH 2/2] Fixing spacing --- app/app_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/app_main.c b/app/app_main.c index 46060d4b..1397fb2d 100755 --- a/app/app_main.c +++ b/app/app_main.c @@ -22,8 +22,8 @@ #ifdef ACVP_NO_RUNTIME # include "app_fips_lcl.h" - # include "app_fips_init_lcl.h" + #ifdef fips_selftest_fail extern int fips_selftest_fail; #else