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

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

11 files changed, 135 insertions, 75 deletions

diff --git a/apps/speed.c b/apps/speed.c
index 29b3239952..c133867777 100644
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -113,7 +113,8 @@
 #elif !defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_VXWORKS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC))
 # define TIMES
 #endif
-#if !defined(_UNICOS) && !defined(__OpenBSD__) && !defined(sgi) && !defined(__FreeBSD__) && !(defined(__bsdi) || defined(__bsdi__)) && !defined(_AIX) && !defined(OPENSSL_SYS_MPE) && !defined(__NetBSD__) && !defined(OPENSSL_SYS_VXWORKS) /* FIXME */
+/* FIXME */
+#if !defined(_UNICOS) && !defined(__OpenBSD__) && !defined(sgi) && !defined(__FreeBSD__) && !(defined(__bsdi) || defined(__bsdi__)) && !defined(_AIX) && !defined(OPENSSL_SYS_MPE) && !defined(__NetBSD__) && !defined(OPENSSL_SYS_VXWORKS)
 # define TIMEB
 #endif
 
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;
 
diff --git a/fips/aes/fips_aesavs.c b/fips/aes/fips_aesavs.c
index a3c8b400af..56755b2a7a 100644
--- a/fips/aes/fips_aesavs.c
+++ b/fips/aes/fips_aesavs.c
@@ -91,8 +91,9 @@ int main(int argc, char *argv[])
 
 static int AESTest(EVP_CIPHER_CTX *ctx,
 	    char *amode, int akeysz, unsigned char *aKey, 
-	    unsigned char *iVec, 
-	    int dir,  /* 0 = decrypt, 1 = encrypt */
+	    unsigned char *iVec,
+	    /* 0 = decrypt, 1 = encrypt */ 
+	    int dir,
 	    unsigned char *plaintext, unsigned char *ciphertext, int len)
     {
     const EVP_CIPHER *cipher = NULL;
@@ -296,8 +297,9 @@ static int do_mct(char *amode,
 	    case ECB:
 		if (j == 0)
 		    { /* set up encryption */
-		    ret = AESTest(&ctx, amode, akeysz, key[i], NULL, 
-				  dir,  /* 0 = decrypt, 1 = encrypt */
+		    ret = AESTest(&ctx, amode, akeysz, key[i], NULL,
+				/* 0 = decrypt, 1 = encrypt */
+				  dir,
 				  ptext[j], ctext[j], len);
 		    if (dir == XENCRYPT)
 			memcpy(ptext[j+1], ctext[j], len);
@@ -324,8 +326,9 @@ static int do_mct(char *amode,
 	    case CFB128:
 		if (j == 0)
 		    {
-		    ret = AESTest(&ctx, amode, akeysz, key[i], iv[i], 
-				  dir,  /* 0 = decrypt, 1 = encrypt */
+		    ret = AESTest(&ctx, amode, akeysz, key[i], iv[i],
+				/* 0 = decrypt, 1 = encrypt */
+				  dir,  
 				  ptext[j], ctext[j], len);
 		    if (dir == XENCRYPT)
 			memcpy(ptext[j+1], iv[i], len);
@@ -351,7 +354,8 @@ static int do_mct(char *amode,
 		if (j == 0)
 		    {
 		    ret = AESTest(&ctx, amode, akeysz, key[i], iv[i], 
-				  dir,  /* 0 = decrypt, 1 = encrypt */
+				/* 0 = decrypt, 1 = encrypt */
+				  dir,  
 				  ptext[j], ctext[j], len);
 		    }
 		else
@@ -423,7 +427,8 @@ static int do_mct(char *amode,
 	if (dir == XENCRYPT)
 	    {
 	    if (imode == CFB8)
-		{ /* ct = CT[j-15] || CT[j-14] || ... || CT[j] */
+		{
+		/* ct = CT[j-15] || CT[j-14] || ... || CT[j] */
 		for (n1 = 0, n2 = nkeysz-1; n1 < nkeysz; ++n1, --n2)
 		    ciphertext[n1] = ctext[j-n2][0];
 		}
@@ -451,7 +456,8 @@ static int do_mct(char *amode,
 	else
 	    {
 	    if (imode == CFB8)
-		{ /* ct = CT[j-15] || CT[j-14] || ... || CT[j] */
+		{
+		/* ct = CT[j-15] || CT[j-14] || ... || CT[j] */
 		for (n1 = 0, n2 = nkeysz-1; n1 < nkeysz; ++n1, --n2)
 		    ciphertext[n1] = ptext[j-n2][0];
 		}
@@ -782,7 +788,8 @@ static int proc_file(char *rqfile, char *rspfile)
 		else
 		    {
 		    ret = AESTest(&ctx, amode, akeysz, aKey, iVec, 
-				  dir,  /* 0 = decrypt, 1 = encrypt */
+				/* 0 = decrypt, 1 = encrypt */
+				  dir,  
 				  plaintext, ciphertext, len);
 		    OutputValue("CIPHERTEXT",ciphertext,len,rfp,
 				!strcmp(amode,"CFB1"));
@@ -820,7 +827,8 @@ static int proc_file(char *rqfile, char *rspfile)
 		else
 		    {
 		    ret = AESTest(&ctx, amode, akeysz, aKey, iVec, 
-				  dir,  /* 0 = decrypt, 1 = encrypt */
+				/* 0 = decrypt, 1 = encrypt */
+				  dir,  
 				  plaintext, ciphertext, len);
 		    OutputValue("PLAINTEXT",(unsigned char *)plaintext,len,rfp,
 				!strcmp(amode,"CFB1"));
diff --git a/fips/des/fips_desmovs.c b/fips/des/fips_desmovs.c
index f96a5cabd4..453f6780e1 100644
--- a/fips/des/fips_desmovs.c
+++ b/fips/des/fips_desmovs.c
@@ -90,8 +90,9 @@ int main(int argc, char *argv[])
 
 static int DESTest(EVP_CIPHER_CTX *ctx,
 	    char *amode, int akeysz, unsigned char *aKey, 
-	    unsigned char *iVec, 
-	    int dir,  /* 0 = decrypt, 1 = encrypt */
+	    unsigned char *iVec,
+	    /* 0 = decrypt, 1 = encrypt */
+	    int dir,
 	    unsigned char *out, unsigned char *in, int len)
     {
     const EVP_CIPHER *cipher = NULL;
@@ -544,8 +545,9 @@ static int proc_file(char *rqfile, char *rspfile)
 		else
 		    {
 		    assert(dir == 1);
-		    ret = DESTest(&ctx, amode, akeysz, aKey, iVec, 
-				  dir,  /* 0 = decrypt, 1 = encrypt */
+		    ret = DESTest(&ctx, amode, akeysz, aKey, iVec,
+				/* 0 = decrypt, 1 = encrypt */
+				  dir,
 				  ciphertext, plaintext, len);
 		    OutputValue("CIPHERTEXT",ciphertext,len,rfp,
 				!strcmp(amode,"CFB1"));
@@ -584,7 +586,8 @@ static int proc_file(char *rqfile, char *rspfile)
 		    {
 		    assert(dir == 0);
 		    ret = DESTest(&ctx, amode, akeysz, aKey, iVec, 
-				  dir,  /* 0 = decrypt, 1 = encrypt */
+				/* 0 = decrypt, 1 = encrypt */
+				  dir,  
 				  plaintext, ciphertext, len);
 		    OutputValue("PLAINTEXT",(unsigned char *)plaintext,len,rfp,
 				!strcmp(amode,"CFB1"));
diff --git a/fips/fips_canister.c b/fips/fips_canister.c
index 174466189b..c30362e5da 100644
--- a/fips/fips_canister.c
+++ b/fips/fips_canister.c
@@ -84,7 +84,8 @@ static void *instruction_pointer(void)
     __asm __volatile (	"move	%1,$31\n\t"	/* save ra */
 			"bal	.+8; nop\n\t"
 			"move	%0,$31\n\t"
-			"move	$31,%1"		/* restore ra */
+			/* restore ra */
+			"move	$31,%1"		
 			: "=r"(ret),"=r"(scratch) );
 # elif	defined(__ppc__) || defined(__powerpc) || defined(__powerpc__) || \
 	defined(__POWERPC__) || defined(_POWER) || defined(__PPC__) || \
diff --git a/fips/rsa/fips_rsa_eay.c b/fips/rsa/fips_rsa_eay.c
index 937a14e684..3d4c620845 100644
--- a/fips/rsa/fips_rsa_eay.c
+++ b/fips/rsa/fips_rsa_eay.c
@@ -304,11 +304,12 @@ static BN_BLINDING *rsa_get_blinding(RSA *rsa, int *local, BN_CTX *ctx)
 		{
 		/* resort to rsa->mt_blinding instead */
 
-		*local = 0; /* instructs rsa_blinding_convert(), rsa_blinding_invert()
-		             * that the BN_BLINDING is shared, meaning that accesses
-		             * require locks, and that the blinding factor must be
-		             * stored outside the BN_BLINDING
-		             */
+		/* instructs rsa_blinding_convert(), rsa_blinding_invert()
+		 * that the BN_BLINDING is shared, meaning that accesses
+		 * require locks, and that the blinding factor must be
+		 * stored outside the BN_BLINDING
+		 */
+		*local = 0;
 
 		if (rsa->mt_blinding == NULL)
 			{
diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c
index 778c048a28..c03f6d5b15 100644
--- a/ssl/s3_srvr.c
+++ b/ssl/s3_srvr.c
@@ -1035,9 +1035,10 @@ int ssl3_get_client_hello(SSL *s)
 #endif
 
 	/* TLS does not mind if there is extra stuff */
-#if 0   /* SSL 3.0 does not mind either, so we should disable this test
-         * (was enabled in 0.9.6d through 0.9.6j and 0.9.7 through 0.9.7b,
-         * in earlier SSLeay/OpenSSL releases this test existed but was buggy) */
+#if 0
+	/* SSL 3.0 does not mind either, so we should disable this test
+	 * (was enabled in 0.9.6d through 0.9.6j and 0.9.7 through 0.9.7b,
+	 * in earlier SSLeay/OpenSSL releases this test existed but was buggy) */
 	if (s->version == SSL3_VERSION)
 		{
 		if (p < (d+n))
diff --git a/ssl/ssl.h b/ssl/ssl.h
index 40d987585f..5a87a0267c 100644
--- a/ssl/ssl.h
+++ b/ssl/ssl.h
@@ -320,7 +320,8 @@ extern "C" {
 /* The following cipher list is used by default.
  * It also is substituted when an application-defined cipher list string
  * starts with 'DEFAULT'. */
-#define SSL_DEFAULT_CIPHER_LIST	"AES:ALL:!aNULL:!eNULL:+RC4:@STRENGTH" /* low priority for RC4 */
+/* low priority for RC4 */
+#define SSL_DEFAULT_CIPHER_LIST	"AES:ALL:!aNULL:!eNULL:+RC4:@STRENGTH"
 
 /* Used in SSL_set_shutdown()/SSL_get_shutdown(); */
 #define SSL_SENT_SHUTDOWN	1