Further comment amendments to preserve formatting prior to source reformat

(cherry picked from commit 4a7fa26ffd65bf36beb8d1cb8f29fc0ae203f5c5)

Conflicts:
	crypto/x509v3/pcy_tree.c

Conflicts:
	apps/apps.c
	ssl/ssltest.c

Conflicts:
	apps/apps.c
	crypto/ec/ec2_oct.c
	crypto/ec/ecp_nistp224.c
	crypto/ec/ecp_nistp256.c
	crypto/ec/ecp_nistp521.c
	ssl/s3_cbc.c
	ssl/ssl_sess.c
	ssl/t1_lib.c

Conflicts:
	crypto/bio/b_sock.c
	crypto/pem/pem.h
	crypto/x509/x509_vfy.c
	crypto/x509v3/pcy_tree.c
	ssl/s3_both.c

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

31 files changed, 70 insertions, 39 deletions

diff --git a/apps/ca.c b/apps/ca.c
index 37d1755e53..3f38222070 100644
--- a/apps/ca.c
+++ b/apps/ca.c
@@ -627,7 +627,7 @@ bad:
 			oid_bio=BIO_new_file(p,"r");
 			if (oid_bio == NULL) 
 				{
-				/*
+				/*-
 				BIO_printf(bio_err,"problems opening %s for extra oid's\n",p);
 				ERR_print_errors(bio_err);
 				*/
diff --git a/apps/pkcs7.c b/apps/pkcs7.c
index bdbb10229e..1ab86e50ee 100644
--- a/apps/pkcs7.c
+++ b/apps/pkcs7.c
@@ -71,7 +71,8 @@
 #undef PROG
 #define PROG	pkcs7_main
 
-/* -inform arg	- input format - default PEM (DER or PEM)
+/*-
+ * -inform arg	- input format - default PEM (DER or PEM)
  * -outform arg - output format - default PEM
  * -in arg	- input file - default stdin
  * -out arg	- output file - default stdout
diff --git a/apps/req.c b/apps/req.c
index a6d180e973..c51dac0caa 100644
--- a/apps/req.c
+++ b/apps/req.c
@@ -605,7 +605,7 @@ bad:
 			oid_bio=BIO_new_file(p,"r");
 			if (oid_bio == NULL) 
 				{
-				/*
+				/*-
 				BIO_printf(bio_err,"problems opening %s for extra oid's\n",p);
 				ERR_print_errors(bio_err);
 				*/
diff --git a/apps/s_cb.c b/apps/s_cb.c
index df922f3af5..456aef18f9 100644
--- a/apps/s_cb.c
+++ b/apps/s_cb.c
@@ -204,7 +204,7 @@ int set_cert_stuff(SSL_CTX *ctx, char *cert_file, char *key_file)
 			return(0);
 			}
 
-		/*
+		/*-
 		In theory this is no longer needed 
 		ssl=SSL_new(ctx);
 		x509=SSL_get_certificate(ssl);
diff --git a/crypto/bio/bf_null.c b/crypto/bio/bf_null.c
index c1bf39a904..e179e6d0f5 100644
--- a/crypto/bio/bf_null.c
+++ b/crypto/bio/bf_null.c
@@ -102,9 +102,11 @@ static int nullf_new(BIO *bi)
 static int nullf_free(BIO *a)
 	{
 	if (a == NULL) return(0);
-/*	a->ptr=NULL;
+	/*-
+  	a->ptr=NULL;
 	a->init=0;
-	a->flags=0;*/
+	a->flags=0;
+	*/
 	return(1);
 	}
 	
diff --git a/crypto/bio/bss_rtcp.c b/crypto/bio/bss_rtcp.c
index 7dae485564..dd6038f3bd 100644
--- a/crypto/bio/bss_rtcp.c
+++ b/crypto/bio/bss_rtcp.c
@@ -56,7 +56,8 @@
  * [including the GNU Public Licence.]
  */
 
-/* Written by David L. Jones <jonesd@kcgl1.eng.ohio-state.edu>
+/*-
+ * Written by David L. Jones <jonesd@kcgl1.eng.ohio-state.edu>
  * Date:   22-JUL-1996
  * Revised: 25-SEP-1997		Update for 0.8.1, BIO_CTRL_SET -> BIO_C_SET_FD
  */
diff --git a/crypto/bn/bn_ctx.c b/crypto/bn/bn_ctx.c
index b3452f1a91..5b5aebe43b 100644
--- a/crypto/bn/bn_ctx.c
+++ b/crypto/bn/bn_ctx.c
@@ -66,7 +66,8 @@
 #include "cryptlib.h"
 #include "bn_lcl.h"
 
-/* TODO list
+/*-
+ * TODO list
  *
  * 1. Check a bunch of "(words+1)" type hacks in various bignum functions and
  * check they can be safely removed.
diff --git a/crypto/des/des_old.c b/crypto/des/des_old.c
index 7c33ed7a93..3d42014b5b 100644
--- a/crypto/des/des_old.c
+++ b/crypto/des/des_old.c
@@ -1,6 +1,7 @@
 /* crypto/des/des_old.c -*- mode:C; c-file-style: "eay" -*- */
 
-/* WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
+/*-
+ * WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
  *
  * The function names in here are deprecated and are only present to
  * provide an interface compatible with libdes.  OpenSSL now provides
diff --git a/crypto/des/set_key.c b/crypto/des/set_key.c
index c94dd975fa..50e17afe38 100644
--- a/crypto/des/set_key.c
+++ b/crypto/des/set_key.c
@@ -155,7 +155,8 @@ int DES_is_weak_key(const_DES_cblock *key)
 	return(0);
 	}
 
-/* NOW DEFINED IN des_local.h
+/*-
+ * NOW DEFINED IN des_local.h
  * See ecb_encrypt.c for a pseudo description of these macros. 
  * #define PERM_OP(a,b,t,n,m) ((t)=((((a)>>(n))^(b))&(m)),\
  * 	(b)^=(t),\
@@ -325,7 +326,8 @@ int DES_set_key(const_DES_cblock *key, DES_key_schedule *schedule)
 		}
 	}
 
-/* return 0 if key parity is odd (correct),
+/*-
+ * return 0 if key parity is odd (correct),
  * return -1 if key parity error,
  * return -2 if illegal weak key.
  */
diff --git a/crypto/ec/ec2_mult.c b/crypto/ec/ec2_mult.c
index b54dc50c30..30f71205a4 100644
--- a/crypto/ec/ec2_mult.c
+++ b/crypto/ec/ec2_mult.c
@@ -72,7 +72,8 @@
 #include "ec_lcl.h"
 
 
-/* Compute the x-coordinate x/z for the point 2*(x/z) in Montgomery projective 
+/*-
+ * Compute the x-coordinate x/z for the point 2*(x/z) in Montgomery projective 
  * coordinates.
  * Uses algorithm Mdouble in appendix of 
  *     Lopez, J. and Dahab, R.  "Fast multiplication on elliptic curves over 
@@ -104,7 +105,8 @@ static int gf2m_Mdouble(const EC_GROUP *group, BIGNUM *x, BIGNUM *z, BN_CTX *ctx
 	return ret;
 	}
 
-/* Compute the x-coordinate x1/z1 for the point (x1/z1)+(x2/x2) in Montgomery 
+/*-
+ * Compute the x-coordinate x1/z1 for the point (x1/z1)+(x2/x2) in Montgomery 
  * projective coordinates.
  * Uses algorithm Madd in appendix of 
  *     Lopex, J. and Dahab, R.  "Fast multiplication on elliptic curves over 
diff --git a/crypto/ec/ecp_smpl.c b/crypto/ec/ecp_smpl.c
index e24c7a49d2..8d0075742c 100644
--- a/crypto/ec/ecp_smpl.c
+++ b/crypto/ec/ecp_smpl.c
@@ -113,13 +113,14 @@ const EC_METHOD *EC_GFp_simple_method(void)
 	}
 
 
-/* Most method functions in this file are designed to work with
+/*
+ * Most method functions in this file are designed to work with
  * non-trivial representations of field elements if necessary
  * (see ecp_mont.c): while standard modular addition and subtraction
  * are used, the field_mul and field_sqr methods will be used for
  * multiplication, and field_encode and field_decode (if defined)
  * will be used for converting between representations.
-
+ *
  * Functions ec_GFp_simple_points_make_affine() and
  * ec_GFp_simple_point_get_affine_coordinates() specifically assume
  * that if a non-trivial representation is used, it is a Montgomery
diff --git a/crypto/ecdh/ech_ossl.c b/crypto/ecdh/ech_ossl.c
index 2a40ff12df..c21368ca3d 100644
--- a/crypto/ecdh/ech_ossl.c
+++ b/crypto/ecdh/ech_ossl.c
@@ -100,7 +100,8 @@ const ECDH_METHOD *ECDH_OpenSSL(void)
 	}
 
 
-/* This implementation is based on the following primitives in the IEEE 1363 standard:
+/*-
+ * This implementation is based on the following primitives in the IEEE 1363 standard:
  *  - ECKAS-DH1
  *  - ECSVDP-DH
  * Finally an optional KDF is applied.
diff --git a/crypto/engine/eng_openssl.c b/crypto/engine/eng_openssl.c
index 7c139ae2ef..49cab0e38a 100644
--- a/crypto/engine/eng_openssl.c
+++ b/crypto/engine/eng_openssl.c
@@ -207,7 +207,8 @@ IMPLEMENT_DYNAMIC_BIND_FN(bind_fn)
 #endif /* ENGINE_DYNAMIC_SUPPORT */
 
 #ifdef TEST_ENG_OPENSSL_RC4
-/* This section of code compiles an "alternative implementation" of two modes of
+/*-
+ * This section of code compiles an "alternative implementation" of two modes of
  * RC4 into this ENGINE. The result is that EVP_CIPHER operation for "rc4"
  * should under normal circumstances go via this support rather than the default
  * EVP support. There are other symbols to tweak the testing;
diff --git a/crypto/md5/md5_locl.h b/crypto/md5/md5_locl.h
index 84e81b960d..bb42994fff 100644
--- a/crypto/md5/md5_locl.h
+++ b/crypto/md5/md5_locl.h
@@ -93,7 +93,7 @@ void md5_block_data_order (MD5_CTX *c, const void *p,size_t num);
 
 #include "md32_common.h"
 
-/*
+/*-
 #define	F(x,y,z)	(((x) & (y))  |  ((~(x)) & (z)))
 #define	G(x,y,z)	(((x) & (z))  |  ((y) & (~(z))))
 */
diff --git a/crypto/objects/objects.h b/crypto/objects/objects.h
index 6659acef18..f965a2b315 100644
--- a/crypto/objects/objects.h
+++ b/crypto/objects/objects.h
@@ -604,7 +604,8 @@
 #define NID_pbeWithMD5AndCast5_CBC	112
 #define OBJ_pbeWithMD5AndCast5_CBC	1L,2L,840L,113533L,7L,66L,12L
 
-/* This is one sun will soon be using :-(
+/*-
+ * This is one sun will soon be using :-(
  * id-dsa-with-sha1 ID  ::= {
  *   iso(1) member-body(2) us(840) x9-57 (10040) x9cm(4) 3 }
  */
diff --git a/crypto/ocsp/ocsp_ext.c b/crypto/ocsp/ocsp_ext.c
index 815cc29d58..865f42aecc 100644
--- a/crypto/ocsp/ocsp_ext.c
+++ b/crypto/ocsp/ocsp_ext.c
@@ -360,7 +360,8 @@ int OCSP_basic_add1_nonce(OCSP_BASICRESP *resp, unsigned char *val, int len)
 	return ocsp_add1_nonce(&resp->tbsResponseData->responseExtensions, val, len);
 	}
 
-/* Check nonce validity in a request and response.
+/*-
+ * Check nonce validity in a request and response.
  * Return value reflects result:
  *  1: nonces present and equal.
  *  2: nonces both absent.
diff --git a/crypto/pem/pem.h b/crypto/pem/pem.h
index 6c193f1cbf..f1e9c65d36 100644
--- a/crypto/pem/pem.h
+++ b/crypto/pem/pem.h
@@ -174,7 +174,8 @@ typedef struct pem_ctx_st
 
 	struct	{
 		int cipher;
-	/* unused, and wrong size
+	/*-
+	   unused, and wrong size
 	   unsigned char iv[8]; */
 		} DEK_info;
 		
@@ -197,7 +198,8 @@ typedef struct pem_ctx_st
 	EVP_CIPHER *dec;	/* date encryption cipher */
 	int key_len;		/* key length */
 	unsigned char *key;	/* key */
-	/* unused, and wrong size
+	/*-
+	    unused, and wrong size
 	   unsigned char iv[8]; */
 
 	
diff --git a/crypto/rand/rand_win.c b/crypto/rand/rand_win.c
index c37c416b88..30778d183c 100644
--- a/crypto/rand/rand_win.c
+++ b/crypto/rand/rand_win.c
@@ -375,7 +375,8 @@ int RAND_poll(void)
 		FreeLibrary(user);
 		}
 
-	/* Toolhelp32 snapshot: enumerate processes, threads, modules and heap
+	/*-
+	 * Toolhelp32 snapshot: enumerate processes, threads, modules and heap
 	 * http://msdn.microsoft.com/library/psdk/winbase/toolhelp_5pfd.htm
 	 * (Win 9x and 2000 only, not available on NT)
 	 *
diff --git a/crypto/rc2/rc2_ecb.c b/crypto/rc2/rc2_ecb.c
index fff86c7af8..4214233c65 100644
--- a/crypto/rc2/rc2_ecb.c
+++ b/crypto/rc2/rc2_ecb.c
@@ -62,7 +62,8 @@
 
 const char RC2_version[]="RC2" OPENSSL_VERSION_PTEXT;
 
-/* RC2 as implemented frm a posting from
+/*-
+ * RC2 as implemented frm a posting from
  * Newsgroups: sci.crypt
  * Sender: pgut01@cs.auckland.ac.nz (Peter Gutmann)
  * Subject: Specification for Ron Rivests Cipher No.2
diff --git a/crypto/stack/stack.c b/crypto/stack/stack.c
index 378bd7c796..fb2cc95ad4 100644
--- a/crypto/stack/stack.c
+++ b/crypto/stack/stack.c
@@ -56,7 +56,8 @@
  * [including the GNU Public Licence.]
  */
 
-/* Code for stacks
+/*-
+ * Code for stacks
  * Author - Eric Young v 1.0
  * 1.2 eay 12-Mar-97 -	Modified sk_find so that it _DOES_ return the
  *			lowest index for the searched item.
diff --git a/crypto/threads/mttest.c b/crypto/threads/mttest.c
index f6f3df4b6a..faf445f69c 100644
--- a/crypto/threads/mttest.c
+++ b/crypto/threads/mttest.c
@@ -863,7 +863,7 @@ void solaris_locking_callback(int mode, int type, char *file, int line)
 		(type&CRYPTO_READ)?"r":"w",file,line);
 #endif
 
-	/*
+	/*-
 	if (CRYPTO_LOCK_SSL_CERT == type)
 	fprintf(stderr,"(t,m,f,l) %ld %d %s %d\n",
 		CRYPTO_thread_id(),
@@ -871,7 +871,8 @@ void solaris_locking_callback(int mode, int type, char *file, int line)
 	*/
 	if (mode & CRYPTO_LOCK)
 		{
-	/*	if (mode & CRYPTO_READ)
+	/*-
+		if (mode & CRYPTO_READ)
 			rw_rdlock(&(lock_cs[type]));
 		else
 			rw_wrlock(&(lock_cs[type])); */
@@ -1067,7 +1068,7 @@ void pthreads_locking_callback(int mode, int type, char *file,
 		(mode&CRYPTO_LOCK)?"l":"u",
 		(type&CRYPTO_READ)?"r":"w",file,line);
 #endif
-/*
+/*-
 	if (CRYPTO_LOCK_SSL_CERT == type)
 		fprintf(stderr,"(t,m,f,l) %ld %d %s %d\n",
 		CRYPTO_thread_id(),
diff --git a/crypto/threads/th-lock.c b/crypto/threads/th-lock.c
index 14aae5f912..8daa98c1e5 100644
--- a/crypto/threads/th-lock.c
+++ b/crypto/threads/th-lock.c
@@ -97,7 +97,8 @@ static unsigned long irix_thread_id(void );
 static unsigned long solaris_thread_id(void );
 static unsigned long pthreads_thread_id(void );
 
-/* usage:
+/*-
+ * usage:
  * CRYPTO_thread_setup();
  * application code
  * CRYPTO_thread_cleanup();
diff --git a/crypto/ui/ui_openssl.c b/crypto/ui/ui_openssl.c
index 06270f09cd..23ca813857 100644
--- a/crypto/ui/ui_openssl.c
+++ b/crypto/ui/ui_openssl.c
@@ -56,7 +56,8 @@
  *
  */
 
-/* The lowest level part of this file was previously in crypto/des/read_pwd.c,
+/*-
+ * The lowest level part of this file was previously in crypto/des/read_pwd.c,
  * Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
diff --git a/crypto/x509v3/pcy_tree.c b/crypto/x509v3/pcy_tree.c
index 85966fe451..b1d162e736 100644
--- a/crypto/x509v3/pcy_tree.c
+++ b/crypto/x509v3/pcy_tree.c
@@ -62,7 +62,8 @@
 
 #include "pcy_int.h"
 
-/* Initialize policy tree. Return values:
+/*-
+ * Initialize policy tree. Return values:
  *  0 Some internal error occured.
  * -1 Inconsistent or invalid extensions in certificates.
  *  1 Tree initialized OK.
diff --git a/crypto/x509v3/v3_lib.c b/crypto/x509v3/v3_lib.c
index df3a48f43e..ef3b3d7cc9 100644
--- a/crypto/x509v3/v3_lib.c
+++ b/crypto/x509v3/v3_lib.c
@@ -170,7 +170,8 @@ void *X509V3_EXT_d2i(X509_EXTENSION *ext)
 	return method->d2i(NULL, &p, ext->value->length);
 }
 
-/* Get critical flag and decoded version of extension from a NID.
+/*-
+ * Get critical flag and decoded version of extension from a NID.
  * The "idx" variable returns the last found extension and can
  * be used to retrieve multiple extensions of the same NID.
  * However multiple extensions with the same NID is usually
diff --git a/crypto/x509v3/v3_pku.c b/crypto/x509v3/v3_pku.c
index 076f3ff48e..f531df94f6 100644
--- a/crypto/x509v3/v3_pku.c
+++ b/crypto/x509v3/v3_pku.c
@@ -97,7 +97,7 @@ static int i2r_PKEY_USAGE_PERIOD(X509V3_EXT_METHOD *method,
 	return 1;
 }
 
-/*
+/*-
 static PKEY_USAGE_PERIOD *v2i_PKEY_USAGE_PERIOD(method, ctx, values)
 X509V3_EXT_METHOD *method;
 X509V3_CTX *ctx;
diff --git a/engines/e_sureware.c b/engines/e_sureware.c
index 58fa9a98ee..3594ccda8b 100644
--- a/engines/e_sureware.c
+++ b/engines/e_sureware.c
@@ -1,4 +1,5 @@
-/* Written by Corinne Dive-Reclus(cdive@baltimore.com)
+/*-
+*  Written by Corinne Dive-Reclus(cdive@baltimore.com)
 * 
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/ssl/kssl.c b/ssl/kssl.c
index c550cec9fc..cdd0ae09bb 100644
--- a/ssl/kssl.c
+++ b/ssl/kssl.c
@@ -906,7 +906,8 @@ size_t  *populate_cksumlens(void)
 	return cklens;
 	}
 
-/*	Return pointer to start of real authenticator within authenticator, or
+/*-
+ *	Return pointer to start of real authenticator within authenticator, or
  *	return NULL on error.
  *	Decrypted authenticator looks like this:
  *		[0 or 8 byte confounder] [4-24 byte checksum] [real authent'r]
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index 542ab5a558..409b9e7a2b 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -1533,7 +1533,8 @@ SSL_CTX *SSL_CTX_new(SSL_METHOD *meth)
 	ret->quiet_shutdown=0;
 
 /*	ret->cipher=NULL;*/
-/*	ret->s2->challenge=NULL;
+/*-
+	ret->s2->challenge=NULL;
 	ret->master_key=NULL;
 	ret->key_arg=NULL;
 	ret->s2->conn_id=NULL; */
diff --git a/ssl/ssltest.c b/ssl/ssltest.c
index 995d185052..f5e752b7d8 100644
--- a/ssl/ssltest.c
+++ b/ssl/ssltest.c
@@ -1411,7 +1411,8 @@ int doit(SSL *s_ssl, SSL *c_ssl, long count)
 			if (SSL_in_init(s_ssl))
 				printf("server waiting in SSL_accept - %s\n",
 					SSL_state_string_long(s_ssl));
-/*			else if (s_write)
+/*-
+			else if (s_write)
 				printf("server:SSL_write()\n");
 			else
 				printf("server:SSL_read()\n"); */
@@ -1422,7 +1423,8 @@ int doit(SSL *s_ssl, SSL *c_ssl, long count)
 			if (SSL_in_init(c_ssl))
 				printf("client waiting in SSL_connect - %s\n",
 					SSL_state_string_long(c_ssl));
-/*			else if (c_write)
+/*-
+			else if (c_write)
 				printf("client:SSL_write()\n");
 			else
 				printf("client:SSL_read()\n"); */
diff --git a/ssl/t1_enc.c b/ssl/t1_enc.c
index 4b9383adfa..b884957d49 100644
--- a/ssl/t1_enc.c
+++ b/ssl/t1_enc.c
@@ -528,7 +528,8 @@ err:
 	return(0);
 	}
 
-/* tls1_enc encrypts/decrypts the record in |s->wrec| / |s->rrec|, respectively.
+/*-
+ * tls1_enc encrypts/decrypts the record in |s->wrec| / |s->rrec|, respectively.
  *
  * Returns:
  *   0: (in non-constant time) if the record is publically invalid (i.e. too