diff options
| author | Matt Caswell <matt@openssl.org> | 2015-01-19 12:42:01 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2015-01-22 09:33:54 +0000 |
| commit | 1566497495b30054453b05d275c01d6db5211e2a (patch) | |
| tree | a1d5537c54452e0bd4fefcb327d82acdbc2ddf82 /apps | |
| parent | 712548231e101f11c06e729e2330a7f3155b2d7e (diff) | |
| download | openssl-new-1566497495b30054453b05d275c01d6db5211e2a.tar.gz | |
Fix source where indent will not be able to cope
Conflicts:
apps/ciphers.c
ssl/s3_pkt.c
Conflicts:
crypto/ec/ec_curve.c
Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/ciphers.c | 15 | ||||
| -rw-r--r-- | apps/s_client.c | 3 | ||||
| -rw-r--r-- | apps/s_time.c | 3 |
3 files changed, 16 insertions, 5 deletions
diff --git a/apps/ciphers.c b/apps/ciphers.c index 93dce1c40b..d8de88e5f5 100644 --- a/apps/ciphers.c +++ b/apps/ciphers.c @@ -197,11 +197,20 @@ int MAIN(int argc, char **argv) int id3 = (int)(id & 0xffL); if ((id & 0xff000000L) == 0x02000000L) - BIO_printf(STDout, " 0x%02X,0x%02X,0x%02X - ", id1, id2, id3); /* SSL2 cipher */ + { + /* SSL2 cipher */ + BIO_printf(STDout, " 0x%02X,0x%02X,0x%02X - ", id1, id2, id3); + } else if ((id & 0xff000000L) == 0x03000000L) - BIO_printf(STDout, " 0x%02X,0x%02X - ", id2, id3); /* SSL3 cipher */ + { + /* SSL3 cipher */ + BIO_printf(STDout, " 0x%02X,0x%02X - ", id2, id3); + } else - BIO_printf(STDout, "0x%02X,0x%02X,0x%02X,0x%02X - ", id0, id1, id2, id3); /* whatever */ + { + /* whatever */ + BIO_printf(STDout, "0x%02X,0x%02X,0x%02X,0x%02X - ", id0, id1, id2, id3); + } } BIO_puts(STDout,SSL_CIPHER_description(c,buf,sizeof buf)); diff --git a/apps/s_client.c b/apps/s_client.c index 4203cfca3c..a637409be4 100644 --- a/apps/s_client.c +++ b/apps/s_client.c @@ -185,7 +185,8 @@ typedef unsigned int u_int; /*#define SSL_HOST_NAME "193.118.187.102" */ #define SSL_HOST_NAME "localhost" -/*#define TEST_CERT "client.pem" */ /* no default cert. */ +/* no default cert. */ +/*#define TEST_CERT "client.pem" */ #undef BUFSIZZ #define BUFSIZZ 1024*8 diff --git a/apps/s_time.c b/apps/s_time.c index eb95ffa64c..893de790ab 100644 --- a/apps/s_time.c +++ b/apps/s_time.c @@ -93,7 +93,8 @@ #define SSL_CONNECT_NAME "localhost:4433" -/*#define TEST_CERT "client.pem" */ /* no default cert. */ +/* no default cert. */ +/*#define TEST_CERT "client.pem" */ #undef BUFSIZZ #define BUFSIZZ 1024*10 |