More comment changes required for indentOpenSSL_0_9_8-pre-auto-reformat

Reviewed-by: Tim Hudson <tjh@openssl.org>

4 files changed, 92 insertions, 48 deletions

diff --git a/crypto/asn1/d2i_pr.c b/crypto/asn1/d2i_pr.c
index 207ccda5ac..30513dcba5 100644
--- a/crypto/asn1/d2i_pr.c
+++ b/crypto/asn1/d2i_pr.c
@@ -93,8 +93,9 @@ EVP_PKEY *d2i_PrivateKey(int type, EVP_PKEY **a, const unsigned char **pp,
 		{
 #ifndef OPENSSL_NO_RSA
 	case EVP_PKEY_RSA:
+		/* TMP UGLY CAST */
 		if ((ret->pkey.rsa=d2i_RSAPrivateKey(NULL,
-			(const unsigned char **)pp,length)) == NULL) /* TMP UGLY CAST */
+			(const unsigned char **)pp,length)) == NULL)
 			{
 			ASN1err(ASN1_F_D2I_PRIVATEKEY,ERR_R_ASN1_LIB);
 			goto err;
@@ -103,8 +104,9 @@ EVP_PKEY *d2i_PrivateKey(int type, EVP_PKEY **a, const unsigned char **pp,
 #endif
 #ifndef OPENSSL_NO_DSA
 	case EVP_PKEY_DSA:
+		/* TMP UGLY CAST */
 		if ((ret->pkey.dsa=d2i_DSAPrivateKey(NULL,
-			(const unsigned char **)pp,length)) == NULL) /* TMP UGLY CAST */
+			(const unsigned char **)pp,length)) == NULL)
 			{
 			ASN1err(ASN1_F_D2I_PRIVATEKEY,ERR_R_ASN1_LIB);
 			goto err;
diff --git a/crypto/bn/bn.h b/crypto/bn/bn.h
index 9cdbd62b63..79ba102994 100644
--- a/crypto/bn/bn.h
+++ b/crypto/bn/bn.h
@@ -568,7 +568,7 @@ BN_MONT_CTX *BN_MONT_CTX_set_locked(BN_MONT_CTX **pmont, int lock,
 #define	BN_BLINDING_NO_UPDATE	0x00000001
 #define	BN_BLINDING_NO_RECREATE	0x00000002
 
-BN_BLINDING *BN_BLINDING_new(const BIGNUM *A, const BIGNUM *Ai, /* const */ BIGNUM *mod);
+BN_BLINDING *BN_BLINDING_new(const BIGNUM *A, const BIGNUM *Ai, BIGNUM *mod);
 void BN_BLINDING_free(BN_BLINDING *b);
 int BN_BLINDING_update(BN_BLINDING *b,BN_CTX *ctx);
 int BN_BLINDING_convert(BIGNUM *n, BN_BLINDING *b, BN_CTX *ctx);
@@ -580,7 +580,7 @@ void BN_BLINDING_set_thread_id(BN_BLINDING *, unsigned long);
 unsigned long BN_BLINDING_get_flags(const BN_BLINDING *);
 void BN_BLINDING_set_flags(BN_BLINDING *, unsigned long);
 BN_BLINDING *BN_BLINDING_create_param(BN_BLINDING *b,
-	const BIGNUM *e, /* const */ BIGNUM *m, BN_CTX *ctx,
+	const BIGNUM *e, BIGNUM *m, BN_CTX *ctx,
 	int (*bn_mod_exp)(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
 			  const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx),
 	BN_MONT_CTX *m_ctx);
diff --git a/crypto/bn/bn_blind.c b/crypto/bn/bn_blind.c
index ca7f996bc8..161ee1a78c 100644
--- a/crypto/bn/bn_blind.c
+++ b/crypto/bn/bn_blind.c
@@ -131,7 +131,7 @@ struct bn_blinding_st
 			  BN_MONT_CTX *m_ctx);
 	};
 
-BN_BLINDING *BN_BLINDING_new(const BIGNUM *A, const BIGNUM *Ai, /* const */ BIGNUM *mod)
+BN_BLINDING *BN_BLINDING_new(const BIGNUM *A, const BIGNUM *Ai, BIGNUM *mod)
 	{
 	BN_BLINDING *ret=NULL;
 
@@ -293,7 +293,7 @@ void BN_BLINDING_set_flags(BN_BLINDING *b, unsigned long flags)
 	}
 
 BN_BLINDING *BN_BLINDING_create_param(BN_BLINDING *b,
-	const BIGNUM *e, /* const */ BIGNUM *m, BN_CTX *ctx,
+	const BIGNUM *e, BIGNUM *m, BN_CTX *ctx,
 	int (*bn_mod_exp)(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
 			  const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx),
 	BN_MONT_CTX *m_ctx)
diff --git a/crypto/camellia/camellia.c b/crypto/camellia/camellia.c
index 491c26b39e..905e7a7476 100644
--- a/crypto/camellia/camellia.c
+++ b/crypto/camellia/camellia.c
@@ -703,76 +703,94 @@ void camellia_setup128(const u8 *key, u32 *subkey)
 	CamelliaSubkeyR(24) = subr(24) ^ subr(23);
 
 	/* apply the inverse of the last half of P-function */
+	/* round 1 */
 	dw = CamelliaSubkeyL(2) ^ CamelliaSubkeyR(2),
-		dw = CAMELLIA_RL8(dw);/* round 1 */
+		dw = CAMELLIA_RL8(dw);
 	CamelliaSubkeyR(2) = CamelliaSubkeyL(2) ^ dw,
 		CamelliaSubkeyL(2) = dw;
+	/* round 2 */
 	dw = CamelliaSubkeyL(3) ^ CamelliaSubkeyR(3),
-		dw = CAMELLIA_RL8(dw);/* round 2 */
+		dw = CAMELLIA_RL8(dw);
 	CamelliaSubkeyR(3) = CamelliaSubkeyL(3) ^ dw,
 		CamelliaSubkeyL(3) = dw;
+	/* round 3 */
 	dw = CamelliaSubkeyL(4) ^ CamelliaSubkeyR(4),
-		dw = CAMELLIA_RL8(dw);/* round 3 */
+		dw = CAMELLIA_RL8(dw);
 	CamelliaSubkeyR(4) = CamelliaSubkeyL(4) ^ dw,
 		CamelliaSubkeyL(4) = dw;
+	/* round 4 */
 	dw = CamelliaSubkeyL(5) ^ CamelliaSubkeyR(5),
-		dw = CAMELLIA_RL8(dw);/* round 4 */
+		dw = CAMELLIA_RL8(dw);
 	CamelliaSubkeyR(5) = CamelliaSubkeyL(5) ^ dw,
 		CamelliaSubkeyL(5) = dw;
+	/* round 5 */
 	dw = CamelliaSubkeyL(6) ^ CamelliaSubkeyR(6),
-		dw = CAMELLIA_RL8(dw);/* round 5 */
+		dw = CAMELLIA_RL8(dw);
 	CamelliaSubkeyR(6) = CamelliaSubkeyL(6) ^ dw,
 		CamelliaSubkeyL(6) = dw;
+	/* round 6 */
 	dw = CamelliaSubkeyL(7) ^ CamelliaSubkeyR(7),
-		dw = CAMELLIA_RL8(dw);/* round 6 */
+		dw = CAMELLIA_RL8(dw);
 	CamelliaSubkeyR(7) = CamelliaSubkeyL(7) ^ dw,
 		CamelliaSubkeyL(7) = dw;
+	/* round 7 */
 	dw = CamelliaSubkeyL(10) ^ CamelliaSubkeyR(10),
-		dw = CAMELLIA_RL8(dw);/* round 7 */
+		dw = CAMELLIA_RL8(dw);
 	CamelliaSubkeyR(10) = CamelliaSubkeyL(10) ^ dw,
 		CamelliaSubkeyL(10) = dw;
+	/* round 8 */
 	dw = CamelliaSubkeyL(11) ^ CamelliaSubkeyR(11),
-		dw = CAMELLIA_RL8(dw);/* round 8 */
+		dw = CAMELLIA_RL8(dw);
 	CamelliaSubkeyR(11) = CamelliaSubkeyL(11) ^ dw,
 		CamelliaSubkeyL(11) = dw;
+	/* round 9 */
 	dw = CamelliaSubkeyL(12) ^ CamelliaSubkeyR(12),
-		dw = CAMELLIA_RL8(dw);/* round 9 */
+		dw = CAMELLIA_RL8(dw);
 	CamelliaSubkeyR(12) = CamelliaSubkeyL(12) ^ dw,
 		CamelliaSubkeyL(12) = dw;
+	/* round 10 */
 	dw = CamelliaSubkeyL(13) ^ CamelliaSubkeyR(13),
-		dw = CAMELLIA_RL8(dw);/* round 10 */
+		dw = CAMELLIA_RL8(dw);
 	CamelliaSubkeyR(13) = CamelliaSubkeyL(13) ^ dw,
 		CamelliaSubkeyL(13) = dw;
+	/* round 11 */
 	dw = CamelliaSubkeyL(14) ^ CamelliaSubkeyR(14),
-		dw = CAMELLIA_RL8(dw);/* round 11 */
+		dw = CAMELLIA_RL8(dw);
 	CamelliaSubkeyR(14) = CamelliaSubkeyL(14) ^ dw,
 		CamelliaSubkeyL(14) = dw;
+	/* round 12 */
 	dw = CamelliaSubkeyL(15) ^ CamelliaSubkeyR(15),
-		dw = CAMELLIA_RL8(dw);/* round 12 */
+		dw = CAMELLIA_RL8(dw);
 	CamelliaSubkeyR(15) = CamelliaSubkeyL(15) ^ dw,
 		CamelliaSubkeyL(15) = dw;
+	/* round 13 */
 	dw = CamelliaSubkeyL(18) ^ CamelliaSubkeyR(18),
-		dw = CAMELLIA_RL8(dw);/* round 13 */
+		dw = CAMELLIA_RL8(dw);
 	CamelliaSubkeyR(18) = CamelliaSubkeyL(18) ^ dw,
 		CamelliaSubkeyL(18) = dw;
+	/* round 14 */
 	dw = CamelliaSubkeyL(19) ^ CamelliaSubkeyR(19),
-		dw = CAMELLIA_RL8(dw);/* round 14 */
+		dw = CAMELLIA_RL8(dw);
 	CamelliaSubkeyR(19) = CamelliaSubkeyL(19) ^ dw,
 		CamelliaSubkeyL(19) = dw;
+	/* round 15 */
 	dw = CamelliaSubkeyL(20) ^ CamelliaSubkeyR(20),
-		dw = CAMELLIA_RL8(dw);/* round 15 */
+		dw = CAMELLIA_RL8(dw);
 	CamelliaSubkeyR(20) = CamelliaSubkeyL(20) ^ dw,
 		CamelliaSubkeyL(20) = dw;
+	/* round 16 */
 	dw = CamelliaSubkeyL(21) ^ CamelliaSubkeyR(21),
-		dw = CAMELLIA_RL8(dw);/* round 16 */
+		dw = CAMELLIA_RL8(dw);
 	CamelliaSubkeyR(21) = CamelliaSubkeyL(21) ^ dw,
 		CamelliaSubkeyL(21) = dw;
+	/* round 17 */
 	dw = CamelliaSubkeyL(22) ^ CamelliaSubkeyR(22),
-		dw = CAMELLIA_RL8(dw);/* round 17 */
+		dw = CAMELLIA_RL8(dw);
 	CamelliaSubkeyR(22) = CamelliaSubkeyL(22) ^ dw,
 		CamelliaSubkeyL(22) = dw;
+	/* round 18 */
 	dw = CamelliaSubkeyL(23) ^ CamelliaSubkeyR(23),
-		dw = CAMELLIA_RL8(dw);/* round 18 */
+		dw = CAMELLIA_RL8(dw);
 	CamelliaSubkeyR(23) = CamelliaSubkeyL(23) ^ dw,
 		CamelliaSubkeyL(23) = dw;
 
@@ -1090,100 +1108,124 @@ void camellia_setup256(const u8 *key, u32 *subkey)
 	CamelliaSubkeyR(32) = subr(32) ^ subr(31);
 
 	/* apply the inverse of the last half of P-function */
+	/* round 1 */
 	dw = CamelliaSubkeyL(2) ^ CamelliaSubkeyR(2),
-		dw = CAMELLIA_RL8(dw);/* round 1 */
+		dw = CAMELLIA_RL8(dw);
 	CamelliaSubkeyR(2) = CamelliaSubkeyL(2) ^ dw,
 		CamelliaSubkeyL(2) = dw;
+	/* round 2 */
 	dw = CamelliaSubkeyL(3) ^ CamelliaSubkeyR(3),
-		dw = CAMELLIA_RL8(dw);/* round 2 */
+		dw = CAMELLIA_RL8(dw);
 	CamelliaSubkeyR(3) = CamelliaSubkeyL(3) ^ dw,
 		CamelliaSubkeyL(3) = dw;
+	/* round 3 */
 	dw = CamelliaSubkeyL(4) ^ CamelliaSubkeyR(4),
-		dw = CAMELLIA_RL8(dw);/* round 3 */
+		dw = CAMELLIA_RL8(dw);
 	CamelliaSubkeyR(4) = CamelliaSubkeyL(4) ^ dw,
 		CamelliaSubkeyL(4) = dw;
+	/* round 4 */
 	dw = CamelliaSubkeyL(5) ^ CamelliaSubkeyR(5),
-		dw = CAMELLIA_RL8(dw);/* round 4 */
+		dw = CAMELLIA_RL8(dw);
 	CamelliaSubkeyR(5) = CamelliaSubkeyL(5) ^ dw,
 		CamelliaSubkeyL(5) = dw;
+	/* round 5 */
 	dw = CamelliaSubkeyL(6) ^ CamelliaSubkeyR(6),
-		dw = CAMELLIA_RL8(dw);/* round 5 */
+		dw = CAMELLIA_RL8(dw);
 	CamelliaSubkeyR(6) = CamelliaSubkeyL(6) ^ dw,
 		CamelliaSubkeyL(6) = dw;
+	/* round 6 */
 	dw = CamelliaSubkeyL(7) ^ CamelliaSubkeyR(7),
-		dw = CAMELLIA_RL8(dw);/* round 6 */
+		dw = CAMELLIA_RL8(dw);
 	CamelliaSubkeyR(7) = CamelliaSubkeyL(7) ^ dw,
 		CamelliaSubkeyL(7) = dw;
+	/* round 7 */
 	dw = CamelliaSubkeyL(10) ^ CamelliaSubkeyR(10),
-		dw = CAMELLIA_RL8(dw);/* round 7 */
+		dw = CAMELLIA_RL8(dw);
 	CamelliaSubkeyR(10) = CamelliaSubkeyL(10) ^ dw,
 		CamelliaSubkeyL(10) = dw;
+	/* round 8 */
 	dw = CamelliaSubkeyL(11) ^ CamelliaSubkeyR(11),
-		dw = CAMELLIA_RL8(dw);/* round 8 */
+		dw = CAMELLIA_RL8(dw);
 	CamelliaSubkeyR(11) = CamelliaSubkeyL(11) ^ dw,
 		CamelliaSubkeyL(11) = dw;
+	/* round 9 */
 	dw = CamelliaSubkeyL(12) ^ CamelliaSubkeyR(12),
-		dw = CAMELLIA_RL8(dw);/* round 9 */
+		dw = CAMELLIA_RL8(dw);
 	CamelliaSubkeyR(12) = CamelliaSubkeyL(12) ^ dw,
 		CamelliaSubkeyL(12) = dw;
+	/* round 10 */
 	dw = CamelliaSubkeyL(13) ^ CamelliaSubkeyR(13),
-		dw = CAMELLIA_RL8(dw);/* round 10 */
+		dw = CAMELLIA_RL8(dw);
 	CamelliaSubkeyR(13) = CamelliaSubkeyL(13) ^ dw,
 		CamelliaSubkeyL(13) = dw;
+	/* round 11 */
 	dw = CamelliaSubkeyL(14) ^ CamelliaSubkeyR(14),
-		dw = CAMELLIA_RL8(dw);/* round 11 */
+		dw = CAMELLIA_RL8(dw);
 	CamelliaSubkeyR(14) = CamelliaSubkeyL(14) ^ dw,
 		CamelliaSubkeyL(14) = dw;
+	/* round 12 */
 	dw = CamelliaSubkeyL(15) ^ CamelliaSubkeyR(15),
-		dw = CAMELLIA_RL8(dw);/* round 12 */
+		dw = CAMELLIA_RL8(dw);
 	CamelliaSubkeyR(15) = CamelliaSubkeyL(15) ^ dw,
 		CamelliaSubkeyL(15) = dw;
+	/* round 13 */
 	dw = CamelliaSubkeyL(18) ^ CamelliaSubkeyR(18),
-		dw = CAMELLIA_RL8(dw);/* round 13 */
+		dw = CAMELLIA_RL8(dw);
 	CamelliaSubkeyR(18) = CamelliaSubkeyL(18) ^ dw,
 		CamelliaSubkeyL(18) = dw;
+	/* round 14 */
 	dw = CamelliaSubkeyL(19) ^ CamelliaSubkeyR(19),
-		dw = CAMELLIA_RL8(dw);/* round 14 */
+		dw = CAMELLIA_RL8(dw);
 	CamelliaSubkeyR(19) = CamelliaSubkeyL(19) ^ dw,
 		CamelliaSubkeyL(19) = dw;
+	/* round 15 */
 	dw = CamelliaSubkeyL(20) ^ CamelliaSubkeyR(20),
-		dw = CAMELLIA_RL8(dw);/* round 15 */
+		dw = CAMELLIA_RL8(dw);
 	CamelliaSubkeyR(20) = CamelliaSubkeyL(20) ^ dw,
 		CamelliaSubkeyL(20) = dw;
+	/* round 16 */
 	dw = CamelliaSubkeyL(21) ^ CamelliaSubkeyR(21),
-		dw = CAMELLIA_RL8(dw);/* round 16 */
+		dw = CAMELLIA_RL8(dw);
 	CamelliaSubkeyR(21) = CamelliaSubkeyL(21) ^ dw,
 		CamelliaSubkeyL(21) = dw;
+	/* round 17 */
 	dw = CamelliaSubkeyL(22) ^ CamelliaSubkeyR(22),
-		dw = CAMELLIA_RL8(dw);/* round 17 */
+		dw = CAMELLIA_RL8(dw);
 	CamelliaSubkeyR(22) = CamelliaSubkeyL(22) ^ dw,
 		CamelliaSubkeyL(22) = dw;
+	/* round 18 */
 	dw = CamelliaSubkeyL(23) ^ CamelliaSubkeyR(23),
-		dw = CAMELLIA_RL8(dw);/* round 18 */
+		dw = CAMELLIA_RL8(dw);
 	CamelliaSubkeyR(23) = CamelliaSubkeyL(23) ^ dw,
 		CamelliaSubkeyL(23) = dw;
+	/* round 19 */
 	dw = CamelliaSubkeyL(26) ^ CamelliaSubkeyR(26),
-		dw = CAMELLIA_RL8(dw);/* round 19 */
+		dw = CAMELLIA_RL8(dw);
 	CamelliaSubkeyR(26) = CamelliaSubkeyL(26) ^ dw,
 		CamelliaSubkeyL(26) = dw;
+	/* round 20 */
 	dw = CamelliaSubkeyL(27) ^ CamelliaSubkeyR(27),
-		dw = CAMELLIA_RL8(dw);/* round 20 */
+		dw = CAMELLIA_RL8(dw);
 	CamelliaSubkeyR(27) = CamelliaSubkeyL(27) ^ dw,
 		CamelliaSubkeyL(27) = dw;
+	/* round 21 */
 	dw = CamelliaSubkeyL(28) ^ CamelliaSubkeyR(28),
-		dw = CAMELLIA_RL8(dw);/* round 21 */
+		dw = CAMELLIA_RL8(dw);
 	CamelliaSubkeyR(28) = CamelliaSubkeyL(28) ^ dw,
 		CamelliaSubkeyL(28) = dw;
+	/* round 22 */
 	dw = CamelliaSubkeyL(29) ^ CamelliaSubkeyR(29),
-		dw = CAMELLIA_RL8(dw);/* round 22 */
+		dw = CAMELLIA_RL8(dw);
 	CamelliaSubkeyR(29) = CamelliaSubkeyL(29) ^ dw,
 		CamelliaSubkeyL(29) = dw;
+	/* round 23 */
 	dw = CamelliaSubkeyL(30) ^ CamelliaSubkeyR(30),
-		dw = CAMELLIA_RL8(dw);/* round 23 */
+		dw = CAMELLIA_RL8(dw);
 	CamelliaSubkeyR(30) = CamelliaSubkeyL(30) ^ dw,
 		CamelliaSubkeyL(30) = dw;
+	/* round 24 */
 	dw = CamelliaSubkeyL(31) ^ CamelliaSubkeyR(31),
-		dw = CAMELLIA_RL8(dw);/* round 24 */
+		dw = CAMELLIA_RL8(dw);
 	CamelliaSubkeyR(31) = CamelliaSubkeyL(31) ^ dw,
 		CamelliaSubkeyL(31) = dw;