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:33:23 +0000 |
| commit | 3e9a08ecb164098f997bce92a0db72287f39c106 (patch) | |
| tree | b086482b8835ee069eb902a5edd708f418623ee3 /crypto | |
| parent | 3a9a0321638ae13957b66baae6d4955597fc128d (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
Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'crypto')
115 files changed, 537 insertions, 348 deletions
diff --git a/crypto/aes/aes_core.c b/crypto/aes/aes_core.c index 8f5210ac70..acd5f55547 100644 --- a/crypto/aes/aes_core.c +++ b/crypto/aes/aes_core.c @@ -40,7 +40,7 @@ #include "aes_locl.h" #ifndef AES_ASM -/* +/*- Te0[x] = S [x].[02, 01, 01, 03]; Te1[x] = S [x].[03, 02, 01, 01]; Te2[x] = S [x].[01, 03, 02, 01]; diff --git a/crypto/aes/aes_x86core.c b/crypto/aes/aes_x86core.c index d323e265c0..f960a4b570 100644 --- a/crypto/aes/aes_x86core.c +++ b/crypto/aes/aes_x86core.c @@ -103,7 +103,7 @@ typedef unsigned long long u64; }) # endif #endif -/* +/*- Te [x] = S [x].[02, 01, 01, 03, 02, 01, 01, 03]; Te0[x] = S [x].[02, 01, 01, 03]; Te1[x] = S [x].[03, 02, 01, 01]; @@ -114,7 +114,7 @@ Te3[x] = S [x].[01, 01, 03, 02]; #define Te1 (u32)((u64*)((u8*)Te+3)) #define Te2 (u32)((u64*)((u8*)Te+2)) #define Te3 (u32)((u64*)((u8*)Te+1)) -/* +/*- Td [x] = Si[x].[0e, 09, 0d, 0b, 0e, 09, 0d, 0b]; Td0[x] = Si[x].[0e, 09, 0d, 0b]; Td1[x] = Si[x].[0b, 0e, 09, 0d]; diff --git a/crypto/asn1/a_sign.c b/crypto/asn1/a_sign.c index 7b4a193d6b..2f7c79025c 100644 --- a/crypto/asn1/a_sign.c +++ b/crypto/asn1/a_sign.c @@ -254,7 +254,8 @@ int ASN1_item_sign_ctx(const ASN1_ITEM *it, signature); if (rv == 1) outl = signature->length; - /* Return value meanings: + /*- + * Return value meanings: * <=0: error. * 1: method does everything. * 2: carry on as normal. diff --git a/crypto/asn1/a_time.c b/crypto/asn1/a_time.c index e2eb9b243e..6777189947 100644 --- a/crypto/asn1/a_time.c +++ b/crypto/asn1/a_time.c @@ -54,7 +54,8 @@ */ -/* This is an implementation of the ASN1 Time structure which is: +/*- + * This is an implementation of the ASN1 Time structure which is: * Time ::= CHOICE { * utcTime UTCTime, * generalTime GeneralizedTime } diff --git a/crypto/asn1/a_utf8.c b/crypto/asn1/a_utf8.c index 508e11e527..2105306fea 100644 --- a/crypto/asn1/a_utf8.c +++ b/crypto/asn1/a_utf8.c @@ -63,7 +63,8 @@ /* UTF8 utilities */ -/* This parses a UTF8 string one character at a time. It is passed a pointer +/*- + * This parses a UTF8 string one character at a time. It is passed a pointer * to the string and the length of the string. It sets 'value' to the value of * the current character. It returns the number of characters read or a * negative error code: diff --git a/crypto/asn1/asn1.h b/crypto/asn1/asn1.h index 3c45d5d03f..bdb57962f9 100644 --- a/crypto/asn1/asn1.h +++ b/crypto/asn1/asn1.h @@ -361,7 +361,8 @@ typedef struct ASN1_VALUE_st ASN1_VALUE; TYPEDEF_D2I2D_OF(void); -/* The following macros and typedefs allow an ASN1_ITEM +/*- + * The following macros and typedefs allow an ASN1_ITEM * to be embedded in a structure and referenced. Since * the ASN1_ITEM pointers need to be globally accessible * (possibly from shared libraries) they may exist in diff --git a/crypto/asn1/asn1t.h b/crypto/asn1/asn1t.h index d230e4bf70..47502a6a5e 100644 --- a/crypto/asn1/asn1t.h +++ b/crypto/asn1/asn1t.h @@ -129,7 +129,8 @@ extern "C" { /* This is a ASN1 type which just embeds a template */ -/* This pair helps declare a SEQUENCE. We can do: +/*- + * This pair helps declare a SEQUENCE. We can do: * * ASN1_SEQUENCE(stname) = { * ... SEQUENCE components ... @@ -231,7 +232,8 @@ extern "C" { ASN1_ITEM_end(tname) -/* This pair helps declare a CHOICE type. We can do: +/*- + * This pair helps declare a CHOICE type. We can do: * * ASN1_CHOICE(chname) = { * ... CHOICE options ... diff --git a/crypto/asn1/x_attrib.c b/crypto/asn1/x_attrib.c index 1e3713f18f..04ae991115 100644 --- a/crypto/asn1/x_attrib.c +++ b/crypto/asn1/x_attrib.c |