More comments

Conflicts:
	crypto/dsa/dsa_vrf.c
	crypto/ec/ec2_smpl.c
	crypto/ec/ecp_smpl.c

Conflicts:
	demos/bio/saccept.c
	ssl/d1_clnt.c

Conflicts:
	bugs/dggccbug.c
	demos/tunala/cb.c

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

diff --git a/bugs/alpha.c b/bugs/alpha.c
index 701d6a7c74227c8c6c65cd10f9fee1c63357dd2f..2c90a6d3efd3422739e0370c73ef840bb4941280 100644 (file)
--- a/bugs/alpha.c
+++ b/bugs/alpha.c
@@ -60,7 +60,8 @@
  * something to watch out for.  This was fine on linux/NT/Solaris but not
  * Alpha */
 
  * something to watch out for.  This was fine on linux/NT/Solaris but not
  * Alpha */
 

-/* it is basically an example of
+/*-
+ * it is basically an example of

  * func(*(a++),*(a++))
  * which parameter is evaluated first?  It is not defined in ASN1 C.
  */
  * func(*(a++),*(a++))
  * which parameter is evaluated first?  It is not defined in ASN1 C.
  */

diff --git a/crypto/bio/bss_file.c b/crypto/bio/bss_file.c
index 4a4e747bc718be95cd06e0bca7393b5417f0f238..962b4068eaf1362b501bd7c3cda24d9e29a1e350 100644 (file)
--- a/crypto/bio/bss_file.c
+++ b/crypto/bio/bss_file.c
@@ -56,7 +56,7 @@
  * [including the GNU Public Licence.]
  */
 
  * [including the GNU Public Licence.]
  */
 

-/*
+/*-

  * 03-Dec-1997 rdenny@dc3.com  Fix bug preventing use of stdin/stdout
  *             with binary data (e.g. asn1parse -inform DER < xxx) under
  *             Windows
  * 03-Dec-1997 rdenny@dc3.com  Fix bug preventing use of stdin/stdout
  *             with binary data (e.g. asn1parse -inform DER < xxx) under
  *             Windows

diff --git a/crypto/crypto.h b/crypto/crypto.h
index 1b76ada44cc60463ecb733fdf1ae0ed8355fc2a4..7ee56fa38c2d8840941af2da941996aa391d852d 100644 (file)
--- a/crypto/crypto.h
+++ b/crypto/crypto.h
@@ -517,7 +517,8 @@ int CRYPTO_remove_all_info(void);
 
 /* Default debugging functions (enabled by CRYPTO_malloc_debug_init() macro;
  * used as default in CRYPTO_MDEBUG compilations): */
 
 /* Default debugging functions (enabled by CRYPTO_malloc_debug_init() macro;
  * used as default in CRYPTO_MDEBUG compilations): */

-/* The last argument has the following significance:
+/*-
+ * The last argument has the following significance:

  *
  * 0:  called before the actual memory allocation has taken place
  * 1:  called after the actual memory allocation has taken place
  *
  * 0:  called before the actual memory allocation has taken place
  * 1:  called after the actual memory allocation has taken place

diff --git a/crypto/dso/dso_dlfcn.c b/crypto/dso/dso_dlfcn.c
index 32386c6eaefa67dcd691eae4d26c0efde85dbf1b..df4292f71c7b629ad27f45775eaf90421ac1623d 100644 (file)
--- a/crypto/dso/dso_dlfcn.c
+++ b/crypto/dso/dso_dlfcn.c
@@ -397,7 +397,7 @@ static char *dlfcn_name_converter(DSO *dso, const char *filename)
        }
 
 #ifdef __sgi
        }
 
 #ifdef __sgi

-/*
+/*-

 This is a quote from IRIX manual for dladdr(3c):
 
      <dlfcn.h> does not contain a prototype for dladdr or definition of
 This is a quote from IRIX manual for dladdr(3c):
 
      <dlfcn.h> does not contain a prototype for dladdr or definition of

diff --git a/crypto/ec/ec2_smpl.c b/crypto/ec/ec2_smpl.c
index 716036079af109acd9dfb09b3bd9a22acc526159..2fcfb4f052f0d54166c56fd84bc264386bcd1f82 100644 (file)
--- a/crypto/ec/ec2_smpl.c
+++ b/crypto/ec/ec2_smpl.c
@@ -553,7 +553,8 @@ int ec_GF2m_simple_is_at_infinity(const EC_GROUP *group, const EC_POINT *point)
        }
 
 
        }
 
 

-/* Determines whether the given EC_POINT is an actual point on the curve defined
+/*-
+ * Determines whether the given EC_POINT is an actual point on the curve defined

  * in the EC_GROUP.  A point is valid if it satisfies the Weierstrass equation:
  *      y^2 + x*y = x^3 + a*x^2 + b.
  */
  * in the EC_GROUP.  A point is valid if it satisfies the Weierstrass equation:
  *      y^2 + x*y = x^3 + a*x^2 + b.
  */

diff --git a/crypto/ec/ecp_smpl.c b/crypto/ec/ecp_smpl.c
index 16573699ab93f8d47093ed282768830dfda21ba8..f17821c19608739dcc8f775dc3e9bf3355ccaa01 100644 (file)
--- a/crypto/ec/ecp_smpl.c
+++ b/crypto/ec/ecp_smpl.c
@@ -871,8 +871,10 @@ int ec_GFp_simple_dbl(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a, BN_
                if (!field_mul(group, n1, n0, n2, ctx)) goto err;
                if (!BN_mod_lshift1_quick(n0, n1, p)) goto err;
                if (!BN_mod_add_quick(n1, n0, n1, p)) goto err;
                if (!field_mul(group, n1, n0, n2, ctx)) goto err;
                if (!BN_mod_lshift1_quick(n0, n1, p)) goto err;
                if (!BN_mod_add_quick(n1, n0, n1, p)) goto err;

-               /* n1 = 3 * (X_a + Z_a^2) * (X_a - Z_a^2)
-                *    = 3 * X_a^2 - 3 * Z_a^4 */
+               /*-
+                * n1 = 3 * (X_a + Z_a^2) * (X_a - Z_a^2)
+                *    = 3 * X_a^2 - 3 * Z_a^4
+                */

                }
        else
                {
                }
        else
                {


@@ -1042,7 +1044,8 @@ int ec_GFp_simple_is_on_curve(const EC_GROUP *group, const EC_POINT *point, BN_C
 
 int ec_GFp_simple_cmp(const EC_GROUP *group, const EC_POINT *a, const EC_POINT *b, BN_CTX *ctx)
        {
 
 int ec_GFp_simple_cmp(const EC_GROUP *group, const EC_POINT *a, const EC_POINT *b, BN_CTX *ctx)
        {

-       /* return values:
+       /*-
+        * return values:

         *  -1   error
         *   0   equal (in affine coordinates)
         *   1   not equal
         *  -1   error
         *   0   equal (in affine coordinates)
         *   1   not equal

diff --git a/crypto/jpake/jpake.c b/crypto/jpake/jpake.c
index e3003ad36ce167f5a9e0d787242437955effd7ee..10cca0d5445b4f6826e95c85c1ab05c8f7bb8daf 100644 (file)
--- a/crypto/jpake/jpake.c
+++ b/crypto/jpake/jpake.c
@@ -201,7 +201,7 @@ static int generate_zkp(JPAKE_STEP_PART *p, const BIGNUM *x,
     BIGNUM *h = BN_new();
     BIGNUM *t = BN_new();
 
     BIGNUM *h = BN_new();
     BIGNUM *t = BN_new();
 

-   /*
+   /*-

     * r in [0,q)
     * XXX: Java chooses r in [0, 2^160) - i.e. distribution not uniform
     */
     * r in [0,q)
     * XXX: Java chooses r in [0, 2^160) - i.e. distribution not uniform
     */

diff --git a/demos/bio/saccept.c b/demos/bio/saccept.c
index 02479edc032eea6108b0bd87c4c9863395b7d2a0..0686fd1e06544fe906ee433871d0501c19693e4c 100644 (file)
--- a/demos/bio/saccept.c
+++ b/demos/bio/saccept.c
@@ -1,7 +1,8 @@
 /* NOCW */
 /* demos/bio/saccept.c */
 
 /* NOCW */
 /* demos/bio/saccept.c */
 

-/* A minimal program to serve an SSL connection.
+/*-
+ * A minimal program to serve an SSL connection.

  * It uses blocking.
  * saccept host:port
  * host is the interface IP to use.  If any interface, use *:port
  * It uses blocking.
  * saccept host:port
  * host is the interface IP to use.  If any interface, use *:port

diff --git a/demos/bio/sconnect.c b/demos/bio/sconnect.c
index 880344eb78453b80b3c87a5c357b2b1114a82d77..d15c4132e5a20c55ccc626f16135c7874035f5bc 100644 (file)
--- a/demos/bio/sconnect.c
+++ b/demos/bio/sconnect.c
@@ -1,7 +1,8 @@
 /* NOCW */
 /* demos/bio/sconnect.c */
 
 /* NOCW */
 /* demos/bio/sconnect.c */
 

-/* A minimal program to do SSL to a passed host and port.
+/*-
+ * A minimal program to do SSL to a passed host and port.

  * It is actually using non-blocking IO but in a very simple manner
  * sconnect host:port - it does a 'GET / HTTP/1.0'
  *
  * It is actually using non-blocking IO but in a very simple manner
  * sconnect host:port - it does a 'GET / HTTP/1.0'
  *

diff --git a/demos/engines/zencod/hw_zencod.h b/demos/engines/zencod/hw_zencod.h
index 2b1b8fa6ea93a7fbac8d5c69cbee1da81f2aae05..9e71b586ee685f6852242b687c16a39c39004401 100644 (file)
--- a/demos/engines/zencod/hw_zencod.h
+++ b/demos/engines/zencod/hw_zencod.h
@@ -114,7 +114,8 @@ typedef struct ZEN_data_st
 /* output : output data buffer */
 /* input : input data buffer */
 /* algo : hash algorithm, MD5 or SHA1 */
 /* output : output data buffer */
 /* input : input data buffer */
 /* algo : hash algorithm, MD5 or SHA1 */

-/* typedef int t_zencod_hash ( KEY *output, const KEY *input, int algo ) ;
+/*-
+ * typedef int t_zencod_hash ( KEY *output, const KEY *input, int algo ) ;

  * typedef int t_zencod_sha_hash ( KEY *output, const KEY *input, int algo ) ;
  */
 /* For now separate this stuff that mad it easier to test */
  * typedef int t_zencod_sha_hash ( KEY *output, const KEY *input, int algo ) ;
  */
 /* For now separate this stuff that mad it easier to test */

diff --git a/engines/e_cswift.c b/engines/e_cswift.c
index 2e64ff32770dbf130d3dda10e7e465db88226045..18c583d6893dc856f21815726d8522d2ea249d93 100644 (file)
--- a/engines/e_cswift.c
+++ b/engines/e_cswift.c
@@ -1065,9 +1065,11 @@ static int cswift_rand_bytes(unsigned char *buf, int num)
        {
                largenum.value = buf;
                largenum.nbytes = sizeof(buf32);
        {
                largenum.value = buf;
                largenum.nbytes = sizeof(buf32);

-               /* tell CryptoSwift how many bytes we want and where we want it.
+               /*-
+                * tell CryptoSwift how many bytes we want and where we want it.

                 * Note: - CryptoSwift cannot do more than 4096 bytes at a time.
                 * Note: - CryptoSwift cannot do more than 4096 bytes at a time.

-                *       - CryptoSwift can only do multiple of 32-bits. */
+                *       - CryptoSwift can only do multiple of 32-bits.
+                */

                swrc = p_CSwift_SimpleRequest(hac, SW_CMD_RAND, NULL, 0, &largenum, 1);
                if (swrc != SW_OK)
                {
                swrc = p_CSwift_SimpleRequest(hac, SW_CMD_RAND, NULL, 0, &largenum, 1);
                if (swrc != SW_OK)
                {

diff --git a/ssl/kssl.c b/ssl/kssl.c
index 3ae19d2f6a2ba58899228bc83a41f373c2955324..21172f31d5aedd7d05c5d45a3d47582a19e62d70 100644 (file)
--- a/ssl/kssl.c
+++ b/ssl/kssl.c
@@ -1301,7 +1301,8 @@ kssl_TKT2tkt(     /* IN     */    krb5_context    krb5context,
        }
 
 
        }
 
 

-/*     Given krb5 service name in KSSL_CTX *kssl_ctx (typically "kssl"),
+/*-
+ *     Given krb5 service name in KSSL_CTX *kssl_ctx (typically "kssl"),

  *             and krb5 AP_REQ message & message length,
  *     Return Kerberos session key and client principle
  *             to SSL Server in KSSL_CTX *kssl_ctx.
  *             and krb5 AP_REQ message & message length,
  *     Return Kerberos session key and client principle
  *             to SSL Server in KSSL_CTX *kssl_ctx.

diff --git a/ssl/s3_enc.c b/ssl/s3_enc.c
index 66f52801794e968dcddf5c272a7ea2a7dda22809..dd3e343ca8a1c992bf27f68523bf33c405163515 100644 (file)
--- a/ssl/s3_enc.c
+++ b/ssl/s3_enc.c
@@ -485,7 +485,8 @@ void ssl3_cleanup_key_block(SSL *s)
        s->s3->tmp.key_block_length=0;
        }
 
        s->s3->tmp.key_block_length=0;
        }
 

-/* ssl3_enc encrypts/decrypts the record in |s->wrec| / |s->rrec|, respectively.
+/*-
+ * ssl3_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
  *
  * Returns:
  *   0: (in non-constant time) if the record is publically invalid (i.e. too


@@ -774,7 +775,8 @@ int n_ssl3_mac(SSL *ssl, unsigned char *md, int send)
                 * data we are hashing because that gives an attacker a
                 * timing-oracle. */
 
                 * data we are hashing because that gives an attacker a
                 * timing-oracle. */
 

-               /* npad is, at most, 48 bytes and that's with MD5:
+               /*-
+                * npad is, at most, 48 bytes and that's with MD5:

                 *   16 + 48 + 8 (sequence bytes) + 1 + 2 = 75.
                 *
                 * With SHA-1 (the largest hash speced for SSLv3) the hash size
                 *   16 + 48 + 8 (sequence bytes) + 1 + 2 = 75.
                 *
                 * With SHA-1 (the largest hash speced for SSLv3) the hash size

diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h
index 33a55fe699ac3d7ee82f0433969341ecf10bfa31..e817b381bce609669a40754a808ec12921035eb8 100644 (file)
--- a/ssl/ssl_locl.h
+++ b/ssl/ssl_locl.h
@@ -488,7 +488,7 @@
  * SSL_aDSS <- DSA_SIGN
  */
 
  * SSL_aDSS <- DSA_SIGN
  */
 

-/*
+/*-

 #define CERT_INVALID           0
 #define CERT_PUBLIC_KEY                1
 #define CERT_PRIVATE_KEY       2
 #define CERT_INVALID           0
 #define CERT_PUBLIC_KEY                1
 #define CERT_PRIVATE_KEY       2