Wrap lines to 80 columns

10 files changed, 54 insertions, 30 deletions

diff --git a/src/cert/x509/x509_ca.h b/src/cert/x509/x509_ca.h
index 1aba381bc..a9b6611d5 100644
--- a/src/cert/x509/x509_ca.h
+++ b/src/cert/x509/x509_ca.h
@@ -44,8 +44,8 @@ class BOTAN_DLL X509_CA
       /**
       * Create a new and empty CRL for this CA.
       * @param rng the random number generator to use
-      * @param next_update the time to set in next update in seconds as the offset from
-      * the current time
+      * @param next_update the time to set in next update in seconds
+      * as the offset from the current time
       * @return the new CRL
       */
       X509_CRL new_crl(RandomNumberGenerator& rng, u32bit = 0) const;
diff --git a/src/core/base.h b/src/core/base.h
index 3c569581f..b715ee59b 100644
--- a/src/core/base.h
+++ b/src/core/base.h
@@ -165,14 +165,17 @@ class BOTAN_DLL StreamCipher : public SymmetricAlgorithm
 
       /**
       * Encrypt a message.
-      * @param in the plaintext as input, after the function has returned it will hold the ciphertext
+      * @param in the plaintext as input, after the function has
+      * returned it will hold the ciphertext
+
       * @param len the length of in
       */
       void encrypt(byte in[], u32bit len) { cipher(in, in, len); }
 
       /**
       * Decrypt a message.
-      * @param in the ciphertext as input, after the function has returned it will hold the plaintext
+      * @param in the ciphertext as input, after the function has
+      * returned it will hold the plaintext
       * @param len the length of in
       */
       void decrypt(byte in[], u32bit len) { cipher(in, in, len); }
diff --git a/src/filters/basefilt.h b/src/filters/basefilt.h
index 975ed5ca0..004e076c4 100644
--- a/src/filters/basefilt.h
+++ b/src/filters/basefilt.h
@@ -22,8 +22,8 @@ class BOTAN_DLL Chain : public Fanout_Filter
       void write(const byte input[], u32bit length) { send(input, length); }
 
       /**
-      * Construct a chain of up to four filters. The filters are set up in the same order
-      * as the arguments.
+      * Construct a chain of up to four filters. The filters are set
+      * up in the same order as the arguments.
       */
       Chain(Filter* = 0, Filter* = 0, Filter* = 0, Filter* = 0);
 
diff --git a/src/filters/filters.h b/src/filters/filters.h
index 43c38ef2d..267a84f6a 100644
--- a/src/filters/filters.h
+++ b/src/filters/filters.h
@@ -118,7 +118,8 @@ class BOTAN_DLL MAC_Filter : public Keyed_Filter
       * MAC. Otherwise, specify a smaller value here so that the
       * output of the MAC will be cut off.
       */
-      MAC_Filter(const std::string& mac, const SymmetricKey& key, u32bit len = 0);
+      MAC_Filter(const std::string& mac, const SymmetricKey& key,
+                 u32bit len = 0);
 
       ~MAC_Filter() { delete mac; }
    private:
diff --git a/src/hash/sha2/sha2_64.h b/src/hash/sha2/sha2_64.h
index 004f8f165..9cd79ae1b 100644
--- a/src/hash/sha2/sha2_64.h
+++ b/src/hash/sha2/sha2_64.h
@@ -17,7 +17,10 @@ class BOTAN_DLL SHA_384_512_BASE : public MDx_HashFunction
    {
    protected:
       void clear() throw();
-      SHA_384_512_BASE(u32bit out) : MDx_HashFunction(out, 128, true, true, 16) {}
+
+      SHA_384_512_BASE(u32bit out) :
+         MDx_HashFunction(out, 128, true, true, 16) {}
+
       SecureBuffer<u64bit, 8> digest;
    private:
       void hash(const byte[]);
diff --git a/src/libstate/lookup.h b/src/libstate/lookup.h
index 75bfbccf3..1accc82e2 100644
--- a/src/libstate/lookup.h
+++ b/src/libstate/lookup.h
@@ -20,7 +20,8 @@ namespace Botan {
 /*************************************************
 * Retrieve an object from the lookup table       *
 *************************************************/
-// NOTE: these functions return internally stored objects, library retains ownership
+// NOTE: these functions return internally stored objects, library
+// retains ownership
 
 BOTAN_DLL const BlockCipher*
 retrieve_block_cipher(Library_State&, const std::string&);
@@ -42,7 +43,8 @@ retrieve_bc_pad(Library_State&, const std::string&);
 /*************************************************
 * Get an algorithm object                        *
 *************************************************/
-// NOTE: these functions create and return new objects, letting the caller assume ownership of them
+// NOTE: these functions create and return new objects, letting the
+// caller assume ownership of them
 
 /**
 * Block cipher factory method.
@@ -85,12 +87,14 @@ BOTAN_DLL S2K* get_s2k(const std::string& name);
 * @param name the name of the desired block cipher padding mode
 * @return the block cipher padding mode object
 */
-BOTAN_DLL const BlockCipherModePaddingMethod* get_bc_pad(const std::string& name);
+BOTAN_DLL const BlockCipherModePaddingMethod*
+   get_bc_pad(const std::string& name);
 
 /*************************************************
 * Get an EMSA/EME/KDF/MGF function               *
 *************************************************/
-// NOTE: these functions create and return new objects, letting the caller assume ownership of them
+// NOTE: these functions create and return new objects, letting the
+// caller assume ownership of them
 
 /**
 * Factory method for EME (message-encoding methods for encryption) objects
@@ -100,7 +104,8 @@ BOTAN_DLL const BlockCipherModePaddingMethod* get_bc_pad(const std::string& name
 BOTAN_DLL EME*  get_eme(const std::string& name);
 
 /**
-* Factory method for EMSA (message-encoding methods for signatures with appendix) objects
+* Factory method for EMSA (message-encoding methods for signatures
+* with appendix) objects
 * @param name the name of the EME to create
 * @return the desired EME object
 */
@@ -127,7 +132,8 @@ BOTAN_DLL KDF*  get_kdf(const std::string& name);
 /**
 * Factory method for general symmetric cipher filters.
 * @param name the name of the desired cipher
-* @param key the key to be used for encryption/decryption performed by the filter
+* @param key the key to be used for encryption/decryption performed by
+* the filter
 * @param iv the initialization vector to be used
 * @param dir determines whether the filter will be an encrypting or decrypting
 * filter
@@ -140,7 +146,8 @@ BOTAN_DLL Keyed_Filter* get_cipher(const std::string& name,
 /**
 * Factory method for general symmetric cipher filters.
 * @param name the name of the desired cipher
-* @param key the key to be used for encryption/decryption performed by the filter
+* @param key the key to be used for encryption/decryption performed by
+* the filter
 * @param dir determines whether the filter will be an encrypting or decrypting
 * filter
 * @return the encryption or decryption filter
@@ -152,7 +159,9 @@ BOTAN_DLL Keyed_Filter* get_cipher(const std::string& name,
 /** Factory method for general symmetric cipher filters. No key will
 * be set in the filter.
 * @param name the name of the desired cipher
-* @param dir determines whether the filter will be an encrypting or decrypting filter
+
+* @param dir determines whether the filter will be an encrypting or
+* decrypting filter
 * @return the encryption or decryption filter
 */
 BOTAN_DLL Keyed_Filter* get_cipher(const std::string& name, Cipher_Dir dir);
@@ -211,7 +220,8 @@ BOTAN_DLL u32bit block_size_of(const std::string& name);
 BOTAN_DLL u32bit output_length_of(const std::string& name);
 
 /**
-* Find out the whether a certain key length is allowd for a given symmetric algorithm.
+* Find out the whether a certain key length is allowd for a given
+* symmetric algorithm.
 * @param keylen the key length in question
 * @param name the name of the algorithm
 * @return true if the key length is valid for that algorithm, false otherwise
diff --git a/src/libstate/policy.cpp b/src/libstate/policy.cpp
index e411ed111..2aa5408e5 100644
--- a/src/libstate/policy.cpp
+++ b/src/libstate/policy.cpp
@@ -181,7 +181,8 @@ void set_default_oids(Library_State& config)
    add_oid(config, "1.3.6.1.5.5.7.8.5", "PKIX.XMPPAddr");
 
    /* CVC */
-   add_oid(config, "0.4.0.127.0.7.3.1.2.1", "CertificateHolderAuthorizationTemplate");
+   add_oid(config, "0.4.0.127.0.7.3.1.2.1",
+           "CertificateHolderAuthorizationTemplate");
    }
 
 /*************************************************
diff --git a/src/math/bigint/bigint.h b/src/math/bigint/bigint.h
index ec3c1cbe3..087f0e25a 100644
--- a/src/math/bigint/bigint.h
+++ b/src/math/bigint/bigint.h
@@ -215,7 +215,8 @@ class BOTAN_DLL BigInt
        * Return (a maximum of) 32 bits of the complete value
        * @param offset the offset to start extracting
        * @param length amount of bits to extract (starting at offset)
-       * @result the integer extracted from the register starting at offset with specified length
+       * @result the integer extracted from the register starting at
+       * offset with specified length
        */
       u32bit get_substring(u32bit offset, u32bit length) const;
 
@@ -230,9 +231,9 @@ class BOTAN_DLL BigInt
          { return ((n < size()) ? reg[n] : 0); }
 
       /**
-       * Return the integer as an unsigned 32bit-integer-value.
-       * If the value is negative OR to big to be stored in 32bits, this function
-       * will throw an exception.
+       * Return the integer as an unsigned 32bit-integer-value. If the
+       * value is negative OR to big to be stored in 32bits, this
+       * function will throw an exception.
        * @result a 32bit-integer
        */
       u32bit to_u32bit() const;
diff --git a/src/pubkey/pubkey/pk_keys.h b/src/pubkey/pubkey/pk_keys.h
index 4bd70cf16..0b5994508 100644
--- a/src/pubkey/pubkey/pk_keys.h
+++ b/src/pubkey/pubkey/pk_keys.h
@@ -83,7 +83,8 @@ class BOTAN_DLL Private_Key : public virtual Public_Key
    {
    public:
       /**
-      * Get a PKCS#8 encoder that can be used to encode this key in PKCS#8 format.
+      * Get a PKCS#8 encoder that can be used to encode this key in
+      * PKCS#8 format.
       * @return an PKCS#8 encoder for this key
       */
       virtual class PKCS8_Encoder* pkcs8_encoder() const
diff --git a/src/pubkey/pubkey/x509_key.h b/src/pubkey/pubkey/x509_key.h
index 9cf6d5d67..b407342e6 100644
--- a/src/pubkey/pubkey/x509_key.h
+++ b/src/pubkey/pubkey/x509_key.h
@@ -50,7 +50,8 @@ namespace X509 {
 * @param pipe the pipe to feed the encoded key into
 * @param enc the encoding type to use
 */
-BOTAN_DLL void encode(const Public_Key& key, Pipe& pipe, X509_Encoding enc = PEM);
+BOTAN_DLL void encode(const Public_Key& key, Pipe& pipe,
+                      X509_Encoding enc = PEM);
 
 /**
 * PEM encode a public key into a string.
@@ -89,13 +90,16 @@ BOTAN_DLL Public_Key* copy_key(const Public_Key& key);
 
 /**
 * Create the key constraints for a specific public key.
-* @param pub_key the public key from which the basic set of constraints
-* to be placed in the return value is
-* derived
-* @param limits additional limits that will be incorporated into the return value
-* @return the combination of key type specific constraints and additional limits
+* @param pub_key the public key from which the basic set of
+* constraints to be placed in the return value is derived
+* @param limits additional limits that will be incorporated into the
+* return value
+* @return the combination of key type specific constraints and
+* additional limits
 */
-BOTAN_DLL Key_Constraints find_constraints(const Public_Key& pub_key, Key_Constraints limits);
+
+BOTAN_DLL Key_Constraints find_constraints(const Public_Key& pub_key,
+                                           Key_Constraints limits);
 
 }