knfectomie.

1 files changed, 818 insertions, 653 deletions

diff --git a/lib/libcrypto/bn/bn_nist.c b/lib/libcrypto/bn/bn_nist.c
index d793644e272..d44e709c835 100644
--- a/lib/libcrypto/bn/bn_nist.c
+++ b/lib/libcrypto/bn/bn_nist.c
@@ -10,7 +10,7 @@
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
+ *    notice, this list of conditions and the following disclaimer.
  *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
@@ -71,225 +71,292 @@
 /* pre-computed tables are "carry-less" values of modulus*(i+1) */
 #if BN_BITS2 == 64
 static const BN_ULONG _nist_p_192[][BN_NIST_192_TOP] = {
-	{0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFEULL,0xFFFFFFFFFFFFFFFFULL},
-	{0xFFFFFFFFFFFFFFFEULL,0xFFFFFFFFFFFFFFFDULL,0xFFFFFFFFFFFFFFFFULL},
-	{0xFFFFFFFFFFFFFFFDULL,0xFFFFFFFFFFFFFFFCULL,0xFFFFFFFFFFFFFFFFULL}
-	};
+	{0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFEULL, 0xFFFFFFFFFFFFFFFFULL},
+	{0xFFFFFFFFFFFFFFFEULL, 0xFFFFFFFFFFFFFFFDULL, 0xFFFFFFFFFFFFFFFFULL},
+	{0xFFFFFFFFFFFFFFFDULL, 0xFFFFFFFFFFFFFFFCULL, 0xFFFFFFFFFFFFFFFFULL}
+};
 static const BN_ULONG _nist_p_192_sqr[] = {
-	0x0000000000000001ULL,0x0000000000000002ULL,0x0000000000000001ULL,
-	0xFFFFFFFFFFFFFFFEULL,0xFFFFFFFFFFFFFFFDULL,0xFFFFFFFFFFFFFFFFULL
-	};
+	0x0000000000000001ULL, 0x0000000000000002ULL, 0x0000000000000001ULL,
+	0xFFFFFFFFFFFFFFFEULL, 0xFFFFFFFFFFFFFFFDULL, 0xFFFFFFFFFFFFFFFFULL
+};
 static const BN_ULONG _nist_p_224[][BN_NIST_224_TOP] = {
-	{0x0000000000000001ULL,0xFFFFFFFF00000000ULL,
-	 0xFFFFFFFFFFFFFFFFULL,0x00000000FFFFFFFFULL},
-	{0x0000000000000002ULL,0xFFFFFFFE00000000ULL,
-	 0xFFFFFFFFFFFFFFFFULL,0x00000001FFFFFFFFULL} /* this one is "carry-full" */
-	};
+	{
+		0x0000000000000001ULL, 0xFFFFFFFF00000000ULL,
+		0xFFFFFFFFFFFFFFFFULL, 0x00000000FFFFFFFFULL
+	},
+	{
+		0x0000000000000002ULL, 0xFFFFFFFE00000000ULL,
+		0xFFFFFFFFFFFFFFFFULL, 0x00000001FFFFFFFFULL
+	} /* this one is "carry-full" */
+};
 static const BN_ULONG _nist_p_224_sqr[] = {
-	0x0000000000000001ULL,0xFFFFFFFE00000000ULL,
-	0xFFFFFFFFFFFFFFFFULL,0x0000000200000000ULL,
-	0x0000000000000000ULL,0xFFFFFFFFFFFFFFFEULL,
+	0x0000000000000001ULL, 0xFFFFFFFE00000000ULL,
+	0xFFFFFFFFFFFFFFFFULL, 0x0000000200000000ULL,
+	0x0000000000000000ULL, 0xFFFFFFFFFFFFFFFEULL,
 	0xFFFFFFFFFFFFFFFFULL
-	};
+};
 static const BN_ULONG _nist_p_256[][BN_NIST_256_TOP] = {
-	{0xFFFFFFFFFFFFFFFFULL,0x00000000FFFFFFFFULL,
-	 0x0000000000000000ULL,0xFFFFFFFF00000001ULL},
-	{0xFFFFFFFFFFFFFFFEULL,0x00000001FFFFFFFFULL,
-	 0x0000000000000000ULL,0xFFFFFFFE00000002ULL},
-	{0xFFFFFFFFFFFFFFFDULL,0x00000002FFFFFFFFULL,
-	 0x0000000000000000ULL,0xFFFFFFFD00000003ULL},
-	{0xFFFFFFFFFFFFFFFCULL,0x00000003FFFFFFFFULL,
-	 0x0000000000000000ULL,0xFFFFFFFC00000004ULL},
-	{0xFFFFFFFFFFFFFFFBULL,0x00000004FFFFFFFFULL,
-	 0x0000000000000000ULL,0xFFFFFFFB00000005ULL},
-	};
+	{
+		0xFFFFFFFFFFFFFFFFULL, 0x00000000FFFFFFFFULL,
+		0x0000000000000000ULL, 0xFFFFFFFF00000001ULL
+	},
+	{
+		0xFFFFFFFFFFFFFFFEULL, 0x00000001FFFFFFFFULL,
+		0x0000000000000000ULL, 0xFFFFFFFE00000002ULL
+	},
+	{
+		0xFFFFFFFFFFFFFFFDULL, 0x00000002FFFFFFFFULL,
+		0x0000000000000000ULL, 0xFFFFFFFD00000003ULL
+	},
+	{
+		0xFFFFFFFFFFFFFFFCULL, 0x00000003FFFFFFFFULL,
+		0x0000000000000000ULL, 0xFFFFFFFC00000004ULL
+	},
+	{
+		0xFFFFFFFFFFFFFFFBULL, 0x00000004FFFFFFFFULL,
+		0x0000000000000000ULL, 0xFFFFFFFB00000005ULL
+	},
+};
 static const BN_ULONG _nist_p_256_sqr[] = {
-	0x0000000000000001ULL,0xFFFFFFFE00000000ULL,
-	0xFFFFFFFFFFFFFFFFULL,0x00000001FFFFFFFEULL,
-	0x00000001FFFFFFFEULL,0x00000001FFFFFFFEULL,
-	0xFFFFFFFE00000001ULL,0xFFFFFFFE00000002ULL
-	};
+	0x0000000000000001ULL, 0xFFFFFFFE00000000ULL,
+	0xFFFFFFFFFFFFFFFFULL, 0x00000001FFFFFFFEULL,
+	0x00000001FFFFFFFEULL, 0x00000001FFFFFFFEULL,
+	0xFFFFFFFE00000001ULL, 0xFFFFFFFE00000002ULL
+};
 static const BN_ULONG _nist_p_384[][BN_NIST_384_TOP] = {
-	{0x00000000FFFFFFFFULL,0xFFFFFFFF00000000ULL,0xFFFFFFFFFFFFFFFEULL,
-	 0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL},
-	{0x00000001FFFFFFFEULL,0xFFFFFFFE00000000ULL,0xFFFFFFFFFFFFFFFDULL,
-	 0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL},
-	{0x00000002FFFFFFFDULL,0xFFFFFFFD00000000ULL,0xFFFFFFFFFFFFFFFCULL,
-	 0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL},
-	{0x00000003FFFFFFFCULL,0xFFFFFFFC00000000ULL,0xFFFFFFFFFFFFFFFBULL,
-	 0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL},
-	{0x00000004FFFFFFFBULL,0xFFFFFFFB00000000ULL,0xFFFFFFFFFFFFFFFAULL,
-	 0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL},
-	};
+	{
+		0x00000000FFFFFFFFULL, 0xFFFFFFFF00000000ULL,
+		0xFFFFFFFFFFFFFFFEULL, 0xFFFFFFFFFFFFFFFFULL,
+		0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL
+	},
+	{
+		0x00000001FFFFFFFEULL, 0xFFFFFFFE00000000ULL,
+		0xFFFFFFFFFFFFFFFDULL, 0xFFFFFFFFFFFFFFFFULL,
+		0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL
+	},
+	{
+		0x00000002FFFFFFFDULL, 0xFFFFFFFD00000000ULL,
+		0xFFFFFFFFFFFFFFFCULL, 0xFFFFFFFFFFFFFFFFULL,
+		0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL
+	},
+	{
+		0x00000003FFFFFFFCULL, 0xFFFFFFFC00000000ULL,
+		0xFFFFFFFFFFFFFFFBULL, 0xFFFFFFFFFFFFFFFFULL,
+		0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL
+	},
+	{
+		0x00000004FFFFFFFBULL, 0xFFFFFFFB00000000ULL,
+		0xFFFFFFFFFFFFFFFAULL, 0xFFFFFFFFFFFFFFFFULL,
+		0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL
+	},
+};
 static const BN_ULONG _nist_p_384_sqr[] = {
-	0xFFFFFFFE00000001ULL,0x0000000200000000ULL,0xFFFFFFFE00000000ULL,
-	0x0000000200000000ULL,0x0000000000000001ULL,0x0000000000000000ULL,
-	0x00000001FFFFFFFEULL,0xFFFFFFFE00000000ULL,0xFFFFFFFFFFFFFFFDULL,
-	0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL
-	};
-static const BN_ULONG _nist_p_521[] =
-	{0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL,
-	0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL,
-	0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL,
-	0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL,
-	0x00000000000001FFULL};
+	0xFFFFFFFE00000001ULL, 0x0000000200000000ULL, 0xFFFFFFFE00000000ULL,
+	0x0000000200000000ULL, 0x0000000000000001ULL, 0x0000000000000000ULL,
+	0x00000001FFFFFFFEULL, 0xFFFFFFFE00000000ULL, 0xFFFFFFFFFFFFFFFDULL,
+	0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL
+};
+static const BN_ULONG _nist_p_521[] = {
+	0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL,
+	0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL,
+	0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL, 0x00000000000001FFULL
+};
 static const BN_ULONG _nist_p_521_sqr[] = {
-	0x0000000000000001ULL,0x0000000000000000ULL,0x0000000000000000ULL,
-	0x0000000000000000ULL,0x0000000000000000ULL,0x0000000000000000ULL,
-	0x0000000000000000ULL,0x0000000000000000ULL,0xFFFFFFFFFFFFFC00ULL,
-	0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL,
-	0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL,
-	0xFFFFFFFFFFFFFFFFULL,0x000000000003FFFFULL
-	};
+	0x0000000000000001ULL, 0x0000000000000000ULL, 0x0000000000000000ULL,
+	0x0000000000000000ULL, 0x0000000000000000ULL, 0x0000000000000000ULL,
+	0x0000000000000000ULL, 0x0000000000000000ULL, 0xFFFFFFFFFFFFFC00ULL,
+	0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL,
+	0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL,
+	0xFFFFFFFFFFFFFFFFULL, 0x000000000003FFFFULL
+};
 #elif BN_BITS2 == 32
 static const BN_ULONG _nist_p_192[][BN_NIST_192_TOP] = {
-	{0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFE,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF},
-	{0xFFFFFFFE,0xFFFFFFFF,0xFFFFFFFD,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF},
-	{0xFFFFFFFD,0xFFFFFFFF,0xFFFFFFFC,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF}
-	};
+	{
+		0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFE, 0xFFFFFFFF,
+		0xFFFFFFFF, 0xFFFFFFFF
+	},
+	{
+		0xFFFFFFFE, 0xFFFFFFFF, 0xFFFFFFFD, 0xFFFFFFFF,
+		0xFFFFFFFF, 0xFFFFFFFF
+	},
+	{
+		0xFFFFFFFD, 0xFFFFFFFF, 0xFFFFFFFC, 0xFFFFFFFF,
+		0xFFFFFFFF, 0xFFFFFFFF
+	}
+};
 static const BN_ULONG _nist_p_192_sqr[] = {
-	0x00000001,0x00000000,0x00000002,0x00000000,0x00000001,0x00000000,
-	0xFFFFFFFE,0xFFFFFFFF,0xFFFFFFFD,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF
-	};
+	0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000,
+	0xFFFFFFFE, 0xFFFFFFFF, 0xFFFFFFFD, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF
+};
 static const BN_ULONG _nist_p_224[][BN_NIST_224_TOP] = {
-	{0x00000001,0x00000000,0x00000000,0xFFFFFFFF,
-	 0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF},
-	{0x00000002,0x00000000,0x00000000,0xFFFFFFFE,
-	 0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF}
-	};
+	{
+		0x00000001, 0x00000000, 0x00000000, 0xFFFFFFFF,
+		0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF
+	},
+	{
+		0x00000002, 0x00000000, 0x00000000, 0xFFFFFFFE,
+		0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF
+	}
+};
 static const BN_ULONG _nist_p_224_sqr[] = {
-	0x00000001,0x00000000,0x00000000,0xFFFFFFFE,
-	0xFFFFFFFF,0xFFFFFFFF,0x00000000,0x00000002,
-	0x00000000,0x00000000,0xFFFFFFFE,0xFFFFFFFF,
-	0xFFFFFFFF,0xFFFFFFFF
-	};
+	0x00000001, 0x00000000, 0x00000000, 0xFFFFFFFE,
+	0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00000002,
+	0x00000000, 0x00000000, 0xFFFFFFFE, 0xFFFFFFFF,
+	0xFFFFFFFF, 0xFFFFFFFF
+};
 static const BN_ULONG _nist_p_256[][BN_NIST_256_TOP] = {
-	{0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0x00000000,
-	 0x00000000,0x00000000,0x00000001,0xFFFFFFFF},
-	{0xFFFFFFFE,0xFFFFFFFF,0xFFFFFFFF,0x00000001,
-	 0x00000000,0x00000000,0x00000002,0xFFFFFFFE},
-	{0xFFFFFFFD,0xFFFFFFFF,0xFFFFFFFF,0x00000002,
-	 0x00000000,0x00000000,0x00000003,0xFFFFFFFD},
-	{0xFFFFFFFC,0xFFFFFFFF,0xFFFFFFFF,0x00000003,
-	 0x00000000,0x00000000,0x00000004,0xFFFFFFFC},
-	{0xFFFFFFFB,0xFFFFFFFF,0xFFFFFFFF,0x00000004,
-	 0x00000000,0x00000000,0x00000005,0xFFFFFFFB},
-	};
+	{
+		0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000,
+		0x00000000, 0x00000000, 0x00000001, 0xFFFFFFFF
+	},
+	{
+		0xFFFFFFFE, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000001,
+		0x00000000, 0x00000000, 0x00000002, 0xFFFFFFFE
+	},
+	{
+		0xFFFFFFFD, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000002,
+		0x00000000, 0x00000000, 0x00000003, 0xFFFFFFFD
+	},
+	{
+		0xFFFFFFFC, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000003,
+		0x00000000, 0x00000000, 0x00000004, 0xFFFFFFFC
+	},
+	{
+		0xFFFFFFFB, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000004,
+		0x00000000, 0x00000000, 0x00000005, 0xFFFFFFFB
+	},
+};
 static const BN_ULONG _nist_p_256_sqr[] = {
-	0x00000001,0x00000000,0x00000000,0xFFFFFFFE,
-	0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFE,0x00000001,
-	0xFFFFFFFE,0x00000001,0xFFFFFFFE,0x00000001,
-	0x00000001,0xFFFFFFFE,0x00000002,0xFFFFFFFE
-	};
+	0x00000001, 0x00000000, 0x00000000, 0xFFFFFFFE,
+	0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFE, 0x00000001,
+	0xFFFFFFFE, 0x00000001, 0xFFFFFFFE, 0x00000001,
+	0x00000001, 0xFFFFFFFE, 0x00000002, 0xFFFFFFFE
+};
 static const BN_ULONG _nist_p_384[][BN_NIST_384_TOP] = {
-	{0xFFFFFFFF,0x00000000,0x00000000,0xFFFFFFFF,0xFFFFFFFE,0xFFFFFFFF,
-	 0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF},
-	{0xFFFFFFFE,0x00000001,0x00000000,0xFFFFFFFE,0xFFFFFFFD,0xFFFFFFFF,
-	 0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF},
-	{0xFFFFFFFD,0x00000002,0x00000000,0xFFFFFFFD,0xFFFFFFFC,0xFFFFFFFF,
-	 0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF},
-	{0xFFFFFFFC,0x00000003,0x00000000,0xFFFFFFFC,0xFFFFFFFB,0xFFFFFFFF,
-	 0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF},
-	{0xFFFFFFFB,0x00000004,0x00000000,0xFFFFFFFB,0xFFFFFFFA,0xFFFFFFFF,
-	 0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF},
-	};
+	{
+		0xFFFFFFFF, 0x00000000, 0x00000000, 0xFFFFFFFF,
+		0xFFFFFFFE, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
+		0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF
+	},
+	{
+		0xFFFFFFFE, 0x00000001, 0x00000000, 0xFFFFFFFE,
+		0xFFFFFFFD, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
+		0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF
+	},
+	{
+		0xFFFFFFFD, 0x00000002, 0x00000000, 0xFFFFFFFD,
+		0xFFFFFFFC, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
+		0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF
+	},
+	{
+		0xFFFFFFFC, 0x00000003, 0x00000000, 0xFFFFFFFC,
+		0xFFFFFFFB, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
+		0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF
+	},
+	{
+		0xFFFFFFFB, 0x00000004, 0x00000000, 0xFFFFFFFB,
+		0xFFFFFFFA, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
+		0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF
+	},
+};
 static const BN_ULONG _nist_p_384_sqr[] = {
-	0x00000001,0xFFFFFFFE,0x00000000,0x00000002,0x00000000,0xFFFFFFFE,
-	0x00000000,0x00000002,0x00000001,0x00000000,0x00000000,0x00000000,
-	0xFFFFFFFE,0x00000001,0x00000000,0xFFFFFFFE,0xFFFFFFFD,0xFFFFFFFF,
-	0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF
-	};
-static const BN_ULONG _nist_p_521[] = {0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,
-	0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,
-	0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,
-	0xFFFFFFFF,0x000001FF};
+	0x00000001, 0xFFFFFFFE, 0x00000000, 0x00000002, 0x00000000, 0xFFFFFFFE,
+	0x00000000, 0x00000002, 0x00000001, 0x00000000, 0x00000000, 0x00000000,
+	0xFFFFFFFE, 0x00000001, 0x00000000, 0xFFFFFFFE, 0xFFFFFFFD, 0xFFFFFFFF,
+	0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF
+};
+static const BN_ULONG _nist_p_521[] = {
+	0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
+	0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
+	0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
+	0xFFFFFFFF, 0x000001FF
+};
 static const BN_ULONG _nist_p_521_sqr[] = {
-	0x00000001,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,
-	0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,
-	0x00000000,0x00000000,0x00000000,0x00000000,0xFFFFFC00,0xFFFFFFFF,
-	0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,
-	0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,
-	0xFFFFFFFF,0xFFFFFFFF,0x0003FFFF
-	};
+	0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFC00, 0xFFFFFFFF,
+	0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
+	0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
+	0xFFFFFFFF, 0xFFFFFFFF, 0x0003FFFF
+};
 #else
 #error "unsupported BN_BITS2"
 #endif
 
-
-static const BIGNUM _bignum_nist_p_192 =
-	{
+static const BIGNUM _bignum_nist_p_192 = {
 	(BN_ULONG *)_nist_p_192[0],
 	BN_NIST_192_TOP,
 	BN_NIST_192_TOP,
 	0,
 	BN_FLG_STATIC_DATA
-	};
+};
 
-static const BIGNUM _bignum_nist_p_224 =
-	{
+static const BIGNUM _bignum_nist_p_224 = {
 	(BN_ULONG *)_nist_p_224[0],
 	BN_NIST_224_TOP,
 	BN_NIST_224_TOP,
 	0,
 	BN_FLG_STATIC_DATA
-	};
+};
 
-static const BIGNUM _bignum_nist_p_256 =
-	{
+static const BIGNUM _bignum_nist_p_256 = {
 	(BN_ULONG *)_nist_p_256[0],
 	BN_NIST_256_TOP,
 	BN_NIST_256_TOP,
 	0,
 	BN_FLG_STATIC_DATA
-	};
+};
 
-static const BIGNUM _bignum_nist_p_384 =
-	{
+static const BIGNUM _bignum_nist_p_384 = {
 	(BN_ULONG *)_nist_p_384[0],
 	BN_NIST_384_TOP,
 	BN_NIST_384_TOP,
 	0,
 	BN_FLG_STATIC_DATA
-	};
+};
 
-static const BIGNUM _bignum_nist_p_521 =
-	{
+static const BIGNUM _bignum_nist_p_521 = {
 	(BN_ULONG *)_nist_p_521,
 	BN_NIST_521_TOP,
 	BN_NIST_521_TOP,
 	0,
 	BN_FLG_STATIC_DATA
-	};
+};
 
 
-const BIGNUM *BN_get0_nist_prime_192(void)
-	{
+const BIGNUM *
+BN_get0_nist_prime_192(void)
+{
 	return &_bignum_nist_p_192;
-	}
+}
 
-const BIGNUM *BN_get0_nist_prime_224(void)
-	{
+const BIGNUM *
+BN_get0_nist_prime_224(void)
+{
 	return &_bignum_nist_p_224;
-	}
+}
 
-const BIGNUM *BN_get0_nist_prime_256(void)
-	{
+const BIGNUM *
+BN_get0_nist_prime_256(void)
+{
 	return &_bignum_nist_p_256;
-	}
+}
 
-const BIGNUM *BN_get0_nist_prime_384(void)
-	{
+const BIGNUM *
+BN_get0_nist_prime_384(void)
+{
 	return &_bignum_nist_p_384;
-	}
+}
 
-const BIGNUM *BN_get0_nist_prime_521(void)
-	{
+const BIGNUM *
+BN_get0_nist_prime_521(void)
+{
 	return &_bignum_nist_p_521;
-	}
+}
 
-
-static void nist_cp_bn_0(BN_ULONG *dst, const BN_ULONG *src, int top, int max)
-	{
+static void
+nist_cp_bn_0(BN_ULONG *dst, const BN_ULONG *src, int top, int max)
+{
 	int i;
 
 #ifdef BN_DEBUG
@@ -299,15 +366,15 @@ static void nist_cp_bn_0(BN_ULONG *dst, const BN_ULONG *src, int top, int max)
 		dst[i] = src[i];
 	for (; i < max; i++)
 		dst[i] = 0;
-	}
+}
 
 static void nist_cp_bn(BN_ULONG *dst, const BN_ULONG *src, int top)
-	{ 
+{
 	int i;
 
 	for (i = 0; i < top; i++)
 		dst[i] = src[i];
-	}
+}
 
 #if BN_BITS2 == 64
 #define bn_cp_64(to, n, from, m)	(to)[n] = (m>=0)?((from)[m]):0;
@@ -352,93 +419,110 @@ static void nist_cp_bn(BN_ULONG *dst, const BN_ULONG *src, int top)
 	bn_cp_64(to, 2, from, (a1) - 3) \
 	}
 
-int BN_nist_mod_192(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
-	BN_CTX *ctx)
-	{
-	int      top = a->top, i;
-	int      carry;
+int
+BN_nist_mod_192(BIGNUM *r, const BIGNUM *a, const BIGNUM *field, BN_CTX *ctx)
+{
+	int top = a->top, i;
+	int carry;
 	register BN_ULONG *r_d, *a_d = a->d;
-	union	{
-		BN_ULONG	bn[BN_NIST_192_TOP];
-		unsigned int	ui[BN_NIST_192_TOP*sizeof(BN_ULONG)/sizeof(unsigned int)];
-		} buf;
-	BN_ULONG c_d[BN_NIST_192_TOP],
-		*res;
+	union {
+		BN_ULONG bn[BN_NIST_192_TOP];
+		unsigned int ui[BN_NIST_192_TOP *
+		    sizeof(BN_ULONG) / sizeof(unsigned int)];
+	} buf;
+	BN_ULONG c_d[BN_NIST_192_TOP], *res;
 	uintptr_t mask;
 	static const BIGNUM _bignum_nist_p_192_sqr = {
 		(BN_ULONG *)_nist_p_192_sqr,
-		sizeof(_nist_p_192_sqr)/sizeof(_nist_p_192_sqr[0]),
-		sizeof(_nist_p_192_sqr)/sizeof(_nist_p_192_sqr[0]),
-		0,BN_FLG_STATIC_DATA };
+		sizeof(_nist_p_192_sqr) / sizeof(_nist_p_192_sqr[0]),
+		sizeof(_nist_p_192_sqr) / sizeof(_nist_p_192_sqr[0]),
+		0,
+		BN_FLG_STATIC_DATA
+	};
 
 	field = &_bignum_nist_p_192; /* just to make sure */
 
- 	if (BN_is_negative(a) || BN_ucmp(a,&_bignum_nist_p_192_sqr)>=0)
+	if (BN_is_negative(a) || BN_ucmp(a, &_bignum_nist_p_192_sqr) >= 0)
 		return BN_nnmod(r, a, field, ctx);
 
 	i = BN_ucmp(field, a);
-	if (i == 0)
-		{
+	if (i == 0) {
 		BN_zero(r);
 		return 1;
-		}
-	else if (i > 0)
-		return (r == a) ? 1 : (BN_copy(r ,a) != NULL);
+	} else if (i > 0)
+		return (r == a) ? 1 : (BN_copy(r , a) != NULL);
 
-	if (r != a)
-		{
+	if (r != a) {
 		if (!bn_wexpand(r, BN_NIST_192_TOP))
 			return 0;
 		r_d = r->d;
 		nist_cp_bn(r_d, a_d, BN_NIST_192_TOP);
-		}
-	else
+	} else
 		r_d = a_d;
 
-	nist_cp_bn_0(buf.bn, a_d + BN_NIST_192_TOP, top - BN_NIST_192_TOP, BN_NIST_192_TOP);
+	nist_cp_bn_0(buf.bn, a_d + BN_NIST_192_TOP, top - BN_NIST_192_TOP,
+	    BN_NIST_192_TOP);
 
 #if defined(NIST_INT64)
 	{
-	NIST_INT64		acc;	/* accumulator */
-	unsigned int		*rp=(unsigned int *)r_d;
-	const unsigned int	*bp=(const unsigned int *)buf.ui;
-
-	acc  = rp[0];	acc += bp[3*2-6];
-			acc += bp[5*2-6]; rp[0] = (unsigned int)acc; acc >>= 32;
-
-	acc += rp[1];	acc += bp[3*2-5];
-			acc += bp[5*2-5]; rp[1] = (unsigned int)acc; acc >>= 32;
-
-	acc += rp[2];	acc += bp[3*2-6];
-			acc += bp[4*2-6];
-			acc += bp[5*2-6]; rp[2] = (unsigned int)acc; acc >>= 32;
-
-	acc += rp[3];	acc += bp[3*2-5];
-			acc += bp[4*2-5];
-			acc += bp[5*2-5]; rp[3] = (unsigned int)acc; acc >>= 32;
-
-	acc += rp[4];	acc += bp[4*2-6];
-			acc += bp[5*2-6]; rp[4] = (unsigned int)acc; acc >>= 32;
-
-	acc += rp[5];	acc += bp[4*2-5];
-			acc += bp[5*2-5]; rp[5] = (unsigned int)acc;
-
-	carry = (int)(acc>>32);
+		NIST_INT64 acc;	/* accumulator */
+		unsigned int *rp = (unsigned int *)r_d;
+		const unsigned int *bp = (const unsigned int *)buf.ui;
+
+		acc = rp[0];
+		acc += bp[3 * 2 - 6];
+		acc += bp[5 * 2 - 6];
+		rp[0] = (unsigned int)acc;
+		acc >>= 32;
+
+		acc += rp[1];
+		acc += bp[3 * 2 - 5];
+		acc += bp[5 * 2 - 5];
+		rp[1] = (unsigned int)acc;
+		acc >>= 32;
+
+		acc += rp[2];
+		acc += bp[3 * 2 - 6];
+		acc += bp[4 * 2 - 6];
+		acc += bp[5 * 2 - 6];
+		rp[2] = (unsigned int)acc;
+		acc >>= 32;
+
+		acc += rp[3];
+		acc += bp[3 * 2 - 5];
+		acc += bp[4 * 2 - 5];
+		acc += bp[5 * 2 - 5];
+		rp[3] = (unsigned int)acc;
+		acc >>= 32;
+
+		acc += rp[4];
+		acc += bp[4 * 2 - 6];
+		acc += bp[5 * 2 - 6];
+		rp[4] = (unsigned int)acc;
+		acc >>= 32;
+
+		acc += rp[5];
+		acc += bp[4 * 2 - 5];
+		acc += bp[5 * 2 - 5];
+		rp[5] = (unsigned int)acc;
+
+		carry = (int)(acc >> 32);
 	}
 #else
 	{
-	BN_ULONG t_d[BN_NIST_192_TOP];
-
-	nist_set_192(t_d, buf.bn, 0, 3, 3);
-	carry = (int)bn_add_words(r_d, r_d, t_d, BN_NIST_192_TOP);
-	nist_set_192(t_d, buf.bn, 4, 4, 0);
-	carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_192_TOP);
-	nist_set_192(t_d, buf.bn, 5, 5, 5)
-	carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_192_TOP);
+		BN_ULONG t_d[BN_NIST_192_TOP];
+
+		nist_set_192(t_d, buf.bn, 0, 3, 3);
+		carry = (int)bn_add_words(r_d, r_d, t_d, BN_NIST_192_TOP);
+		nist_set_192(t_d, buf.bn, 4, 4, 0);
+		carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_192_TOP);
+		nist_set_192(t_d, buf.bn, 5, 5, 5)
+		carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_192_TOP);
 	}
 #endif
 	if (carry > 0)
-		carry = (int)bn_sub_words(r_d,r_d,_nist_p_192[carry-1],BN_NIST_192_TOP);
+		carry = (int)bn_sub_words(r_d, r_d, _nist_p_192[carry - 1],
+		    BN_NIST_192_TOP);
 	else
 		carry = 1;
 
@@ -448,19 +532,20 @@ int BN_nist_mod_192(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
 	 * 'tmp=result-modulus; if (!carry || !borrow) result=tmp;'
 	 * this is what happens below, but without explicit if:-) a.
 	 */
-	mask  = 0-(uintptr_t)bn_sub_words(c_d,r_d,_nist_p_192[0],BN_NIST_192_TOP);
-	mask &= 0-(uintptr_t)carry;
-	res   = c_d;
-	res   = (BN_ULONG *)
-	 (((uintptr_t)res&~mask) | ((uintptr_t)r_d&mask));
+	mask = 0 - (uintptr_t)bn_sub_words(c_d, r_d, _nist_p_192[0],
+	    BN_NIST_192_TOP);
+	mask &= 0 - (uintptr_t)carry;
+	res = c_d;
+	res = (BN_ULONG *)(((uintptr_t)res & ~mask) | ((uintptr_t)r_d & mask));
 	nist_cp_bn(r_d, res, BN_NIST_192_TOP);
 	r->top = BN_NIST_192_TOP;
 	bn_correct_top(r);
 
 	return 1;
-	}
+}
 
-typedef BN_ULONG (*bn_addsub_f)(BN_ULONG *,const BN_ULONG *,const BN_ULONG *,int);
+typedef BN_ULONG (*bn_addsub_f)(BN_ULONG *, const BN_ULONG *,
+    const BN_ULONG *, int);
 
 #define nist_set_224(to, from, a1, a2, a3, a4, a5, a6, a7) \
 	{ \
@@ -473,150 +558,170 @@ typedef BN_ULONG (*bn_addsub_f)(BN_ULONG *,const BN_ULONG *,const BN_ULONG *,int
 	bn_cp_32(to, 6, from, (a1) - 7) \
 	}
 
-int BN_nist_mod_224(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
-	BN_CTX *ctx)
-	{
-	int	top = a->top, i;
-	int	carry;
+int
+BN_nist_mod_224(BIGNUM *r, const BIGNUM *a, const BIGNUM *field, BN_CTX *ctx)
+{
+	int top = a->top, i;
+	int carry;
 	BN_ULONG *r_d, *a_d = a->d;
-	union	{
-		BN_ULONG	bn[BN_NIST_224_TOP];
-		unsigned int	ui[BN_NIST_224_TOP*sizeof(BN_ULONG)/sizeof(unsigned int)];
-		} buf;
-	BN_ULONG c_d[BN_NIST_224_TOP],
-		*res;
+	union {
+		BN_ULONG bn[BN_NIST_224_TOP];
+		unsigned int ui[BN_NIST_224_TOP *
+		    sizeof(BN_ULONG) / sizeof(unsigned int)];
+	} buf;
+	BN_ULONG c_d[BN_NIST_224_TOP], *res;
 	uintptr_t mask;
-	union { bn_addsub_f f; uintptr_t p; } u;
+	union {
+		bn_addsub_f f;
+		uintptr_t p;
+	} u;
 	static const BIGNUM _bignum_nist_p_224_sqr = {
 		(BN_ULONG *)_nist_p_224_sqr,
-		sizeof(_nist_p_224_sqr)/sizeof(_nist_p_224_sqr[0]),
-		sizeof(_nist_p_224_sqr)/sizeof(_nist_p_224_sqr[0]),
-		0,BN_FLG_STATIC_DATA };
-
+		sizeof(_nist_p_224_sqr) / sizeof(_nist_p_224_sqr[0]),
+		sizeof(_nist_p_224_sqr) / sizeof(_nist_p_224_sqr[0]),
+		0,
+		BN_FLG_STATIC_DATA
+	};
 
 	field = &_bignum_nist_p_224; /* just to make sure */
 
- 	if (BN_is_negative(a) || BN_ucmp(a,&_bignum_nist_p_224_sqr)>=0)
+	if (BN_is_negative(a) || BN_ucmp(a, &_bignum_nist_p_224_sqr) >= 0)
 		return BN_nnmod(r, a, field, ctx);
 
 	i = BN_ucmp(field, a);
-	if (i == 0)
-		{
+	if (i == 0) {
 		BN_zero(r);
 		return 1;
-		}
-	else if (i > 0)
-		return (r == a)? 1 : (BN_copy(r ,a) != NULL);
+	} else if (i > 0)
+		return (r == a) ? 1 : (BN_copy(r, a) != NULL);
 
-	if (r != a)
-		{
+	if (r != a) {
 		if (!bn_wexpand(r, BN_NIST_224_TOP))
 			return 0;
 		r_d = r->d;
 		nist_cp_bn(r_d, a_d, BN_NIST_224_TOP);
-		}
-	else
+	} else
 		r_d = a_d;
 
 #if BN_BITS2==64
 	/* copy upper 256 bits of 448 bit number ... */
-	nist_cp_bn_0(c_d, a_d + (BN_NIST_224_TOP-1), top - (BN_NIST_224_TOP-1), BN_NIST_224_TOP);
+	nist_cp_bn_0(c_d, a_d + (BN_NIST_224_TOP - 1),
+	    top - (BN_NIST_224_TOP - 1), BN_NIST_224_TOP);
 	/* ... and right shift by 32 to obtain upper 224 bits */
 	nist_set_224(buf.bn, c_d, 14, 13, 12, 11, 10, 9, 8);
 	/* truncate lower part to 224 bits too */
-	r_d[BN_NIST_224_TOP-1] &= BN_MASK2l;
+	r_d[BN_NIST_224_TOP - 1] &= BN_MASK2l;
 #else
-	nist_cp_bn_0(buf.bn, a_d + BN_NIST_224_TOP, top - BN_NIST_224_TOP, BN_NIST_224_TOP);
+	nist_cp_bn_0(buf.bn, a_d + BN_NIST_224_TOP,
+	    top - BN_NIST_224_TOP, BN_NIST_224_TOP);
 #endif
 
 #if defined(NIST_INT64) && BN_BITS2!=64
 	{
-	NIST_INT64		acc;	/* accumulator */
-	unsigned int		*rp=(unsigned int *)r_d;
-	const unsigned int	*bp=(const unsigned int *)buf.ui;
-
-	acc  = rp[0];	acc -= bp[7-7];
-			acc -= bp[11-7]; rp[0] = (unsigned int)acc; acc >>= 32;
-
-	acc += rp[1];	acc -= bp[8-7];
-			acc -= bp[12-7]; rp[1] = (unsigned int)acc; acc >>= 32;
-
-	acc += rp[2];	acc -= bp[9-7];
-			acc -= bp[13-7]; rp[2] = (unsigned int)acc; acc >>= 32;
-
-	acc += rp[3];	acc += bp[7-7];
-			acc += bp[11-7];
-			acc -= bp[10-7]; rp[3] = (unsigned int)acc; acc>>= 32;
-
-	acc += rp[4];	acc += bp[8-7];
-			acc += bp[12-7];
-			acc -= bp[11-7]; rp[4] = (unsigned int)acc; acc >>= 32;
-
-	acc += rp[5];	acc += bp[9-7];
-			acc += bp[13-7];
-			acc -= bp[12-7]; rp[5] = (unsigned int)acc; acc >>= 32;
-
-	acc += rp[6];	acc += bp[10-7];
-			acc -= bp[13-7]; rp[6] = (unsigned int)acc;
-
-	carry = (int)(acc>>32);
+		NIST_INT64 acc;	/* accumulator */
+		unsigned int *rp = (unsigned int *)r_d;
+		const unsigned int *bp = (const unsigned int *)buf.ui;
+
+		acc = rp[0];
+		acc -= bp[7 - 7];
+		acc -= bp[11 - 7];
+		rp[0] = (unsigned int)acc;
+		acc >>= 32;
+
+		acc += rp[1];
+		acc -= bp[8 - 7];
+		acc -= bp[12 - 7];
+		rp[1] = (unsigned int)acc;
+		acc >>= 32;
+
+		acc += rp[2];
+		acc -= bp[9 - 7];
+		acc -= bp[13 - 7];
+		rp[2] = (unsigned int)acc;
+		acc >>= 32;
+
+		acc += rp[3];
+		acc += bp[7 - 7];
+		acc += bp[11 - 7];
+		acc -= bp[10 - 7];
+		rp[3] = (unsigned int)acc;
+		acc >>= 32;
+
+		acc += rp[4];
+		acc += bp[8 - 7];
+		acc += bp[12 - 7];
+		acc -= bp[11 - 7];
+		rp[4] = (unsigned int)acc;
+		acc >>= 32;
+
+		acc += rp[5];
+		acc += bp[9 - 7];
+		acc += bp[13 - 7];
+		acc -= bp[12 - 7];
+		rp[5] = (unsigned int)acc;
+		acc >>= 32;
+
+		acc += rp[6];
+		acc += bp[10 - 7];
+		acc -= bp[13 - 7];
+		rp[6] = (unsigned int)acc;
+
+		carry = (int)(acc >> 32);
 # if BN_BITS2==64
-	rp[7] = carry;
+		rp[7] = carry;
 # endif
-	}	
+	}
 #else
 	{
-	BN_ULONG t_d[BN_NIST_224_TOP];
+		BN_ULONG t_d[BN_NIST_224_TOP];
 
-	nist_set_224(t_d, buf.bn, 10, 9, 8, 7, 0, 0, 0);
-	carry = (int)bn_add_words(r_d, r_d, t_d, BN_NIST_224_TOP);
-	nist_set_224(t_d, buf.bn, 0, 13, 12, 11, 0, 0, 0);
-	carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_224_TOP);
-	nist_set_224(t_d, buf.bn, 13, 12, 11, 10, 9, 8, 7);
-	carry -= (int)bn_sub_words(r_d, r_d, t_d, BN_NIST_224_TOP);
-	nist_set_224(t_d, buf.bn, 0, 0, 0, 0, 13, 12, 11);
-	carry -= (int)bn_sub_words(r_d, r_d, t_d, BN_NIST_224_TOP);
+		nist_set_224(t_d, buf.bn, 10, 9, 8, 7, 0, 0, 0);
+		carry = (int)bn_add_words(r_d, r_d, t_d, BN_NIST_224_TOP);
+		nist_set_224(t_d, buf.bn, 0, 13, 12, 11, 0, 0, 0);
+		carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_224_TOP);
+		nist_set_224(t_d, buf.bn, 13, 12, 11, 10, 9, 8, 7);
+		carry -= (int)bn_sub_words(r_d, r_d, t_d, BN_NIST_224_TOP);
+		nist_set_224(t_d, buf.bn, 0, 0, 0, 0, 13, 12, 11);
+		carry -= (int)bn_sub_words(r_d, r_d, t_d, BN_NIST_224_TOP);
 
 #if BN_BITS2==64
-	carry = (int)(r_d[BN_NIST_224_TOP-1]>>32);
+		carry = (int)(r_d[BN_NIST_224_TOP - 1] >> 32);
 #endif
 	}
 #endif
 	u.f = bn_sub_words;
-	if (carry > 0)
-		{
-		carry = (int)bn_sub_words(r_d,r_d,_nist_p_224[carry-1],BN_NIST_224_TOP);
+	if (carry > 0) {
+		carry = (int)bn_sub_words(r_d, r_d, _nist_p_224[carry - 1],
+		    BN_NIST_224_TOP);
 #if BN_BITS2==64
-		carry=(int)(~(r_d[BN_NIST_224_TOP-1]>>32))&1;
+		carry = (int)(~(r_d[BN_NIST_224_TOP - 1] >> 32)) & 1;
 #endif
-		}
-	else if (carry < 0)
-		{
+	} else if (carry < 0) {
 		/* it's a bit more complicated logic in this case.
 		 * if bn_add_words yields no carry, then result
 		 * has to be adjusted by unconditionally *adding*
 		 * the modulus. but if it does, then result has
 		 * to be compared to the modulus and conditionally
 		 * adjusted by *subtracting* the latter. */
-		carry = (int)bn_add_words(r_d,r_d,_nist_p_224[-carry-1],BN_NIST_224_TOP);
-		mask = 0-(uintptr_t)carry;
-		u.p = ((uintptr_t)bn_sub_words&mask) |
-		 ((uintptr_t)bn_add_words&~mask);
-		}
-	else
+		carry = (int)bn_add_words(r_d, r_d, _nist_p_224[-carry - 1],
+		    BN_NIST_224_TOP);
+		mask = 0 - (uintptr_t)carry;
+		u.p = ((uintptr_t)bn_sub_words & mask) |
+		    ((uintptr_t)bn_add_words & ~mask);
+	} else
 		carry = 1;
 
 	/* otherwise it's effectively same as in BN_nist_mod_192... */
-	mask  = 0-(uintptr_t)(*u.f)(c_d,r_d,_nist_p_224[0],BN_NIST_224_TOP);
-	mask &= 0-(uintptr_t)carry;
-	res   = c_d;
-	res   = (BN_ULONG *)(((uintptr_t)res&~mask) | ((uintptr_t)r_d&mask));
+	mask = 0 - (uintptr_t)(*u.f)(c_d, r_d, _nist_p_224[0], BN_NIST_224_TOP);
+	mask &= 0 - (uintptr_t)carry;
+	res = c_d;
+	res = (BN_ULONG *)(((uintptr_t)res & ~mask) | ((uintptr_t)r_d & mask));
 	nist_cp_bn(r_d, res, BN_NIST_224_TOP);
 	r->top = BN_NIST_224_TOP;
 	bn_correct_top(r);
 
 	return 1;
-	}
+}
 
 #define nist_set_256(to, from, a1, a2, a3, a4, a5, a6, a7, a8) \
 	{ \
@@ -630,192 +735,216 @@ int BN_nist_mod_224(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
 	bn_cp_32(to, 7, from, (a1) - 8) \
 	}
 
-int BN_nist_mod_256(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
-	BN_CTX *ctx)
-	{
-	int	i, top = a->top;
-	int	carry = 0;
+int
+BN_nist_mod_256(BIGNUM *r, const BIGNUM *a, const BIGNUM *field, BN_CTX *ctx)
+{
+	int i, top = a->top;
+	int carry = 0;
 	register BN_ULONG *a_d = a->d, *r_d;
-	union	{
+	union {
 		BN_ULONG bn[BN_NIST_256_TOP];
-		unsigned int ui[BN_NIST_256_TOP*sizeof(BN_ULONG)/sizeof(unsigned int)];
-		} buf;
-	BN_ULONG c_d[BN_NIST_256_TOP],
-		*res;
+		unsigned int ui[BN_NIST_256_TOP *
+		    sizeof(BN_ULONG) / sizeof(unsigned int)];
+	} buf;
+	BN_ULONG c_d[BN_NIST_256_TOP], *res;
 	uintptr_t mask;
-	union { bn_addsub_f f; uintptr_t p; } u;
+	union {
+		bn_addsub_f f;
+		uintptr_t p;
+	} u;
 	static const BIGNUM _bignum_nist_p_256_sqr = {
 		(BN_ULONG *)_nist_p_256_sqr,
-		sizeof(_nist_p_256_sqr)/sizeof(_nist_p_256_sqr[0]),
-		sizeof(_nist_p_256_sqr)/sizeof(_nist_p_256_sqr[0]),
-		0,BN_FLG_STATIC_DATA };
+		sizeof(_nist_p_256_sqr) / sizeof(_nist_p_256_sqr[0]),
+		sizeof(_nist_p_256_sqr) / sizeof(_nist_p_256_sqr[0]),
+		0,
+		BN_FLG_STATIC_DATA
+	};
 
 	field = &_bignum_nist_p_256; /* just to make sure */
 
- 	if (BN_is_negative(a) || BN_ucmp(a,&_bignum_nist_p_256_sqr)>=0)
+	if (BN_is_negative(a) || BN_ucmp(a, &_bignum_nist_p_256_sqr) >= 0)
 		return BN_nnmod(r, a, field, ctx);
 
 	i = BN_ucmp(field, a);
-	if (i == 0)
-		{
+	if (i == 0) {
 		BN_zero(r);
 		return 1;
-		}
-	else if (i > 0)
-		return (r == a)? 1 : (BN_copy(r ,a) != NULL);
+	} else if (i > 0)
+		return (r == a) ? 1 : (BN_copy(r, a) != NULL);
 
-	if (r != a)
-		{
+	if (r != a) {
 		if (!bn_wexpand(r, BN_NIST_256_TOP))
 			return 0;
 		r_d = r->d;
 		nist_cp_bn(r_d, a_d, BN_NIST_256_TOP);
-		}
-	else
+	} else
 		r_d = a_d;
 
-	nist_cp_bn_0(buf.bn, a_d + BN_NIST_256_TOP, top - BN_NIST_256_TOP, BN_NIST_256_TOP);
+	nist_cp_bn_0(buf.bn, a_d + BN_NIST_256_TOP,
+	    top - BN_NIST_256_TOP, BN_NIST_256_TOP);
 
 #if defined(NIST_INT64)
 	{
-	NIST_INT64		acc;	/* accumulator */
-	unsigned int		*rp=(unsigned int *)r_d;
-	const unsigned int	*bp=(const unsigned int *)buf.ui;
-
-	acc = rp[0];	acc += bp[8-8];
-			acc += bp[9-8];
-			acc -= bp[11-8];
-			acc -= bp[12-8];
-			acc -= bp[13-8];
-			acc -= bp[14-8]; rp[0] = (unsigned int)acc; acc >>= 32;
-
-	acc += rp[1];	acc += bp[9-8];
-			acc += bp[10-8];
-			acc -= bp[12-8];
-			acc -= bp[13-8];
-			acc -= bp[14-8];
-			acc -= bp[15-8]; rp[1] = (unsigned int)acc; acc >>= 32;
-
-	acc += rp[2];	acc += bp[10-8];
-			acc += bp[11-8];
-			acc -= bp[13-8];
-			acc -= bp[14-8];
-			acc -= bp[15-8]; rp[2] = (unsigned int)acc; acc >>= 32;
-
-	acc += rp[3];	acc += bp[11-8];
-			acc += bp[11-8];
-			acc += bp[12-8];
-			acc += bp[12-8];
-			acc += bp[13-8];
-			acc -= bp[15-8];
-			acc -= bp[8-8];
-			acc -= bp[9-8];  rp[3] = (unsigned int)acc; acc >>= 32;
-
-	acc += rp[4];	acc += bp[12-8];
-			acc += bp[12-8];
-			acc += bp[13-8];
-			acc += bp[13-8];
-			acc += bp[14-8];
-			acc -= bp[9-8];
-			acc -= bp[10-8]; rp[4] = (unsigned int)acc; acc >>= 32;
-
-	acc += rp[5];	acc += bp[13-8];
-			acc += bp[13-8];
-			acc += bp[14-8];
-			acc += bp[14-8];
-			acc += bp[15-8];
-			acc -= bp[10-8];
-			acc -= bp[11-8]; rp[5] = (unsigned int)acc; acc >>= 32;
-
-	acc += rp[6];	acc += bp[14-8];
-			acc += bp[14-8];
-			acc += bp[15-8];
-			acc += bp[15-8];
-			acc += bp[14-8];
-			acc += bp[13-8];
-			acc -= bp[8-8];
-			acc -= bp[9-8];  rp[6] = (unsigned int)acc; acc >>= 32;
-
-	acc += rp[7];	acc += bp[15-8];
-			acc += bp[15-8];
-			acc += bp[15-8];
-			acc += bp[8 -8];
-			acc -= bp[10-8];
-			acc -= bp[11-8];
-			acc -= bp[12-8];
-			acc -= bp[13-8]; rp[7] = (unsigned int)acc;
-
-	carry = (int)(acc>>32);
+		NIST_INT64 acc;	/* accumulator */
+		unsigned int *rp = (unsigned int *)r_d;
+		const unsigned int *bp = (const unsigned int *)buf.ui;
+
+		acc = rp[0];
+		acc += bp[8 - 8];
+		acc += bp[9 - 8];
+		acc -= bp[11 - 8];
+		acc -= bp[12 - 8];
+		acc -= bp[13 - 8];
+		acc -= bp[14 - 8];
+		rp[0] = (unsigned int)acc;
+		acc >>= 32;
+
+		acc += rp[1];
+		acc += bp[9 - 8];
+		acc += bp[10 - 8];
+		acc -= bp[12 - 8];
+		acc -= bp[13 - 8];
+		acc -= bp[14 - 8];
+		acc -= bp[15 - 8];
+		rp[1] = (unsigned int)acc;
+		acc >>= 32;
+
+		acc += rp[2];
+		acc += bp[10 - 8];
+		acc += bp[11 - 8];
+		acc -= bp[13 - 8];
+		acc -= bp[14 - 8];
+		acc -= bp[15 - 8];
+		rp[2] = (unsigned int)acc;
+		acc >>= 32;
+
+		acc += rp[3];
+		acc += bp[11 - 8];
+		acc += bp[11 - 8];
+		acc += bp[12 - 8];
+		acc += bp[12 - 8];
+		acc += bp[13 - 8];
+		acc -= bp[15 - 8];
+		acc -= bp[8 - 8];
+		acc -= bp[9 - 8];
+		rp[3] = (unsigned int)acc;
+		acc >>= 32;
+
+		acc += rp[4];
+		acc += bp[12 - 8];
+		acc += bp[12 - 8];
+		acc += bp[13 - 8];
+		acc += bp[13 - 8];
+		acc += bp[14 - 8];
+		acc -= bp[9 - 8];
+		acc -= bp[10 - 8];
+		rp[4] = (unsigned int)acc;
+		acc >>= 32;
+
+		acc += rp[5];
+		acc += bp[13 - 8];
+		acc += bp[13 - 8];
+		acc += bp[14 - 8];
+		acc += bp[14 - 8];
+		acc += bp[15 - 8];
+		acc -= bp[10 - 8];
+		acc -= bp[11 - 8];
+		rp[5] = (unsigned int)acc;
+		acc >>= 32;
+
+		acc += rp[6];
+		acc += bp[14 - 8];
+		acc += bp[14 - 8];
+		acc += bp[15 - 8];
+		acc += bp[15 - 8];
+		acc += bp[14 - 8];
+		acc += bp[13 - 8];
+		acc -= bp[8 - 8];
+		acc -= bp[9 - 8];
+		rp[6] = (unsigned int)acc;
+		acc >>= 32;
+
+		acc += rp[7];
+		acc += bp[15 - 8];
+		acc += bp[15 - 8];
+		acc += bp[15 - 8];
+		acc += bp[8 - 8];
+		acc -= bp[10 - 8];
+		acc -= bp[11 - 8];
+		acc -= bp[12 - 8];
+		acc -= bp[13 - 8];
+		rp[7] = (unsigned int)acc;
+
+		carry = (int)(acc >> 32);
 	}
 #else
 	{
-	BN_ULONG t_d[BN_NIST_256_TOP];
-
-	/*S1*/
-	nist_set_256(t_d, buf.bn, 15, 14, 13, 12, 11, 0, 0, 0);
-	/*S2*/
-	nist_set_256(c_d, buf.bn, 0, 15, 14, 13, 12, 0, 0, 0);
-	carry = (int)bn_add_words(t_d, t_d, c_d, BN_NIST_256_TOP);
-	/* left shift */
+		BN_ULONG t_d[BN_NIST_256_TOP];
+
+		/*S1*/
+		nist_set_256(t_d, buf.bn, 15, 14, 13, 12, 11, 0, 0, 0);
+		/*S2*/
+		nist_set_256(c_d, buf.bn, 0, 15, 14, 13, 12, 0, 0, 0);
+		carry = (int)bn_add_words(t_d, t_d, c_d, BN_NIST_256_TOP);
+		/* left shift */
 		{
-		register BN_ULONG *ap,t,c;
-		ap = t_d;
-		c=0;
-		for (i = BN_NIST_256_TOP; i != 0; --i)
-			{
-			t= *ap;
-			*(ap++)=((t<<1)|c)&BN_MASK2;
-			c=(t & BN_TBIT)?1:0;
+			register BN_ULONG *ap, t, c;
+			ap = t_d;
+			c = 0;
+			for (i = BN_NIST_256_TOP; i != 0; --i) {
+				t = *ap;
+				*(ap++) = ((t << 1) | c) & BN_MASK2;
+				c = (t & BN_TBIT) ? 1 : 0;
 			}
-		carry <<= 1;
-		carry  |= c;
+			carry <<= 1;
+			carry |= c;
 		}
-	carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_256_TOP);
-	/*S3*/
-	nist_set_256(t_d, buf.bn, 15, 14, 0, 0, 0, 10, 9, 8);
-	carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_256_TOP);
-	/*S4*/
-	nist_set_256(t_d, buf.bn, 8, 13, 15, 14, 13, 11, 10, 9);
-	carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_256_TOP);
-	/*D1*/
-	nist_set_256(t_d, buf.bn, 10, 8, 0, 0, 0, 13, 12, 11);
-	carry -= (int)bn_sub_words(r_d, r_d, t_d, BN_NIST_256_TOP);
-	/*D2*/
-	nist_set_256(t_d, buf.bn, 11, 9, 0, 0, 15, 14, 13, 12);
-	carry -= (int)bn_sub_words(r_d, r_d, t_d, BN_NIST_256_TOP);
-	/*D3*/
-	nist_set_256(t_d, buf.bn, 12, 0, 10, 9, 8, 15, 14, 13);
-	carry -= (int)bn_sub_words(r_d, r_d, t_d, BN_NIST_256_TOP);
-	/*D4*/
-	nist_set_256(t_d, buf.bn, 13, 0, 11, 10, 9, 0, 15, 14);
-	carry -= (int)bn_sub_words(r_d, r_d, t_d, BN_NIST_256_TOP);
+		carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_256_TOP);
+		/*S3*/
+		nist_set_256(t_d, buf.bn, 15, 14, 0, 0, 0, 10, 9, 8);
+		carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_256_TOP);
+		/*S4*/
+		nist_set_256(t_d, buf.bn, 8, 13, 15, 14, 13, 11, 10, 9);
+		carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_256_TOP);
+		/*D1*/
+		nist_set_256(t_d, buf.bn, 10, 8, 0, 0, 0, 13, 12, 11);
+		carry -= (int)bn_sub_words(r_d, r_d, t_d, BN_NIST_256_TOP);
+		/*D2*/
+		nist_set_256(t_d, buf.bn, 11, 9, 0, 0, 15, 14, 13, 12);
+		carry -= (int)bn_sub_words(r_d, r_d, t_d, BN_NIST_256_TOP);
+		/*D3*/
+		nist_set_256(t_d, buf.bn, 12, 0, 10, 9, 8, 15, 14, 13);
+		carry -= (int)bn_sub_words(r_d, r_d, t_d, BN_NIST_256_TOP);
+		/*D4*/
+		nist_set_256(t_d, buf.bn, 13, 0, 11, 10, 9, 0, 15, 14);
+		carry -= (int)bn_sub_words(r_d, r_d, t_d, BN_NIST_256_TOP);
 
 	}
 #endif
 	/* see BN_nist_mod_224 for explanation */
 	u.f = bn_sub_words;
 	if (carry > 0)
-		carry = (int)bn_sub_words(r_d,r_d,_nist_p_256[carry-1],BN_NIST_256_TOP);
-	else if (carry < 0)
-		{
-		carry = (int)bn_add_words(r_d,r_d,_nist_p_256[-carry-1],BN_NIST_256_TOP);
-		mask = 0-(uintptr_t)carry;
-		u.p = ((uintptr_t)bn_sub_words&mask) |
-		 ((uintptr_t)bn_add_words&~mask);
-		}
-	else
+		carry = (int)bn_sub_words(r_d, r_d, _nist_p_256[carry - 1],
+		    BN_NIST_256_TOP);
+	else if (carry < 0) {
+		carry = (int)bn_add_words(r_d, r_d, _nist_p_256[-carry - 1],
+		    BN_NIST_256_TOP);
+		mask = 0 - (uintptr_t)carry;
+		u.p = ((uintptr_t)bn_sub_words & mask) |
+		    ((uintptr_t)bn_add_words & ~mask);
+	} else
 		carry = 1;
 
-	mask  = 0-(uintptr_t)(*u.f)(c_d,r_d,_nist_p_256[0],BN_NIST_256_TOP);
-	mask &= 0-(uintptr_t)carry;
-	res   = c_d;
-	res   = (BN_ULONG *)(((uintptr_t)res&~mask) | ((uintptr_t)r_d&mask));
+	mask = 0 - (uintptr_t)(*u.f)(c_d, r_d, _nist_p_256[0], BN_NIST_256_TOP);
+	mask &= 0 - (uintptr_t)carry;
+	res = c_d;
+	res = (BN_ULONG *)(((uintptr_t)res & ~mask) | ((uintptr_t)r_d & mask));
 	nist_cp_bn(r_d, res, BN_NIST_256_TOP);
 	r->top = BN_NIST_256_TOP;
 	bn_correct_top(r);
 
 	return 1;
-	}
+}
 
 #define nist_set_384(to,from,a1,a2,a3,a4,a5,a6,a7,a8,a9,a10,a11,a12) \
 	{ \
@@ -833,273 +962,309 @@ int BN_nist_mod_256(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
 	bn_cp_32(to, 11, from, (a1) - 12)  \
 	}
 
-int BN_nist_mod_384(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
-	BN_CTX *ctx)
-	{
-	int	i, top = a->top;
-	int	carry = 0;
+int
+BN_nist_mod_384(BIGNUM *r, const BIGNUM *a, const BIGNUM *field, BN_CTX *ctx)
+{
+	int i, top = a->top;
+	int carry = 0;
 	register BN_ULONG *r_d, *a_d = a->d;
-	union	{
+	union {
 		BN_ULONG bn[BN_NIST_384_TOP];
-		unsigned int ui[BN_NIST_384_TOP*sizeof(BN_ULONG)/sizeof(unsigned int)];
-		} buf;
-	BN_ULONG c_d[BN_NIST_384_TOP],
-		*res;
+		unsigned int ui[BN_NIST_384_TOP *
+		    sizeof(BN_ULONG) / sizeof(unsigned int)];
+	} buf;
+	BN_ULONG c_d[BN_NIST_384_TOP], *res;
 	uintptr_t mask;
-	union { bn_addsub_f f; uintptr_t p; } u;
+	union {
+		bn_addsub_f f;
+		uintptr_t p;
+	} u;
 	static const BIGNUM _bignum_nist_p_384_sqr = {
 		(BN_ULONG *)_nist_p_384_sqr,
-		sizeof(_nist_p_384_sqr)/sizeof(_nist_p_384_sqr[0]),
-		sizeof(_nist_p_384_sqr)/sizeof(_nist_p_384_sqr[0]),
-		0,BN_FLG_STATIC_DATA };
-
+		sizeof(_nist_p_384_sqr) / sizeof(_nist_p_384_sqr[0]),
+		sizeof(_nist_p_384_sqr) / sizeof(_nist_p_384_sqr[0]),
+		0,
+		BN_FLG_STATIC_DATA
+	};
 
 	field = &_bignum_nist_p_384; /* just to make sure */
 
- 	if (BN_is_negative(a) || BN_ucmp(a,&_bignum_nist_p_384_sqr)>=0)
+	if (BN_is_negative(a) || BN_ucmp(a, &_bignum_nist_p_384_sqr) >= 0)
 		return BN_nnmod(r, a, field, ctx);
 
 	i = BN_ucmp(field, a);
-	if (i == 0)
-		{
+	if (i == 0) {
 		BN_zero(r);
 		return 1;
-		}
-	else if (i > 0)
-		return (r == a)? 1 : (BN_copy(r ,a) != NULL);
+	} else if (i > 0)
+		return (r == a) ? 1 : (BN_copy(r, a) != NULL);
 
-	if (r != a)
-		{
+	if (r != a) {
 		if (!bn_wexpand(r, BN_NIST_384_TOP))
 			return 0;
 		r_d = r->d;
 		nist_cp_bn(r_d, a_d, BN_NIST_384_TOP);
-		}
-	else
+	} else
 		r_d = a_d;
 
-	nist_cp_bn_0(buf.bn, a_d + BN_NIST_384_TOP, top - BN_NIST_384_TOP, BN_NIST_384_TOP);
+	nist_cp_bn_0(buf.bn, a_d + BN_NIST_384_TOP,
+	    top - BN_NIST_384_TOP, BN_NIST_384_TOP);
 
 #if defined(NIST_INT64)
 	{
-	NIST_INT64		acc;	/* accumulator */
-	unsigned int		*rp=(unsigned int *)r_d;
-	const unsigned int	*bp=(const unsigned int *)buf.ui;
-
-	acc = rp[0];	acc += bp[12-12];
-			acc += bp[21-12];
-			acc += bp[20-12];
-			acc -= bp[23-12]; rp[0] = (unsigned int)acc; acc >>= 32;
-
-	acc += rp[1];	acc += bp[13-12];
-			acc += bp[22-12];
-			acc += bp[23-12];
-			acc -= bp[12-12];
-			acc -= bp[20-12]; rp[1] = (unsigned int)acc; acc >>= 32;
-
-	acc += rp[2];	acc += bp[14-12];
-			acc += bp[23-12];
-			acc -= bp[13-12];
-			acc -= bp[21-12]; rp[2] = (unsigned int)acc; acc >>= 32;
-
-	acc += rp[3];	acc += bp[15-12];
-			acc += bp[12-12];
-			acc += bp[20-12];
-			acc += bp[21-12];
-			acc -= bp[14-12];
-			acc -= bp[22-12];
-			acc -= bp[23-12]; rp[3] = (unsigned int)acc; acc >>= 32;
-
-	acc += rp[4];	acc += bp[21-12];
-			acc += bp[21-12];
-			acc += bp[16-12];
-			acc += bp[13-12];
-			acc += bp[12-12];
-			acc += bp[20-12];
-			acc += bp[22-12];
-			acc -= bp[15-12];
-			acc -= bp[23-12];
-			acc -= bp[23-12]; rp[4] = (unsigned int)acc; acc >>= 32;
-
-	acc += rp[5];	acc += bp[22-12];
-			acc += bp[22-12];
-			acc += bp[17-12];
-			acc += bp[14-12];
-			acc += bp[13-12];
-			acc += bp[21-12];
-			acc += bp[23-12];
-			acc -= bp[16-12]; rp[5] = (unsigned int)acc; acc >>= 32;
-			
-	acc += rp[6];	acc += bp[23-12];
-			acc += bp[23-12];
-			acc += bp[18-12];
-			acc += bp[15-12];
-			acc += bp[14-12];
-			acc += bp[22-12];
-			acc -= bp[17-12]; rp[6] = (unsigned int)acc; acc >>= 32;
-			
-	acc += rp[7];	acc += bp[19-12];
-			acc += bp[16-12];
-			acc += bp[15-12];
-			acc += bp[23-12];
-			acc -= bp[18-12]; rp[7] = (unsigned int)acc; acc >>= 32;
-			
-	acc += rp[8];	acc += bp[20-12];
-			acc += bp[17-12];
-			acc += bp[16-12];
-			acc -= bp[19-12]; rp[8] = (unsigned int)acc; acc >>= 32;
-			
-	acc += rp[9];	acc += bp[21-12];
-			acc += bp[18-12];
-			acc += bp[17-12];
-			acc -= bp[20-12]; rp[9] = (unsigned int)acc; acc >>= 32;
-			
-	acc += rp[10];	acc += bp[22-12];
-			acc += bp[19-12];
-			acc += bp[18-12];
-			acc -= bp[21-12]; rp[10] = (unsigned int)acc; acc >>= 32;
-			
-	acc += rp[11];	acc += bp[23-12];
-			acc += bp[20-12];
-			acc += bp[19-12];
-			acc -= bp[22-12]; rp[11] = (unsigned int)acc;
-
-	carry = (int)(acc>>32);
+		NIST_INT64 acc;	/* accumulator */
+		unsigned int *rp = (unsigned int *)r_d;
+		const unsigned int *bp = (const unsigned int *)buf.ui;
+
+		acc = rp[0];
+		acc += bp[12 - 12];
+		acc += bp[21 - 12];
+		acc += bp[20 - 12];
+		acc -= bp[23 - 12];
+		rp[0] = (unsigned int)acc;
+		acc >>= 32;
+
+		acc += rp[1];
+		acc += bp[13 - 12];
+		acc += bp[22 - 12];
+		acc += bp[23 - 12];
+		acc -= bp[12 - 12];
+		acc -= bp[20 - 12];
+		rp[1] = (unsigned int)acc;
+		acc >>= 32;
+
+		acc += rp[2];
+		acc += bp[14 - 12];
+		acc += bp[23 - 12];
+		acc -= bp[13 - 12];
+		acc -= bp[21 - 12];
+		rp[2] = (unsigned int)acc;
+		acc >>= 32;
+
+		acc += rp[3];
+		acc += bp[15 - 12];
+		acc += bp[12 - 12];
+		acc += bp[20 - 12];
+		acc += bp[21 - 12];
+		acc -= bp[14 - 12];
+		acc -= bp[22 - 12];
+		acc -= bp[23 - 12];
+		rp[3] = (unsigned int)acc;
+		acc >>= 32;
+
+		acc += rp[4];
+		acc += bp[21 - 12];
+		acc += bp[21 - 12];
+		acc += bp[16 - 12];
+		acc += bp[13 - 12];
+		acc += bp[12 - 12];
+		acc += bp[20 - 12];
+		acc += bp[22 - 12];
+		acc -= bp[15 - 12];
+		acc -= bp[23 - 12];
+		acc -= bp[23 - 12];
+		rp[4] = (unsigned int)acc;
+		acc >>= 32;
+
+		acc += rp[5];
+		acc += bp[22 - 12];
+		acc += bp[22 - 12];
+		acc += bp[17 - 12];
+		acc += bp[14 - 12];
+		acc += bp[13 - 12];
+		acc += bp[21 - 12];
+		acc += bp[23 - 12];
+		acc -= bp[16 - 12];
+		rp[5] = (unsigned int)acc;
+		acc >>= 32;
+
+		acc += rp[6];
+		acc += bp[23 - 12];
+		acc += bp[23 - 12];
+		acc += bp[18 - 12];
+		acc += bp[15 - 12];
+		acc += bp[14 - 12];
+		acc += bp[22 - 12];
+		acc -= bp[17 - 12];
+		rp[6] = (unsigned int)acc;
+		acc >>= 32;
+
+		acc += rp[7];
+		acc += bp[19 - 12];
+		acc += bp[16 - 12];
+		acc += bp[15 - 12];
+		acc += bp[23 - 12];
+		acc -= bp[18 - 12];
+		rp[7] = (unsigned int)acc;
+		acc >>= 32;
+
+		acc += rp[8];
+		acc += bp[20 - 12];
+		acc += bp[17 - 12];
+		acc += bp[16 - 12];
+		acc -= bp[19 - 12];
+		rp[8] = (unsigned int)acc;
+		acc >>= 32;
+
+		acc += rp[9];
+		acc += bp[21 - 12];
+		acc += bp[18 - 12];
+		acc += bp[17 - 12];
+		acc -= bp[20 - 12];
+		rp[9] = (unsigned int)acc;
+		acc >>= 32;
+
+		acc += rp[10];
+		acc += bp[22 - 12];
+		acc += bp[19 - 12];
+		acc += bp[18 - 12];
+		acc -= bp[21 - 12];
+		rp[10] = (unsigned int)acc;
+		acc >>= 32;
+
+		acc += rp[11];
+		acc += bp[23 - 12];
+		acc += bp[20 - 12];
+		acc += bp[19 - 12];
+		acc -= bp[22 - 12];
+		rp[11] = (unsigned int)acc;
+
+		carry = (int)(acc >> 32);
 	}
 #else
 	{
-	BN_ULONG t_d[BN_NIST_384_TOP];
+		BN_ULONG t_d[BN_NIST_384_TOP];
 
-	/*S1*/
-	nist_set_256(t_d, buf.bn, 0, 0, 0, 0, 0, 23-4, 22-4, 21-4);
+		/*S1*/
+		nist_set_256(t_d, buf.bn, 0, 0, 0, 0, 0, 23 - 4, 22 - 4,
+		    21 - 4);
 		/* left shift */
 		{
-		register BN_ULONG *ap,t,c;
-		ap = t_d;
-		c=0;
-		for (i = 3; i != 0; --i)
-			{
-			t= *ap;
-			*(ap++)=((t<<1)|c)&BN_MASK2;
-			c=(t & BN_TBIT)?1:0;
+			register BN_ULONG *ap, t, c;
+			ap = t_d;
+			c = 0;
+			for (i = 3; i != 0; --i) {
+				t= *ap;
+				*(ap++) = ((t << 1)|c) & BN_MASK2;
+				c = (t & BN_TBIT) ? 1 : 0;
 			}
-		*ap=c;
+			*ap = c;
 		}
-	carry = (int)bn_add_words(r_d+(128/BN_BITS2), r_d+(128/BN_BITS2), 
-		t_d, BN_NIST_256_TOP);
-	/*S2 */
-	carry += (int)bn_add_words(r_d, r_d, buf.bn, BN_NIST_384_TOP);
-	/*S3*/
-	nist_set_384(t_d,buf.bn,20,19,18,17,16,15,14,13,12,23,22,21);
-	carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_384_TOP);
-	/*S4*/
-	nist_set_384(t_d,buf.bn,19,18,17,16,15,14,13,12,20,0,23,0);
-	carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_384_TOP);
-	/*S5*/
-	nist_set_384(t_d, buf.bn,0,0,0,0,23,22,21,20,0,0,0,0);
-	carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_384_TOP);
-	/*S6*/
-	nist_set_384(t_d,buf.bn,0,0,0,0,0,0,23,22,21,0,0,20);
-	carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_384_TOP);
-	/*D1*/
-	nist_set_384(t_d,buf.bn,22,21,20,19,18,17,16,15,14,13,12,23);
-	carry -= (int)bn_sub_words(r_d, r_d, t_d, BN_NIST_384_TOP);
-	/*D2*/
-	nist_set_384(t_d,buf.bn,0,0,0,0,0,0,0,23,22,21,20,0);
-	carry -= (int)bn_sub_words(r_d, r_d, t_d, BN_NIST_384_TOP);
-	/*D3*/
-	nist_set_384(t_d,buf.bn,0,0,0,0,0,0,0,23,23,0,0,0);
-	carry -= (int)bn_sub_words(r_d, r_d, t_d, BN_NIST_384_TOP);
+		carry = (int)bn_add_words(r_d + (128 / BN_BITS2),
+		    r_d + (128 / BN_BITS2), t_d, BN_NIST_256_TOP);
+		/*S2 */
+		carry += (int)bn_add_words(r_d, r_d, buf.bn, BN_NIST_384_TOP);
+		/*S3*/
+		nist_set_384(t_d, buf.bn, 20, 19, 18, 17, 16, 15, 14, 13, 12,
+		    23, 22, 21);
+		carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_384_TOP);
+		/*S4*/
+		nist_set_384(t_d, buf.bn, 19, 18, 17, 16, 15, 14, 13, 12, 20,
+		    0, 23, 0);
+		carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_384_TOP);
+		/*S5*/
+		nist_set_384(t_d, buf.bn, 0,0, 0,0, 23, 22, 21, 20, 0,0, 0, 0);
+		carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_384_TOP);
+		/*S6*/
+		nist_set_384(t_d, buf.bn, 0,0, 0,0, 0,0, 23, 22, 21, 0,0, 20);
+		carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_384_TOP);
+		/*D1*/
+		nist_set_384(t_d, buf.bn, 22, 21, 20, 19, 18, 17, 16, 15, 14,
+		    13, 12, 23);
+		carry -= (int)bn_sub_words(r_d, r_d, t_d, BN_NIST_384_TOP);
+		/*D2*/
+		nist_set_384(t_d, buf.bn, 0,0, 0,0, 0,0, 0,23, 22, 21, 20, 0);
+		carry -= (int)bn_sub_words(r_d, r_d, t_d, BN_NIST_384_TOP);
+		/*D3*/
+		nist_set_384(t_d, buf.bn, 0,0, 0,0, 0,0, 0,23, 23, 0,0, 0);
+		carry -= (int)bn_sub_words(r_d, r_d, t_d, BN_NIST_384_TOP);
 
 	}
 #endif
 	/* see BN_nist_mod_224 for explanation */
 	u.f = bn_sub_words;
 	if (carry > 0)
-		carry = (int)bn_sub_words(r_d,r_d,_nist_p_384[carry-1],BN_NIST_384_TOP);
-	else if (carry < 0)
-		{
-		carry = (int)bn_add_words(r_d,r_d,_nist_p_384[-carry-1],BN_NIST_384_TOP);
-		mask = 0-(uintptr_t)carry;
-		u.p = ((uintptr_t)bn_sub_words&mask) |
-		 ((uintptr_t)bn_add_words&~mask);
-		}
-	else
+		carry = (int)bn_sub_words(r_d, r_d, _nist_p_384[carry - 1],
+		    BN_NIST_384_TOP);
+	else if (carry < 0) {
+		carry = (int)bn_add_words(r_d, r_d, _nist_p_384[-carry - 1],
+		    BN_NIST_384_TOP);
+		mask = 0 - (uintptr_t)carry;
+		u.p = ((uintptr_t)bn_sub_words & mask) |
+		    ((uintptr_t)bn_add_words & ~mask);
+	} else
 		carry = 1;
 
-	mask  = 0-(uintptr_t)(*u.f)(c_d,r_d,_nist_p_384[0],BN_NIST_384_TOP);
-	mask &= 0-(uintptr_t)carry;
-	res   = c_d;
-	res   = (BN_ULONG *)(((uintptr_t)res&~mask) | ((uintptr_t)r_d&mask));
+	mask = 0 - (uintptr_t)(*u.f)(c_d, r_d, _nist_p_384[0], BN_NIST_384_TOP);
+	mask &= 0 - (uintptr_t)carry;
+	res = c_d;
+	res = (BN_ULONG *)(((uintptr_t)res & ~mask) | ((uintptr_t)r_d & mask));
 	nist_cp_bn(r_d, res, BN_NIST_384_TOP);
 	r->top = BN_NIST_384_TOP;
 	bn_correct_top(r);
 
 	return 1;
-	}
+}
 
 #define BN_NIST_521_RSHIFT	(521%BN_BITS2)
 #define BN_NIST_521_LSHIFT	(BN_BITS2-BN_NIST_521_RSHIFT)
 #define BN_NIST_521_TOP_MASK	((BN_ULONG)BN_MASK2>>BN_NIST_521_LSHIFT)
 
-int BN_nist_mod_521(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
-	BN_CTX *ctx)
-	{
-	int	top = a->top, i;
-	BN_ULONG *r_d, *a_d = a->d,
-		 t_d[BN_NIST_521_TOP],
-		 val,tmp,*res;
+int
+BN_nist_mod_521(BIGNUM *r, const BIGNUM *a, const BIGNUM *field, BN_CTX *ctx)
+{
+	int top = a->top, i;
+	BN_ULONG *r_d, *a_d = a->d, t_d[BN_NIST_521_TOP], val, tmp, *res;
 	uintptr_t mask;
 	static const BIGNUM _bignum_nist_p_521_sqr = {
 		(BN_ULONG *)_nist_p_521_sqr,
-		sizeof(_nist_p_521_sqr)/sizeof(_nist_p_521_sqr[0]),
-		sizeof(_nist_p_521_sqr)/sizeof(_nist_p_521_sqr[0]),
-		0,BN_FLG_STATIC_DATA };
+		sizeof(_nist_p_521_sqr) / sizeof(_nist_p_521_sqr[0]),
+		sizeof(_nist_p_521_sqr) / sizeof(_nist_p_521_sqr[0]),
+		0,
+		BN_FLG_STATIC_DATA
+	};
 
 	field = &_bignum_nist_p_521; /* just to make sure */
 
- 	if (BN_is_negative(a) || BN_ucmp(a,&_bignum_nist_p_521_sqr)>=0)
+	if (BN_is_negative(a) || BN_ucmp(a, &_bignum_nist_p_521_sqr) >= 0)
 		return BN_nnmod(r, a, field, ctx);
 
 	i = BN_ucmp(field, a);
-	if (i == 0)
-		{
+	if (i == 0) {
 		BN_zero(r);
 		return 1;
-		}
-	else if (i > 0)
-		return (r == a)? 1 : (BN_copy(r ,a) != NULL);
+	} else if (i > 0)
+		return (r == a) ? 1 : (BN_copy(r, a) != NULL);
 
-	if (r != a)
-		{
-		if (!bn_wexpand(r,BN_NIST_521_TOP))
+	if (r != a) {
+		if (!bn_wexpand(r, BN_NIST_521_TOP))
 			return 0;
 		r_d = r->d;
-		nist_cp_bn(r_d,a_d, BN_NIST_521_TOP);
-		}
-	else
+		nist_cp_bn(r_d, a_d, BN_NIST_521_TOP);
+	} else
 		r_d = a_d;
 
 	/* upper 521 bits, copy ... */
-	nist_cp_bn_0(t_d,a_d + (BN_NIST_521_TOP-1), top - (BN_NIST_521_TOP-1),BN_NIST_521_TOP);
+	nist_cp_bn_0(t_d, a_d + (BN_NIST_521_TOP - 1),
+	    top - (BN_NIST_521_TOP - 1), BN_NIST_521_TOP);
 	/* ... and right shift */
-	for (val=t_d[0],i=0; i<BN_NIST_521_TOP-1; i++)
-		{
-		tmp = val>>BN_NIST_521_RSHIFT;
-		val = t_d[i+1];
-		t_d[i] = (tmp | val<<BN_NIST_521_LSHIFT) & BN_MASK2;
-		}
-	t_d[i] = val>>BN_NIST_521_RSHIFT;
+	for (val = t_d[0], i = 0; i < BN_NIST_521_TOP - 1; i++) {
+		tmp = val >> BN_NIST_521_RSHIFT;
+		val = t_d[i + 1];
+		t_d[i] = (tmp | val << BN_NIST_521_LSHIFT) & BN_MASK2;
+	}
+	t_d[i] = val >> BN_NIST_521_RSHIFT;
 	/* lower 521 bits */
 	r_d[i] &= BN_NIST_521_TOP_MASK;
 
-	bn_add_words(r_d,r_d,t_d,BN_NIST_521_TOP);
-	mask = 0-(uintptr_t)bn_sub_words(t_d,r_d,_nist_p_521,BN_NIST_521_TOP);
-	res  = t_d;
-	res  = (BN_ULONG *)(((uintptr_t)res&~mask) | ((uintptr_t)r_d&mask));
-	nist_cp_bn(r_d,res,BN_NIST_521_TOP);
+	bn_add_words(r_d, r_d, t_d, BN_NIST_521_TOP);
+	mask = 0 - (uintptr_t)bn_sub_words(t_d, r_d, _nist_p_521,
+	    BN_NIST_521_TOP);
+	res = t_d;
+	res = (BN_ULONG *)(((uintptr_t)res & ~mask) | ((uintptr_t)r_d & mask));
+	nist_cp_bn(r_d, res, BN_NIST_521_TOP);
 	r->top = BN_NIST_521_TOP;
 	bn_correct_top(r);
 
 	return 1;
-	}
+}