propagate from branch 'net.randombit.botan' (head 294e2082ce9231d6165276e2f2a4153a0116aca3)

            to branch 'net.randombit.botan.c++0x' (head 0b695fad10f924601e07b009fcd781191fafcb28)

6 files changed, 22 insertions, 19 deletions

diff --git a/src/asn1/alg_id.h b/src/asn1/alg_id.h
index 4a1ad2f30..417a71b30 100644
--- a/src/asn1/alg_id.h
+++ b/src/asn1/alg_id.h
@@ -14,7 +14,7 @@
 
 namespace Botan {
 
-/*
+/**
 * Algorithm Identifier
 */
 class BOTAN_DLL AlgorithmIdentifier : public ASN1_Object
diff --git a/src/asn1/asn1_int.h b/src/asn1/asn1_int.h
index e6fb09398..3562f692b 100644
--- a/src/asn1/asn1_int.h
+++ b/src/asn1/asn1_int.h
@@ -13,7 +13,7 @@
 
 namespace Botan {
 
-/*
+/**
 * ASN.1 Type and Class Tags
 */
 enum ASN1_Tag {
@@ -50,7 +50,7 @@ enum ASN1_Tag {
    DIRECTORY_STRING = 0xFF01
 };
 
-/*
+/**
 * Basic ASN.1 Object Interface
 */
 class BOTAN_DLL ASN1_Object
@@ -61,7 +61,7 @@ class BOTAN_DLL ASN1_Object
       virtual ~ASN1_Object() {}
    };
 
-/*
+/**
 * BER Encoded Object
 */
 class BOTAN_DLL BER_Object
@@ -86,7 +86,7 @@ bool maybe_BER(DataSource&);
 
 }
 
-/*
+/**
 * General BER Decoding Error Exception
 */
 struct BOTAN_DLL BER_Decoding_Error : public Decoding_Error
@@ -94,7 +94,7 @@ struct BOTAN_DLL BER_Decoding_Error : public Decoding_Error
    BER_Decoding_Error(const std::string&);
    };
 
-/*
+/**
 * Exception For Incorrect BER Taggings
 */
 struct BOTAN_DLL BER_Bad_Tag : public BER_Decoding_Error
diff --git a/src/asn1/asn1_obj.h b/src/asn1/asn1_obj.h
index a640f712b..c0b74ea0e 100644
--- a/src/asn1/asn1_obj.h
+++ b/src/asn1/asn1_obj.h
@@ -18,7 +18,7 @@
 
 namespace Botan {
 
-/*
+/**
 * Attribute
 */
 class BOTAN_DLL Attribute : public ASN1_Object
@@ -35,7 +35,7 @@ class BOTAN_DLL Attribute : public ASN1_Object
       Attribute(const std::string&, const MemoryRegion<byte>&);
    };
 
-/*
+/**
 * X.509 Time
 */
 class BOTAN_DLL X509_Time : public ASN1_Object
@@ -62,7 +62,7 @@ class BOTAN_DLL X509_Time : public ASN1_Object
       ASN1_Tag tag;
    };
 
-/*
+/**
 * Simple String
 */
 class BOTAN_DLL ASN1_String : public ASN1_Object
@@ -83,7 +83,7 @@ class BOTAN_DLL ASN1_String : public ASN1_Object
       ASN1_Tag tag;
    };
 
-/*
+/**
 * Distinguished Name
 */
 class BOTAN_DLL X509_DN : public ASN1_Object
@@ -113,7 +113,7 @@ class BOTAN_DLL X509_DN : public ASN1_Object
       MemoryVector<byte> dn_bits;
    };
 
-/*
+/**
 * Alternative Name
 */
 class BOTAN_DLL AlternativeName : public ASN1_Object
diff --git a/src/asn1/asn1_oid.h b/src/asn1/asn1_oid.h
index e6d077bee..b3db97744 100644
--- a/src/asn1/asn1_oid.h
+++ b/src/asn1/asn1_oid.h
@@ -31,13 +31,13 @@ class BOTAN_DLL OID : public ASN1_Object
 
       /**
       * Get this OID as list (vector) of its components.
-      * @return a vector representing this OID
+      * @return vector representing this OID
       */
       std::vector<u32bit> get_id() const { return id; }
 
       /**
       * Get this OID as a string
-      * @return a string representing this OID
+      * @return string representing this OID
       */
       std::string as_string() const;
 
@@ -55,7 +55,7 @@ class BOTAN_DLL OID : public ASN1_Object
       /**
       * Add a component to this OID.
       * @param new_comp the new component to add to the end of this OID
-      * @return a reference to *this
+      * @return reference to *this
       */
       OID& operator+=(u32bit new_comp);
 
diff --git a/src/asn1/ber_dec.h b/src/asn1/ber_dec.h
index 359b2e7dd..296d11037 100644
--- a/src/asn1/ber_dec.h
+++ b/src/asn1/ber_dec.h
@@ -13,7 +13,7 @@
 
 namespace Botan {
 
-/*
+/**
 * BER Decoding Object
 */
 class BOTAN_DLL BER_Decoder
diff --git a/src/asn1/der_enc.h b/src/asn1/der_enc.h
index 23b5297e5..ae10b4bc8 100644
--- a/src/asn1/der_enc.h
+++ b/src/asn1/der_enc.h
@@ -13,7 +13,10 @@
 
 namespace Botan {
 
-/*
+class BigInt;
+class ASN1_Object;
+
+/**
 * General DER Encoding Object
 */
 class BOTAN_DLL DER_Encoder
@@ -33,13 +36,13 @@ class BOTAN_DLL DER_Encoder
       DER_Encoder& encode_null();
       DER_Encoder& encode(bool);
       DER_Encoder& encode(u32bit);
-      DER_Encoder& encode(const class BigInt&);
+      DER_Encoder& encode(const BigInt&);
       DER_Encoder& encode(const MemoryRegion<byte>&, ASN1_Tag);
       DER_Encoder& encode(const byte[], u32bit, ASN1_Tag);
 
       DER_Encoder& encode(bool, ASN1_Tag, ASN1_Tag = CONTEXT_SPECIFIC);
       DER_Encoder& encode(u32bit, ASN1_Tag, ASN1_Tag = CONTEXT_SPECIFIC);
-      DER_Encoder& encode(const class BigInt&, ASN1_Tag,
+      DER_Encoder& encode(const BigInt&, ASN1_Tag,
                           ASN1_Tag = CONTEXT_SPECIFIC);
       DER_Encoder& encode(const MemoryRegion<byte>&, ASN1_Tag,
                           ASN1_Tag, ASN1_Tag = CONTEXT_SPECIFIC);
@@ -62,7 +65,7 @@ class BOTAN_DLL DER_Encoder
          return (*this);
          }
 
-      DER_Encoder& encode(const class ASN1_Object&);
+      DER_Encoder& encode(const ASN1_Object&);
       DER_Encoder& encode_if(bool, DER_Encoder&);
 
       DER_Encoder& add_object(ASN1_Tag, ASN1_Tag, const byte[], u32bit);