diff options
author | Matt Caswell <matt@openssl.org> | 2015-01-16 09:21:50 +0000 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2015-01-22 09:19:59 +0000 |
commit | c80fd6b215449f2ba7228af58979ac8709f74b82 (patch) | |
tree | 0269f83aff238ce66c2839e2a52c237caaa37ec3 /apps | |
parent | 4b618848f9beb8271f24883694e097caa70013c0 (diff) | |
download | openssl-c80fd6b215449f2ba7228af58979ac8709f74b82.tar.gz |
Further comment changes for reformat (master)
Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'apps')
-rw-r--r-- | apps/crl2p7.c | 2 | ||||
-rw-r--r-- | apps/gendh.c | 2 | ||||
-rw-r--r-- | apps/s_cb.c | 2 | ||||
-rw-r--r-- | apps/s_client.c | 31 | ||||
-rw-r--r-- | apps/s_time.c | 2 | ||||
-rw-r--r-- | apps/winrand.c | 3 |
6 files changed, 22 insertions, 20 deletions
diff --git a/apps/crl2p7.c b/apps/crl2p7.c index ce78e76e80..4f9383dc9c 100644 --- a/apps/crl2p7.c +++ b/apps/crl2p7.c @@ -289,7 +289,7 @@ end: OPENSSL_EXIT(ret); } -/* +/*- *---------------------------------------------------------------------- * int add_certs_from_file * diff --git a/apps/gendh.c b/apps/gendh.c index ec6842528a..591c8c1216 100644 --- a/apps/gendh.c +++ b/apps/gendh.c @@ -121,7 +121,7 @@ int MAIN(int argc, char **argv) } else if (strcmp(*argv,"-2") == 0) g=2; - /* else if (strcmp(*argv,"-3") == 0) + /*- else if (strcmp(*argv,"-3") == 0) g=3; */ else if (strcmp(*argv,"-5") == 0) g=5; diff --git a/apps/s_cb.c b/apps/s_cb.c index 758da231be..ee8f77709b 100644 --- a/apps/s_cb.c +++ b/apps/s_cb.c @@ -209,7 +209,7 @@ int set_cert_stuff(SSL_CTX *ctx, char *cert_file, char *key_file) { if (cert_file != NULL) { - /* + /*- SSL *ssl; X509 *x509; */ diff --git a/apps/s_client.c b/apps/s_client.c index 199a587dcb..39c58c2702 100644 --- a/apps/s_client.c +++ b/apps/s_client.c @@ -435,20 +435,21 @@ static int srp_Verify_N_and_g(const BIGNUM *N, const BIGNUM *g) return ret; } -/* This callback is used here for two purposes: - - extended debugging - - making some primality tests for unknown groups - The callback is only called for a non default group. - - An application does not need the call back at all if - only the stanard groups are used. In real life situations, - client and server already share well known groups, - thus there is no need to verify them. - Furthermore, in case that a server actually proposes a group that - is not one of those defined in RFC 5054, it is more appropriate - to add the group to a static list and then compare since - primality tests are rather cpu consuming. -*/ +/*- + * This callback is used here for two purposes: + * - extended debugging + * - making some primality tests for unknown groups + * The callback is only called for a non default group. + * + * An application does not need the call back at all if + * only the stanard groups are used. In real life situations, + * client and server already share well known groups, + * thus there is no need to verify them. + * Furthermore, in case that a server actually proposes a group that + * is not one of those defined in RFC 5054, it is more appropriate + * to add the group to a static list and then compare since + * primality tests are rather cpu consuming. + */ static int ssl_srp_verify_param_cb(SSL *s, void *arg) { @@ -1821,7 +1822,7 @@ SSL_set_tlsext_status_ids(con, ids); openssl_fdset(SSL_get_fd(con),&writefds); } #endif -/* printf("mode tty(%d %d%d) ssl(%d%d)\n", +/*- printf("mode tty(%d %d%d) ssl(%d%d)\n", tty_on,read_tty,write_tty,read_ssl,write_ssl);*/ /* Note: under VMS with SOCKETSHR the second parameter diff --git a/apps/s_time.c b/apps/s_time.c index dfe8df70fa..8752649fc4 100644 --- a/apps/s_time.c +++ b/apps/s_time.c @@ -538,7 +538,7 @@ end: OPENSSL_EXIT(ret); } -/*********************************************************************** +/*- * doConnection - make a connection * Args: * scon = earlier ssl connection for session id, or NULL diff --git a/apps/winrand.c b/apps/winrand.c index 59bede3d70..d6a30ee21b 100644 --- a/apps/winrand.c +++ b/apps/winrand.c @@ -53,7 +53,8 @@ * */ -/* Usage: winrand [filename] +/*- + * Usage: winrand [filename] * * Collects entropy from mouse movements and other events and writes * random data to filename or .rnd |