diff options
| author | Tim Hudson <tjh@openssl.org> | 2014-12-28 12:48:40 +1000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2015-01-22 09:48:44 +0000 |
| commit | b558c8d59782dab2809a1530cbbcd9f38785302b (patch) | |
| tree | a87d3dbc2e91e6afeca572069e7866da31985b11 | |
| parent | ba442a7e1ba96d0b189bc627a2a750c928a42d13 (diff) | |
mark all block comments that need format preserving so that
indent will not alter them when reformatting comments
(cherry picked from commit 1d97c8435171a7af575f73c526d79e1ef0ee5960)
Conflicts:
crypto/bn/bn_lcl.h
crypto/bn/bn_prime.c
crypto/engine/eng_all.c
crypto/rc4/rc4_utl.c
crypto/sha/sha.h
ssl/kssl.c
ssl/t1_lib.c
Conflicts:
crypto/rc4/rc4_enc.c
crypto/x509v3/v3_scts.c
crypto/x509v3/v3nametest.c
ssl/d1_both.c
ssl/s3_srvr.c
ssl/ssl.h
ssl/ssl_locl.h
ssl/ssltest.c
ssl/t1_lib.c
Conflicts:
crypto/asn1/a_sign.c
crypto/bn/bn_div.c
crypto/dsa/dsa_asn1.c
crypto/ec/ecp_nistp224.c
crypto/ec/ecp_nistp256.c
crypto/ec/ecp_nistp521.c
crypto/ec/ecp_nistputil.c
crypto/modes/gcm128.c
crypto/opensslv.h
ssl/d1_both.c
ssl/heartbeat_test.c
ssl/s3_clnt.c
ssl/s3_srvr.c
ssl/ssl_sess.c
ssl/t1_lib.c
test/testutil.h
Conflicts:
apps/openssl.c
apps/ts.c
apps/vms_decc_init.c
crypto/aes/aes_core.c
crypto/aes/aes_x86core.c
crypto/dsa/dsa_ameth.c
crypto/ec/ec2_mult.c
crypto/evp/evp.h
crypto/objects/objects.h
crypto/rsa/rsa_pss.c
crypto/stack/safestack.h
crypto/ts/ts.h
crypto/ts/ts_rsp_verify.c
crypto/whrlpool/wp_dgst.c
crypto/x509v3/v3_ncons.c
e_os2.h
engines/ccgost/gost89.c
engines/ccgost/gost_ctl.c
engines/ccgost/gost_keywrap.c
engines/ccgost/gost_keywrap.h
engines/ccgost/gost_sign.c
ssl/kssl.c
ssl/s3_srvr.c
Reviewed-by: Tim Hudson <tjh@openssl.org>
123 files changed, 743 insertions, 570 deletions
diff --git a/apps/asn1pars.c b/apps/asn1pars.c index 305cdfc6af..d92c0eb44e 100644 --- a/apps/asn1pars.c +++ b/apps/asn1pars.c @@ -69,7 +69,8 @@ #include <openssl/x509.h> #include <openssl/pem.h> -/* -inform arg - input format - default PEM (DER or PEM) +/*- + * -inform arg - input format - default PEM (DER or PEM) * -in arg - input file - default stdin * -i - indent the details by depth * -offset - where in the file to start @@ -2780,7 +2780,8 @@ char *make_revocation_str(int rev_type, char *rev_arg) return str; } -/* Convert revocation field to X509_REVOKED entry +/*- + * Convert revocation field to X509_REVOKED entry * return code: * 0 error * 1 OK diff --git a/apps/crl2p7.c b/apps/crl2p7.c index f164a3ad94..eb7c6bfa0c 100644 --- a/apps/crl2p7.c +++ b/apps/crl2p7.c @@ -76,7 +76,8 @@ static int add_certs_from_file(STACK_OF(X509) *stack, char *certfile); #undef PROG #define PROG crl2pkcs7_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 @@ -74,7 +74,8 @@ #undef PROG #define PROG dh_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/dhparam.c b/apps/dhparam.c index 4a9594ea46..9175b28270 100644 --- a/apps/dhparam.c +++ b/apps/dhparam.c @@ -132,7 +132,8 @@ #define DEFBITS 512 -/* -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/dsa.c b/apps/dsa.c index 5e68a56cfd..8833f44cfb 100644 --- a/apps/dsa.c +++ b/apps/dsa.c @@ -74,7 +74,8 @@ #undef PROG #define PROG dsa_main -/* -inform arg - input format - default PEM (one of DER, NET or PEM) +/*- + * -inform arg - input format - default PEM (one of DER, NET or PEM) * -outform arg - output format - default PEM * -in arg - input file - default stdin * -out arg - output file - default stdout diff --git a/apps/dsaparam.c b/apps/dsaparam.c index fe72c1d3df..7b8c4bada7 100644 --- a/apps/dsaparam.c +++ b/apps/dsaparam.c @@ -80,7 +80,8 @@ #undef PROG #define PROG dsaparam_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 @@ -70,7 +70,8 @@ #undef PROG #define PROG ec_main -/* -inform arg - input format - default PEM (one of DER, NET or PEM) +/*- + * -inform arg - input format - default PEM (one of DER, NET or PEM) * -outform arg - output format - default PEM * -in arg - input file - default stdin * -out arg - output file - default stdout diff --git a/apps/ecparam.c b/apps/ecparam.c index 2d3fd30324..bba8229619 100644 --- a/apps/ecparam.c +++ b/apps/ecparam.c @@ -87,7 +87,8 @@ #undef PROG #define PROG ecparam_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/passwd.c b/apps/passwd.c index 9ca25dd1da..8e65ed7cbb 100644 --- a/apps/passwd.c +++ b/apps/passwd.c @@ -43,7 +43,8 @@ static int do_passwd(int passed_salt, char **salt_p, char **salt_malloc_p, char *passwd, BIO *out, int quiet, int table, int reverse, size_t pw_maxlen, int usecrypt, int use1, int useapr1); -/* -crypt - standard Un |