propagate from branch 'net.randombit.botan.1_8' (head c5ae189464f6ef16e3ce73ea7c563412460d76a3)

            to branch 'net.randombit.botan' (head e2b95b6ad31c7539cf9ac0ebddb1d80bf63b5b21)

1 files changed, 23 insertions, 24 deletions

diff --git a/src/math/gfpmath/gfp_modulus.h b/src/math/gfpmath/gfp_modulus.h
index b5c085775..8e37e9a73 100644
--- a/src/math/gfpmath/gfp_modulus.h
+++ b/src/math/gfpmath/gfp_modulus.h
@@ -1,39 +1,33 @@
-/******
- * Modulus and related data for a specific
- * implementation of  GF(p) (header file)
- *
- * (C) 2008 Martin Döring
- *          [email protected]
- *          Christoph Ludwig
- *          [email protected]
- *          Falko Strenzke
- *          [email protected]
- ******/
+/*
+* Modulus and related data for a specific implementation of GF(p)
+*
+* (C) 2008 Martin Döring
+*          <[email protected]>
+*          Christoph Ludwig
+*          <[email protected]>
+*          Falko Strenzke
+*          <[email protected]>
+*
+* Distributed under the terms of the Botan license
+*/
 
 #ifndef BOTAN_GFP_MODULUS_H__
 #define BOTAN_GFP_MODULUS_H__
 
 #include <botan/bigint.h>
 
-namespace Botan
-{
+namespace Botan {
 
 class BOTAN_DLL GFpElement;
+
 /**
-* This class represents a GFpElement modulus including the modulus related
-* values necessary for the montgomery multiplication.
-*
-* Distributed under the terms of the Botan license
+* This class represents a GFpElement modulus including the modulus
+* related values necessary for the montgomery multiplication.
 */
 class BOTAN_DLL GFpModulus
    {
-      friend class GFpElement;
-   private:
-      BigInt m_p; // the modulus itself
-      mutable BigInt m_p_dash;
-      mutable BigInt m_r;
-      mutable BigInt m_r_inv;
    public:
+      friend class GFpElement;
 
       /**
       * Construct a GF(P)-Modulus from a BigInt
@@ -119,9 +113,14 @@ class BOTAN_DLL GFpModulus
          return m_p_dash;
          }
       // default cp-ctor, op= are fine
+
+   private:
+      BigInt m_p; // the modulus itself
+      mutable BigInt m_p_dash;
+      mutable BigInt m_r;
+      mutable BigInt m_r_inv;
    };
 
 }
 
 #endif
-