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 /crypto/evp | |
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>
Diffstat (limited to 'crypto/evp')
-rw-r--r-- | crypto/evp/bio_enc.c | 2 | ||||
-rw-r--r-- | crypto/evp/bio_md.c | 2 | ||||
-rw-r--r-- | crypto/evp/bio_ok.c | 2 | ||||
-rw-r--r-- | crypto/evp/encode.c | 9 | ||||
-rw-r--r-- | crypto/evp/evp.h | 2 | ||||
-rw-r--r-- | crypto/evp/evp_locl.h | 2 | ||||
-rw-r--r-- | crypto/evp/p_seal.c | 2 |
7 files changed, 12 insertions, 9 deletions
diff --git a/crypto/evp/bio_enc.c b/crypto/evp/bio_enc.c index f6ac94c6e1..fb3c64521a 100644 --- a/crypto/evp/bio_enc.c +++ b/crypto/evp/bio_enc.c @@ -385,7 +385,7 @@ static long enc_callback_ctrl(BIO *b, int cmd, bio_info_cb *fp) return(ret); } -/* +/*- void BIO_set_cipher_ctx(b,c) BIO *b; EVP_CIPHER_ctx *c; diff --git a/crypto/evp/bio_md.c b/crypto/evp/bio_md.c index ed5c1135fd..199e5e6a83 100644 --- a/crypto/evp/bio_md.c +++ b/crypto/evp/bio_md.c @@ -253,7 +253,7 @@ static int md_gets(BIO *bp, char *buf, int size) return((int)ret); } -/* +/*- static int md_puts(bp,str) BIO *bp; char *str; diff --git a/crypto/evp/bio_ok.c b/crypto/evp/bio_ok.c index 98bc1ab409..e9befe9832 100644 --- a/crypto/evp/bio_ok.c +++ b/crypto/evp/bio_ok.c @@ -56,7 +56,7 @@ * [including the GNU Public Licence.] */ -/* +/*- From: Arne Ansper <arne@cyber.ee> Why BIO_f_reliable? diff --git a/crypto/evp/encode.c b/crypto/evp/encode.c index 69f7ccad69..7c40c45fe1 100644 --- a/crypto/evp/encode.c +++ b/crypto/evp/encode.c @@ -74,7 +74,8 @@ #define conv_ascii2bin(a) (data_ascii2bin[os_toascii[a]&0x7f]) #endif -/* 64 char lines +/*- + * 64 char lines * pad input with 0 * left over chars are set to = * 1 byte => xx== @@ -88,7 +89,8 @@ static unsigned char data_bin2ascii[65]="ABCDEFGHIJKLMNOPQRSTUVWXYZ\ abcdefghijklmnopqrstuvwxyz0123456789+/"; -/* 0xF0 is a EOLN +/*- + * 0xF0 is a EOLN * 0xF1 is ignore but next needs to be 0xF0 (for \r\n processing). * 0xF2 is EOF * 0xE0 is ignore at start of line. @@ -228,7 +230,8 @@ void EVP_DecodeInit(EVP_ENCODE_CTX *ctx) ctx->expect_nl=0; } -/* -1 for error +/*- + * -1 for error * 0 for last line * 1 for full line */ diff --git a/crypto/evp/evp.h b/crypto/evp/evp.h index 79c097181f..9a0e790403 100644 --- a/crypto/evp/evp.h +++ b/crypto/evp/evp.h @@ -79,7 +79,7 @@ #include <openssl/fips.h> #endif -/* +/*- #define EVP_RC2_KEY_SIZE 16 #define EVP_RC4_KEY_SIZE 16 #define EVP_BLOWFISH_KEY_SIZE 16 diff --git a/crypto/evp/evp_locl.h b/crypto/evp/evp_locl.h index ef6c432538..f2ff3142b5 100644 --- a/crypto/evp/evp_locl.h +++ b/crypto/evp/evp_locl.h @@ -157,7 +157,7 @@ BLOCK_CIPHER_def_ecb(cname, kstruct, nid, block_size, key_len, flags, \ init_key, cleanup, set_asn1, get_asn1, ctrl) -/* +/*- #define BLOCK_CIPHER_defs(cname, kstruct, \ nid, block_size, key_len, iv_len, flags,\ init_key, cleanup, set_asn1, get_asn1, ctrl)\ diff --git a/crypto/evp/p_seal.c b/crypto/evp/p_seal.c index 8cc8fcb0bd..93613c9254 100644 --- a/crypto/evp/p_seal.c +++ b/crypto/evp/p_seal.c @@ -94,7 +94,7 @@ int EVP_SealInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, unsigned char **ek return(npubk); } -/* MACRO +/*- MACRO void EVP_SealUpdate(ctx,out,outl,in,inl) EVP_CIPHER_CTX *ctx; unsigned char *out; |