- Updated to new upstream.

1 files changed, 17 insertions, 34 deletions

diff --git a/src/charon/encoding/payloads/auth_payload.h b/src/charon/encoding/payloads/auth_payload.h
index 2db82ec0b..bdbba9e35 100644
--- a/src/charon/encoding/payloads/auth_payload.h
+++ b/src/charon/encoding/payloads/auth_payload.h
@@ -1,10 +1,3 @@
-/**
- * @file auth_payload.h
- * 
- * @brief Interface of auth_payload_t.
- * 
- */
-
 /*
  * Copyright (C) 2005-2006 Martin Willi
  * Copyright (C) 2005 Jan Hutter
@@ -19,6 +12,13 @@
  * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
+ *
+ * $Id: auth_payload.h 3589 2008-03-13 14:14:44Z martin $
+ */
+
+/**
+ * @defgroup auth_payload auth_payload
+ * @{ @ingroup payloads
  */
 
 #ifndef AUTH_PAYLOAD_H_
@@ -32,20 +32,13 @@ typedef struct auth_payload_t auth_payload_t;
 
 /**
  * Length of a auth payload without the auth data in bytes.
- * 
- * @ingroup payloads
  */
 #define AUTH_PAYLOAD_HEADER_LENGTH 8
 
 /**
- * @brief Class representing an IKEv2 AUTH payload.
+ * Class representing an IKEv2 AUTH payload.
  *
  * The AUTH payload format is described in RFC section 3.8.
- *
- * @b Constructors:
- * - auth_payload_create()
- *
- * @ingroup payloads
  */
 struct auth_payload_t {
 	
@@ -55,67 +48,57 @@ struct auth_payload_t {
 	payload_t payload_interface;
 
 	/**
-	 * @brief Set the AUTH method.
+	 * Set the AUTH method.
 	 *
-	 * @param this 			calling auth_payload_t object
 	 * @param method		auth_method_t to use
 	 */
 	void (*set_auth_method) (auth_payload_t *this, auth_method_t method);
 	
 	/**
-	 * @brief Get the AUTH method.
+	 * Get the AUTH method.
 	 *
-	 * @param this 			calling auth_payload_t object
 	 * @return				auth_method_t used
 	 */
 	auth_method_t (*get_auth_method) (auth_payload_t *this);
 	
 	/**
-	 * @brief Set the AUTH data.
+	 * Set the AUTH data.
 	 * 
-	 * Data are getting cloned.
+	 * Data gets cloned.
 	 *
-	 * @param this 			calling auth_payload_t object
 	 * @param data			AUTH data as chunk_t
 	 */
 	void (*set_data) (auth_payload_t *this, chunk_t data);
 	
 	/**
-	 * @brief Get the AUTH data.
+	 * Get the AUTH data.
 	 * 
 	 * Returned data are a copy of the internal one.
 	 *
-	 * @param this 			calling auth_payload_t object
 	 * @return				AUTH data as chunk_t
 	 */
 	chunk_t (*get_data_clone) (auth_payload_t *this);
 	
 	/**
-	 * @brief Get the AUTH data.
+	 * Get the AUTH data.
 	 * 
 	 * Returned data are NOT copied
 	 *
-	 * @param this 			calling auth_payload_t object
 	 * @return				AUTH data as chunk_t
 	 */
 	chunk_t (*get_data) (auth_payload_t *this);
 	
 	/**
-	 * @brief Destroys an auth_payload_t object.
-	 *
-	 * @param this 			auth_payload_t object to destroy
+	 * Destroys an auth_payload_t object.
 	 */
 	void (*destroy) (auth_payload_t *this);
 };
 
 /**
- * @brief Creates an empty auth_payload_t object.
+ * Creates an empty auth_payload_t object.
  * 
  * @return auth_payload_t object
- * 
- * @ingroup payloads
  */
 auth_payload_t *auth_payload_create(void);
 
-
-#endif /* AUTH_PAYLOAD_H_ */
+#endif /* AUTH_PAYLOAD_H_ @} */