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:48:59 +0000 |
| commit | 564ccc55d6463e485f885a8c2192121ea8fe6adf (patch) | |
| tree | de073a7f21239041a5b23820a91515e87abb89f2 /apps | |
| parent | b558c8d59782dab2809a1530cbbcd9f38785302b (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
Conflicts:
crypto/bio/b_sock.c
crypto/pem/pem.h
crypto/x509/x509_vfy.c
crypto/x509v3/pcy_tree.c
ssl/s3_both.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
@@ -627,7 +627,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 bdbb10229e..1ab86e50ee 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 a6d180e973..c51dac0caa 100644 --- a/apps/req.c +++ b/apps/req.c @@ -605,7 +605,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 df922f3af5..456aef18f9 100644 --- a/apps/s_cb.c +++ b/apps/s_cb.c @@ -204,7 +204,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); |