Merge pull request #828 from jhelmold/GEA-624_Implement_matching_of_C…

…PEs_to_rules_as_used_in_CVEs

Add: Added functions used for the matching of CPEs to rules.

CMakeLists.txt

@@ -230,8 +230,8 @@ if (BUILD_TESTS AND NOT SKIP_SRC)
   add_custom_target (tests
     DEPENDS array-test alivedetection-test boreas_error-test boreas_io-test
             cli-test cpeutils-test cvss-test ping-test sniffer-test util-test networking-test
-            passwordbasedauthentication-test xmlutils-test version-test osp-test 
-            nvti-test hosts-test jsonpull-test)
+            passwordbasedauthentication-test xmlutils-test version-test osp-test
+            versionutils-test nvti-test hosts-test jsonpull-test)
 
 endif (BUILD_TESTS AND NOT SKIP_SRC)
 

util/CMakeLists.txt

@@ -113,12 +113,12 @@ include_directories (${GLIB_INCLUDE_DIRS} ${GPGME_INCLUDE_DIRS} ${GCRYPT_INCLUDE
                      ${LIBXML2_INCLUDE_DIRS})
 
 set (FILES cpeutils.c passwordbasedauthentication.c compressutils.c fileutils.c gpgmeutils.c kb.c ldaputils.c
-           nvticache.c mqtt.c radiusutils.c serverutils.c sshutils.c uuidutils.c
+           nvticache.c mqtt.c radiusutils.c serverutils.c sshutils.c uuidutils.c versionutils.c
            xmlutils.c jsonpull.c)
 
 set (HEADERS cpeutils.h passwordbasedauthentication.h authutils.h compressutils.h fileutils.h gpgmeutils.h kb.h
              ldaputils.h nvticache.h mqtt.h radiusutils.h serverutils.h sshutils.h
-             uuidutils.h xmlutils.h jsonpull.h)
+             uuidutils.h xmlutils.h jsonpull.h versionutils.h)
 
 if (BUILD_STATIC)
   add_library (gvm_util_static STATIC ${FILES})
@@ -198,6 +198,24 @@ if (BUILD_TESTS)
   add_custom_target (tests-cpeutils
                     DEPENDS cpeutils-test)
 
+  add_executable (versionutils-test
+                  EXCLUDE_FROM_ALL
+                  versionutils_tests.c)
+
+  add_test (versionutils-test versionutils-test)
+
+  target_include_directories (versionutils-test PRIVATE ${CGREEN_INCLUDE_DIRS})
+
+  target_link_libraries (versionutils-test ${CGREEN_LIBRARIES}
+                        ${GLIB_LDFLAGS} ${GIO_LDFLAGS} ${GPGME_LDFLAGS} ${ZLIB_LDFLAGS}
+              ${RADIUS_LDFLAGS} ${LIBSSH_LDFLAGS} ${GNUTLS_LDFLAGS}
+              ${GCRYPT_LDFLAGS} ${LDAP_LDFLAGS} ${REDIS_LDFLAGS}
+              ${LIBXML2_LDFLAGS} ${UUID_LDFLAGS}
+              ${LINKER_HARDENING_FLAGS})
+
+  add_custom_target (tests-versionutils
+                    DEPENDS versionutils-test)
+
   add_executable (xmlutils-test
                   EXCLUDE_FROM_ALL
                   xmlutils_tests.c)

util/cpeutils.c

@@ -11,6 +11,8 @@
  * CPE or the CPE 2.3 formatted string binding of a CPE into a CPE struct
  * that corresponds to the WFN naming of a CPE. Further functions to convert
  * the CPE struct into the different bindings are provided.
+ * This file also contains a function that checks if one CPE (represented in a
+ * CPE struct) is a match for an other CPE (also represented in a CPE struct).
  */
 
 #include "cpeutils.h"