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:41:33 +0000 |
commit | 89f6c5b4926c8ef8bc1a544a031ed3e01e092cbe (patch) | |
tree | c2971b1976bb1c550b203c2842d56cf4311c631a /apps | |
parent | f326f6544debb563d9401b1673a96d0073a32e37 (diff) |
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
Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'apps')
-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 |
4 files changed, 5 insertions, 4 deletions
@@ -635,7 +635,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 18122be4c6..70b089820d 100644 --- a/apps/req.c +++ b/apps/req.c @@ -503,7 +503,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 c4f5512247..405d0ed6c3 100644 --- a/apps/s_cb.c +++ b/apps/s_cb.c @@ -220,7 +220,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); |