diff options
| author | Matt Caswell <matt@openssl.org> | 2015-01-05 00:34:00 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2015-01-22 09:23:50 +0000 |
| commit | e19d4a99b8f25456dfab7086af57f3f208cdfed6 (patch) | |
| tree | cd7931e89476c762982afdc5585aa942ad0a4f0b /apps | |
| parent | 6977c7e2baf291278aee7632f1a68581b7c4d1f9 (diff) | |
Further comment amendments to preserve formatting prior to source reformat
(cherry picked from commit 4a7fa26ffd65bf36beb8d1cb8f29fc0ae203f5c5)
Conflicts:
crypto/x509v3/pcy_tree.c
Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/apps.c | 3 | ||||
| -rw-r--r-- | apps/ca.c | 2 | ||||
| -rw-r--r-- | apps/pkcs7.c | 3 | ||||
| -rw-r--r-- | apps/req.c | 2 | ||||
| -rw-r--r-- | apps/s_cb.c | 2 |
5 files changed, 7 insertions, 5 deletions
diff --git a/apps/apps.c b/apps/apps.c index 235ede450d..2d7b70a965 100644 --- a/apps/apps.c +++ b/apps/apps.c @@ -2896,7 +2896,8 @@ void jpake_server_auth(BIO *out, BIO *conn, const char *secret) #endif #ifndef OPENSSL_NO_TLSEXT -/* next_protos_parse parses a comma separated list of strings into a string +/*- + * next_protos_parse parses a comma separated list of strings into a string * in a format suitable for passing to SSL_CTX_set_next_protos_advertised. * outlen: (output) set to the length of the resulting buffer on success. * err: (maybe NULL) on failure, an error message line is written to this BIO. @@ -655,7 +655,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 ae6cd33f73..01064617a2 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 e73f56b5dc..318ea64a54 100644 --- a/apps/req.c +++ b/apps/req.c @@ -512,7 +512,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 4b0e85d85d..86e59c8dcf 100644 --- a/apps/s_cb.c +++ b/apps/s_cb.c @@ -226,7 +226,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); |