Fix doxygen grouping regarding containers and PKCS#7

diff --git a/src/libstrongswan/credentials/containers/container.h b/src/libstrongswan/credentials/containers/container.h
index 3421e7783ba4ec449a18b844dac5304a0cdf3414..fc5c09041370ff2bc2502b8208b0314c447387fb 100644 (file)
--- a/src/libstrongswan/credentials/containers/container.h
+++ b/src/libstrongswan/credentials/containers/container.h
@@ -31,13 +31,13 @@ typedef enum container_type_t container_type_t;
  * Type of the container.
  */
 enum container_type_t {
-       /* Any kind of PKCS7/CMS container */
+       /** Any kind of PKCS7/CMS container */
        CONTAINER_PKCS7,
-       /* PKCS7/CMS plain "data" */
+       /** PKCS7/CMS plain "data" */
        CONTAINER_PKCS7_DATA,
-       /* PKCS7/CMS "signed-data" */
+       /** PKCS7/CMS "signed-data" */
        CONTAINER_PKCS7_SIGNED_DATA,
-       /* PKCS7/CMS "enveloped-data" */
+       /** PKCS7/CMS "enveloped-data" */
        CONTAINER_PKCS7_ENVELOPED_DATA,
 };
 

diff --git a/src/libstrongswan/library.h b/src/libstrongswan/library.h
index 6f455a617dcec839eb8373e48566171f2101e990..f164a6052982b5efdb92eeb01d961b63e0bd8538 100644 (file)
--- a/src/libstrongswan/library.h
+++ b/src/libstrongswan/library.h
@@ -34,6 +34,9 @@
  * @defgroup certificates certificates
  * @ingroup credentials
  *
+ * @defgroup containers containers
+ * @ingroup credentials
+ *
  * @defgroup sets sets
  * @ingroup credentials
  *

diff --git a/src/libstrongswan/plugins/pkcs7/pkcs7_attributes.h b/src/libstrongswan/plugins/pkcs7/pkcs7_attributes.h
index 2959194b0fc5c9d115a3ee5ca0b1de74460a6f8c..d5f6156a10aceb844d25e29097e53351c1313ceb 100644 (file)
--- a/src/libstrongswan/plugins/pkcs7/pkcs7_attributes.h
+++ b/src/libstrongswan/plugins/pkcs7/pkcs7_attributes.h
@@ -16,7 +16,7 @@
 
 /**
  * @defgroup pkcs7_attributes pkcs7_attributes
- * @{ @ingroup pkcs7
+ * @{ @ingroup pkcs7p
  */
 
 #ifndef PKCS7_ATTRIBUTES_H_

diff --git a/src/libstrongswan/plugins/pkcs7/pkcs7_data.h b/src/libstrongswan/plugins/pkcs7/pkcs7_data.h
index 459d355cad501d70381c9f52d5450f62fb123ddc..86512b76f71e8365cf361a470d645aa1f10176a8 100644 (file)
--- a/src/libstrongswan/plugins/pkcs7/pkcs7_data.h
+++ b/src/libstrongswan/plugins/pkcs7/pkcs7_data.h
@@ -15,7 +15,7 @@
 
 /**
  * @defgroup pkcs7_data pkcs7_data
- * @{ @ingroup pkcs7
+ * @{ @ingroup pkcs7p
  */
 
 #ifndef PKCS7_DATA_H_

diff --git a/src/libstrongswan/plugins/pkcs7/pkcs7_enveloped_data.h b/src/libstrongswan/plugins/pkcs7/pkcs7_enveloped_data.h
index 08ac0dcdb64ecde5860a4b5b354d1df8e9655139..5e35abd542c9c996580c6a74d28a7aacc2cd5181 100644 (file)
--- a/src/libstrongswan/plugins/pkcs7/pkcs7_enveloped_data.h
+++ b/src/libstrongswan/plugins/pkcs7/pkcs7_enveloped_data.h
@@ -15,7 +15,7 @@
 
 /**
  * @defgroup pkcs7_enveloped_data pkcs7_enveloped_data
- * @{ @ingroup pkcs7
+ * @{ @ingroup pkcs7p
  */
 
 #ifndef PKCS7_ENVELOPED_DATA_H_

diff --git a/src/libstrongswan/plugins/pkcs7/pkcs7_generic.h b/src/libstrongswan/plugins/pkcs7/pkcs7_generic.h
index 8bdc62b366fca34e60d2c0acaf3ea5a5e8b96a30..819343c4de4b5b708c062b8eb027eefa9e01333e 100644 (file)
--- a/src/libstrongswan/plugins/pkcs7/pkcs7_generic.h
+++ b/src/libstrongswan/plugins/pkcs7/pkcs7_generic.h
@@ -15,7 +15,7 @@
 
 /**
  * @defgroup pkcs7_generic pkcs7_generic
- * @{ @ingroup pkcs7
+ * @{ @ingroup pkcs7p
  */
 
 #ifndef PKCS7_GENERIC_H_

diff --git a/src/libstrongswan/plugins/pkcs7/pkcs7_plugin.h b/src/libstrongswan/plugins/pkcs7/pkcs7_plugin.h
index c86001a4e9a4dd28dedbd7e4e10ef66eb67be2a0..3d582c7c682591990e2c43da5527125a716d67f5 100644 (file)
--- a/src/libstrongswan/plugins/pkcs7/pkcs7_plugin.h
+++ b/src/libstrongswan/plugins/pkcs7/pkcs7_plugin.h
@@ -14,11 +14,11 @@
  */
 
 /**
- * @defgroup pkcs7 pkcs7
+ * @defgroup pkcs7p pkcs7
  * @ingroup plugins
  *
  * @defgroup pkcs7_plugin pkcs7_plugin
- * @{ @ingroup pkcs7
+ * @{ @ingroup pkcs7p
  */
 
 #ifndef PKCS7_PLUGIN_H_

diff --git a/src/libstrongswan/plugins/pkcs7/pkcs7_signed_data.h b/src/libstrongswan/plugins/pkcs7/pkcs7_signed_data.h
index 6ada6279ff73c43cfd0e5d13e96657ed7eb1cf29..5de6721177ae759aff70c164c5928bdd6dddf0d7 100644 (file)
--- a/src/libstrongswan/plugins/pkcs7/pkcs7_signed_data.h
+++ b/src/libstrongswan/plugins/pkcs7/pkcs7_signed_data.h
@@ -15,7 +15,7 @@
 
 /**
  * @defgroup pkcs7_signed_data pkcs7_signed_data
- * @{ @ingroup pkcs7
+ * @{ @ingroup pkcs7p
  */
 
 #ifndef PKCS7_SIGNED_DATA_H_