generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Additional comment changes for reformat of 1.0.1

Browse Source 
Reviewed-by: Tim Hudson <tjh@openssl.org>
This commit is contained in:
Matt Caswell 2015-01-16 14:43:29 +00:00
parent ac84cb4cfe
commit 712548231e
23 changed files with 66 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bugs/alpha.c
View File

@ -60,7 +60,8 @@
* something to watch out for. This was fine on linux/NT/Solaris but not * something to watch out for. This was fine on linux/NT/Solaris but not
* Alpha */ * Alpha */
/* it is basically an example of /*-
* it is basically an example of
* func(*(a++),*(a++)) * func(*(a++),*(a++))
* which parameter is evaluated first? It is not defined in ASN1 C. * which parameter is evaluated first? It is not defined in ASN1 C.
*/ */

3
bugs/dggccbug.c
View File

@ -14,7 +14,8 @@
* copies of the valiable, one in a register and one being an address * copies of the valiable, one in a register and one being an address
* that is passed. */ * that is passed. */
/* compare the out put from /*-
* compare the out put from
* gcc dggccbug.c; ./a.out * gcc dggccbug.c; ./a.out
* and * and
* gcc -O dggccbug.c; ./a.out * gcc -O dggccbug.c; ./a.out

2
crypto/bio/bss_file.c
View File

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

3
crypto/crypto.h
View File

@ -511,7 +511,8 @@ int CRYPTO_remove_all_info(void);
/* Default debugging functions (enabled by CRYPTO_malloc_debug_init() macro; /* Default debugging functions (enabled by CRYPTO_malloc_debug_init() macro;
* used as default in CRYPTO_MDEBUG compilations): */ * 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 * 0: called before the actual memory allocation has taken place
* 1: called after the actual memory allocation has taken place * 1: called after the actual memory allocation has taken place

2
crypto/des/ofb64ede.c
View File

@ -105,7 +105,7 @@ void DES_ede3_ofb64_encrypt(register const unsigned char *in,
} }
if (save) if (save)
{ {
/* v0=ti[0]; /*- v0=ti[0];
v1=ti[1];*/ v1=ti[1];*/
iv = &(*ivec)[0]; iv = &(*ivec)[0];
l2c(v0,iv); l2c(v0,iv);

2
crypto/dso/dso_dlfcn.c
View File

@ -401,7 +401,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): This is a quote from IRIX manual for dladdr(3c):
<dlfcn.h> does not contain a prototype for dladdr or definition of <dlfcn.h> does not contain a prototype for dladdr or definition of

3
crypto/ec/ec2_smpl.c
View File

@ -544,7 +544,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: * in the EC_GROUP. A point is valid if it satisfies the Weierstrass equation:
* y^2 + x*y = x^3 + a*x^2 + b. * y^2 + x*y = x^3 + a*x^2 + b.
*/ */

9
crypto/ec/ecp_smpl.c
View File

@ -864,8 +864,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 (!field_mul(group, n1, n0, n2, ctx)) goto err;
if (!BN_mod_lshift1_quick(n0, n1, p)) goto err; if (!BN_mod_lshift1_quick(n0, n1, p)) goto err;
if (!BN_mod_add_quick(n1, 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
{ {
@ -1035,7 +1037,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 * -1 error
* 0 equal (in affine coordinates) * 0 equal (in affine coordinates)
* 1 not equal * 1 not equal

2
crypto/jpake/jpake.c
View File

@ -190,7 +190,7 @@ static void generate_zkp(JPAKE_STEP_PART *p, const BIGNUM *x,
BIGNUM *h = BN_new(); BIGNUM *h = BN_new();
BIGNUM *t = BN_new(); BIGNUM *t = BN_new();
/* /*-
* r in [0,q) * r in [0,q)
* XXX: Java chooses r in [0, 2^160) - i.e. distribution not uniform * XXX: Java chooses r in [0, 2^160) - i.e. distribution not uniform
*/ */

3
demos/bio/saccept.c
View File

@ -1,7 +1,8 @@
/* NOCW */ /* NOCW */
/* demos/bio/saccept.c */ /* demos/bio/saccept.c */
/* A minimal program to server an SSL connection. /*-
* A minimal program to server an SSL connection.
* It uses blocking. * It uses blocking.
* saccept host:port * saccept host:port
* host is the interface IP to use. If any interface, use *:port * host is the interface IP to use. If any interface, use *:port

3
demos/bio/sconnect.c
View File

@ -1,7 +1,8 @@
/* NOCW */ /* NOCW */
/* demos/bio/sconnect.c */ /* 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 * It is actually using non-blocking IO but in a very simple manner
* sconnect host:port - it does a 'GET / HTTP/1.0' * sconnect host:port - it does a 'GET / HTTP/1.0'
* *

4
demos/easy_tls/easy-tls.c
View File

@ -1,5 +1,5 @@
/* -*- Mode: C; c-file-style: "bsd" -*- */ /* -*- Mode: C; c-file-style: "bsd" -*- */
/* /*-
* easy-tls.c -- generic TLS proxy. * easy-tls.c -- generic TLS proxy.
* $Id: easy-tls.c,v 1.4 2002/03/05 09:07:16 bodo Exp $ * $Id: easy-tls.c,v 1.4 2002/03/05 09:07:16 bodo Exp $
*/ */
@ -62,7 +62,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
* OF THE POSSIBILITY OF SUCH DAMAGE. * OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
/* /*-
* Attribution for OpenSSL library: * Attribution for OpenSSL library:
* *
* This product includes cryptographic software written by Eric Young * This product includes cryptographic software written by Eric Young

2
demos/easy_tls/easy-tls.h
View File

@ -1,5 +1,5 @@
/* -*- Mode: C; c-file-style: "bsd" -*- */ /* -*- Mode: C; c-file-style: "bsd" -*- */
/* /*-
* easy-tls.h -- generic TLS proxy. * easy-tls.h -- generic TLS proxy.
* $Id: easy-tls.h,v 1.1 2001/09/17 19:06:59 bodo Exp $ * $Id: easy-tls.h,v 1.1 2001/09/17 19:06:59 bodo Exp $
*/ */

3
demos/engines/zencod/hw_zencod.h
View File

@ -114,7 +114,8 @@ typedef struct ZEN_data_st
/* output : output data buffer */ /* output : output data buffer */
/* input : input data buffer */ /* input : input data buffer */
/* algo : hash algorithm, MD5 or SHA1 */ /* 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 ) ; * typedef int t_zencod_sha_hash ( KEY *output, const KEY *input, int algo ) ;
*/ */
/* For now separate this stuff that mad it easier to test */ /* For now separate this stuff that mad it easier to test */

3
demos/spkigen.c
View File

@ -1,5 +1,6 @@
/* NOCW */ /* NOCW */
/* demos/spkigen.c /*-
* demos/spkigen.c
* 18-Mar-1997 - eay - A quick hack :-) * 18-Mar-1997 - eay - A quick hack :-)
* version 1.1, it would probably help to save or load the * version 1.1, it would probably help to save or load the
* private key :-) * private key :-)

3
demos/tunala/cb.c
View File

@ -5,7 +5,8 @@
/* For callbacks generating output, here are their file-descriptors. */ /* For callbacks generating output, here are their file-descriptors. */
static FILE *fp_cb_ssl_info = NULL; static FILE *fp_cb_ssl_info = NULL;
static FILE *fp_cb_ssl_verify = NULL; static FILE *fp_cb_ssl_verify = NULL;
/* Output level: /*-
* Output level:
* 0 = nothing, * 0 = nothing,
* 1 = minimal, just errors, * 1 = minimal, just errors,
* 2 = minimal, all steps, * 2 = minimal, all steps,

6
engines/e_cswift.c
View File

@ -1065,9 +1065,11 @@ static int cswift_rand_bytes(unsigned char *buf, int num)
{ {
largenum.value = buf; largenum.value = buf;
largenum.nbytes = sizeof(buf32); 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); swrc = p_CSwift_SimpleRequest(hac, SW_CMD_RAND, NULL, 0, &largenum, 1);
if (swrc != SW_OK) if (swrc != SW_OK)
{ {

16
ssl/d1_clnt.c
View File

@ -1093,7 +1093,8 @@ int dtls1_send_client_key_exchange(SSL *s)
goto err; goto err;
} }
/* 20010406 VRS - Earlier versions used KRB5 AP_REQ /*-
* 20010406 VRS - Earlier versions used KRB5 AP_REQ
** in place of RFC 2712 KerberosWrapper, as in: ** in place of RFC 2712 KerberosWrapper, as in:
** **
** Send ticket (copy to *p, set n = length) ** Send ticket (copy to *p, set n = length)
@ -1139,11 +1140,12 @@ int dtls1_send_client_key_exchange(SSL *s)
if (RAND_bytes(tmp_buf,sizeof tmp_buf) <= 0) if (RAND_bytes(tmp_buf,sizeof tmp_buf) <= 0)
goto err; goto err;
/* 20010420 VRS. Tried it this way; failed. /*-
** EVP_EncryptInit_ex(&ciph_ctx,enc, NULL,NULL); * 20010420 VRS. Tried it this way; failed.
** EVP_CIPHER_CTX_set_key_length(&ciph_ctx, * EVP_EncryptInit_ex(&ciph_ctx,enc, NULL,NULL);
** kssl_ctx->length); * EVP_CIPHER_CTX_set_key_length(&ciph_ctx,
** EVP_EncryptInit_ex(&ciph_ctx,NULL, key,iv); * kssl_ctx->length);
* EVP_EncryptInit_ex(&ciph_ctx,NULL, key,iv);
*/ */
memset(iv, 0, sizeof iv); /* per RFC 1510 */ memset(iv, 0, sizeof iv); /* per RFC 1510 */
@ -1522,7 +1524,7 @@ int dtls1_send_client_key_exchange(SSL *s)
d = dtls1_set_message_header(s, d, d = dtls1_set_message_header(s, d,
SSL3_MT_CLIENT_KEY_EXCHANGE, n, 0, n); SSL3_MT_CLIENT_KEY_EXCHANGE, n, 0, n);
/* /*-
*(d++)=SSL3_MT_CLIENT_KEY_EXCHANGE; *(d++)=SSL3_MT_CLIENT_KEY_EXCHANGE;
l2n3(n,d); l2n3(n,d);
l2n(s->d1->handshake_write_seq,d); l2n(s->d1->handshake_write_seq,d);

6
ssl/d1_pkt.c
View File

@ -1045,9 +1045,11 @@ start:
} }
} }
/* s->d1->handshake_fragment_len == 12 iff rr->type == SSL3_RT_HANDSHAKE; /*-
* s->d1->handshake_fragment_len == 12 iff rr->type == SSL3_RT_HANDSHAKE;
* s->d1->alert_fragment_len == 7 iff rr->type == SSL3_RT_ALERT. * s->d1->alert_fragment_len == 7 iff rr->type == SSL3_RT_ALERT.
* (Possibly rr is 'empty' now, i.e. rr->length may be 0.) */ * (Possibly rr is 'empty' now, i.e. rr->length may be 0.)
*/
/* If we are a client, check for an incoming 'Hello Request': */ /* If we are a client, check for an incoming 'Hello Request': */
if ((!s->server) && if ((!s->server) &&

3
ssl/kssl.c
View File

@ -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, * and krb5 AP_REQ message & message length,
* Return Kerberos session key and client principle * Return Kerberos session key and client principle
* to SSL Server in KSSL_CTX *kssl_ctx. * to SSL Server in KSSL_CTX *kssl_ctx.

15
ssl/s2_pkt.c
View File

@ -572,16 +572,20 @@ static int n_do_ssl_write(SSL *s, const unsigned char *buf, unsigned int len)
} }
else if ((bs <= 1) && (!s->s2->escape)) else if ((bs <= 1) && (!s->s2->escape))
{ {
/* j <= SSL2_MAX_RECORD_LENGTH_3_BYTE_HEADER, thus /*-
* j < SSL2_MAX_RECORD_LENGTH_2_BYTE_HEADER */ * j <= SSL2_MAX_RECORD_LENGTH_3_BYTE_HEADER, thus
* j < SSL2_MAX_RECORD_LENGTH_2_BYTE_HEADER
*/
s->s2->three_byte_header=0; s->s2->three_byte_header=0;
p=0; p=0;
} }
else /* we may have to use a 3 byte header */ else /* we may have to use a 3 byte header */
{ {
/* If s->s2->escape is not set, then /*-
* If s->s2->escape is not set, then
* j <= SSL2_MAX_RECORD_LENGTH_3_BYTE_HEADER, and thus * j <= SSL2_MAX_RECORD_LENGTH_3_BYTE_HEADER, and thus
* j < SSL2_MAX_RECORD_LENGTH_2_BYTE_HEADER. */ * j < SSL2_MAX_RECORD_LENGTH_2_BYTE_HEADER.
*/
p=(j%bs); p=(j%bs);
p=(p == 0)?0:(bs-p); p=(p == 0)?0:(bs-p);
if (s->s2->escape) if (s->s2->escape)
@ -595,7 +599,8 @@ static int n_do_ssl_write(SSL *s, const unsigned char *buf, unsigned int len)
} }
} }
/* Now /*-
* Now
* j <= SSL2_MAX_RECORD_LENGTH_2_BYTE_HEADER * j <= SSL2_MAX_RECORD_LENGTH_2_BYTE_HEADER
* holds, and if s->s2->three_byte_header is set, then even * holds, and if s->s2->three_byte_header is set, then even
* j <= SSL2_MAX_RECORD_LENGTH_3_BYTE_HEADER. * j <= SSL2_MAX_RECORD_LENGTH_3_BYTE_HEADER.

6
ssl/s3_enc.c
View File

@ -466,7 +466,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: * Returns:
* 0: (in non-constant time) if the record is publically invalid (i.e. too * 0: (in non-constant time) if the record is publically invalid (i.e. too
@ -756,7 +757,8 @@ int n_ssl3_mac(SSL *ssl, unsigned char *md, int send)
* data we are hashing because that gives an attacker a * data we are hashing because that gives an attacker a
* timing-oracle. */ * 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. * 16 + 48 + 8 (sequence bytes) + 1 + 2 = 75.
* *
* With SHA-1 (the largest hash speced for SSLv3) the hash size * With SHA-1 (the largest hash speced for SSLv3) the hash size

2
ssl/ssl_locl.h
View File

@ -464,7 +464,7 @@
* SSL_aDSS <- DSA_SIGN * SSL_aDSS <- DSA_SIGN
*/ */
/* /*-
#define CERT_INVALID 0 #define CERT_INVALID 0
#define CERT_PUBLIC_KEY 1 #define CERT_PUBLIC_KEY 1
#define CERT_PRIVATE_KEY 2 #define CERT_PRIVATE_KEY 2