nasa · rjbrown2 · Dec 21, 2021 · Dec 17, 2021 · Dec 17, 2021 · Dec 17, 2021
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,6 @@
 .idea
 vgcore*
-core
+**core
 *.so
 build
 venv

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,18 +1,19 @@
-#   Copyright (C) 2009 - 2022 National Aeronautics and Space Administration. All Foreign Rights are Reserved to the U.S. Government.
-#
-#   This software is provided "as is" without any warranty of any kind, either expressed, implied, or statutory, including, but not
-#   limited to, any warranty that the software will conform to specifications, any implied warranties of merchantability, fitness
-#   for a particular purpose, and freedom from infringement, and any warranty that the documentation will conform to the program, or
-#   any warranty that the software will be error free.
-#
-#   In no event shall NASA be liable for any damages, including, but not limited to direct, indirect, special or consequential damages,
-#   arising out of, resulting from, or in any way connected with the software or its documentation, whether or not based upon warranty,
-#   contract, tort or otherwise, and whether or not loss was sustained from, or arose out of the results of, or use of, the software,
-#   documentation or services provided hereunder.
-#
-#   ITC Team
-#   NASA IV&V
-#   [email protected]
+# Copyright (C) 2009 - 2022 National Aeronautics and Space Administration.
+# All Foreign Rights are Reserved to the U.S. Government.
+# 
+# This software is provided "as is" without any warranty of any kind, either expressed, implied, or statutory,
+# including, but not limited to, any warranty that the software will conform to specifications, any implied warranties
+# of merchantability, fitness for a particular purpose, and freedom from infringement, and any warranty that the
+# documentation will conform to the program, or any warranty that the software will be error free.
+# 
+# In no event shall NASA be liable for any damages, including, but not limited to direct, indirect, special or
+# consequential damages, arising out of, resulting from, or in any way connected with the software or its
+# documentation, whether or not based upon warranty, contract, tort or otherwise, and whether or not loss was sustained
+# from, or arose out of the results of, or use of, the software, documentation or services provided hereunder.
+# 
+# ITC Team
+# NASA IV&V
+# [email protected]
 
 
 #cmake_minimum_required(VERSION 2.6.4)
@@ -39,7 +40,9 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
     enable_testing()
 endif()
 
-include_directories(fsw/public_inc)
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror")
+
+include_directories(include)
 
 # The shared OSAL and cFE include directories should always be used
 # Note that this intentionally does NOT include PSP-specific includes, just the generic
@@ -56,4 +59,10 @@ if(NOT DEFINED ${PROJECT_BINARY_DIR})
     set(PROJECT_BINARY_DIR ${CMAKE_CURRENT_SOURCE_DIR}/build)
 endif()
 
-add_subdirectory(fsw)
+add_subdirectory(src)
+
+if((CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME OR MYPROJECT_BUILD_TESTING) AND BUILD_TESTING)
+    add_subdirectory(test)
+endif()
+
+add_subdirectory(util)
diff --git a/CryptoLib-Doxyfile b/CryptoLib-Doxyfile
@@ -38,7 +38,7 @@ PROJECT_NAME           = "CryptoLib"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 1.0.0
+PROJECT_NUMBER         = 1.0.1
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
@@ -829,7 +829,7 @@ WARN_LOGFILE           =
 # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
 # Note: If this tag is empty the current directory is searched.
 
-INPUT                  = ./fsw ./fsw/crypto_util/ut_tc_apply.c
+INPUT                  = ./src ./util/src_util/ut_tc_apply.c
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses

diff --git a/README.md b/README.md
@@ -4,9 +4,5 @@
 
 Provide a software-only solution using the CCSDS Space Data Link Security Protocol - Extended Procedures (SDLS-EP) to secure communications between a spacecraft running the core Flight System (cFS) and a ground station.
 
-In order to build crypto the following must be installed assuming Ubuntu 18.04 LTS:
-* `sudo apt install libgpg-error-dev libgcrypt20-dev`
-
-
 More information about building and usage of CryptoLib can be found within the repository Wiki:
 https://github.com/nasa/CryptoLib/wiki
diff --git a/docs/gcrypt.pdf b/docs/gcrypt.pdf
diff --git a/fsw/20190717_tm_testing.txt b/fsw/20190717_tm_testing.txt
diff --git a/fsw/CMakeLists.txt b/fsw/CMakeLists.txt
diff --git a/fsw/crypto_tests/CMakeLists.txt b/fsw/crypto_tests/CMakeLists.txt
diff --git a/fsw/crypto_tests/data/tc4.1.dat b/fsw/crypto_tests/data/tc4.1.dat
diff --git a/fsw/crypto_tests/data/tc5.1.dat b/fsw/crypto_tests/data/tc5.1.dat
diff --git a/fsw/crypto_tests/data/tc5.2.dat b/fsw/crypto_tests/data/tc5.2.dat
diff --git a/fsw/crypto_tests/data/tc5.3.dat b/fsw/crypto_tests/data/tc5.3.dat
diff --git a/fsw/crypto_util/app/apply_security.c b/fsw/crypto_util/app/apply_security.c