diff options
| author | jsing <> | 2014-12-14 15:30:50 +0000 |
|---|---|---|
| committer | jsing <> | 2014-12-14 15:30:50 +0000 |
| commit | 0a332f7b1f3c6198783e4a2fce3186bf5914e5b9 (patch) | |
| tree | c3b2f5726fc242dbe8519cc8f467c46d7159f9a2 /src/lib/libssl/ssl_ciph.c | |
| parent | a611a088079315166705b6b55c3bc42b5fc2d007 (diff) | |
| download | openbsd-0a332f7b1f3c6198783e4a2fce3186bf5914e5b9.tar.gz openbsd-0a332f7b1f3c6198783e4a2fce3186bf5914e5b9.tar.bz2 openbsd-0a332f7b1f3c6198783e4a2fce3186bf5914e5b9.zip | |
Remove trailing whitespace.
Diffstat (limited to 'src/lib/libssl/ssl_ciph.c')
| -rw-r--r-- | src/lib/libssl/ssl_ciph.c | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/src/lib/libssl/ssl_ciph.c b/src/lib/libssl/ssl_ciph.c index 1d7b4145eb..afc31d7816 100644 --- a/src/lib/libssl/ssl_ciph.c +++ b/src/lib/libssl/ssl_ciph.c | |||
| @@ -1,25 +1,25 @@ | |||
| 1 | /* $OpenBSD: ssl_ciph.c,v 1.78 2014/12/10 15:36:47 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_ciph.c,v 1.79 2014/12/14 15:30:50 jsing Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| 5 | * This package is an SSL implementation written | 5 | * This package is an SSL implementation written |
| 6 | * by Eric Young (eay@cryptsoft.com). | 6 | * by Eric Young (eay@cryptsoft.com). |
| 7 | * The implementation was written so as to conform with Netscapes SSL. | 7 | * The implementation was written so as to conform with Netscapes SSL. |
| 8 | * | 8 | * |
| 9 | * This library is free for commercial and non-commercial use as long as | 9 | * This library is free for commercial and non-commercial use as long as |
| 10 | * the following conditions are aheared to. The following conditions | 10 | * the following conditions are aheared to. The following conditions |
| 11 | * apply to all code found in this distribution, be it the RC4, RSA, | 11 | * apply to all code found in this distribution, be it the RC4, RSA, |
| 12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | 12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation |
| 13 | * included with this distribution is covered by the same copyright terms | 13 | * included with this distribution is covered by the same copyright terms |
| 14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | 14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). |
| 15 | * | 15 | * |
| 16 | * Copyright remains Eric Young's, and as such any Copyright notices in | 16 | * Copyright remains Eric Young's, and as such any Copyright notices in |
| 17 | * the code are not to be removed. | 17 | * the code are not to be removed. |
| 18 | * If this package is used in a product, Eric Young should be given attribution | 18 | * If this package is used in a product, Eric Young should be given attribution |
| 19 | * as the author of the parts of the library used. | 19 | * as the author of the parts of the library used. |
| 20 | * This can be in the form of a textual message at program startup or | 20 | * This can be in the form of a textual message at program startup or |
| 21 | * in documentation (online or textual) provided with the package. | 21 | * in documentation (online or textual) provided with the package. |
| 22 | * | 22 | * |
| 23 | * Redistribution and use in source and binary forms, with or without | 23 | * Redistribution and use in source and binary forms, with or without |
| 24 | * modification, are permitted provided that the following conditions | 24 | * modification, are permitted provided that the following conditions |
| 25 | * are met: | 25 | * are met: |
| @@ -34,10 +34,10 @@ | |||
| 34 | * Eric Young (eay@cryptsoft.com)" | 34 | * Eric Young (eay@cryptsoft.com)" |
| 35 | * The word 'cryptographic' can be left out if the rouines from the library | 35 | * The word 'cryptographic' can be left out if the rouines from the library |
| 36 | * being used are not cryptographic related :-). | 36 | * being used are not cryptographic related :-). |
| 37 | * 4. If you include any Windows specific code (or a derivative thereof) from | 37 | * 4. If you include any Windows specific code (or a derivative thereof) from |
| 38 | * the apps directory (application code) you must include an acknowledgement: | 38 | * the apps directory (application code) you must include an acknowledgement: |
| 39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | 39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" |
| 40 | * | 40 | * |
| 41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | 41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND |
| 42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
| 43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | 43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
| @@ -49,7 +49,7 @@ | |||
| 49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | 49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY |
| 50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | 50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF |
| 51 | * SUCH DAMAGE. | 51 | * SUCH DAMAGE. |
| 52 | * | 52 | * |
| 53 | * The licence and distribution terms for any publically available version or | 53 | * The licence and distribution terms for any publically available version or |
| 54 | * derivative of this code cannot be changed. i.e. this code cannot simply be | 54 | * derivative of this code cannot be changed. i.e. this code cannot simply be |
| 55 | * copied and put under another distribution licence | 55 | * copied and put under another distribution licence |
| @@ -63,7 +63,7 @@ | |||
| 63 | * are met: | 63 | * are met: |
| 64 | * | 64 | * |
| 65 | * 1. Redistributions of source code must retain the above copyright | 65 | * 1. Redistributions of source code must retain the above copyright |
| 66 | * notice, this list of conditions and the following disclaimer. | 66 | * notice, this list of conditions and the following disclaimer. |
| 67 | * | 67 | * |
| 68 | * 2. Redistributions in binary form must reproduce the above copyright | 68 | * 2. Redistributions in binary form must reproduce the above copyright |
| 69 | * notice, this list of conditions and the following disclaimer in | 69 | * notice, this list of conditions and the following disclaimer in |
| @@ -110,7 +110,7 @@ | |||
| 110 | */ | 110 | */ |
| 111 | /* ==================================================================== | 111 | /* ==================================================================== |
| 112 | * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED. | 112 | * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED. |
| 113 | * ECC cipher suite support in OpenSSL originally developed by | 113 | * ECC cipher suite support in OpenSSL originally developed by |
| 114 | * SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project. | 114 | * SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project. |
| 115 | */ | 115 | */ |
| 116 | /* ==================================================================== | 116 | /* ==================================================================== |
| @@ -177,10 +177,10 @@ static const EVP_CIPHER *ssl_cipher_methods[SSL_ENC_NUM_IDX] = { | |||
| 177 | #define SSL_MD_SHA384_IDX 5 | 177 | #define SSL_MD_SHA384_IDX 5 |
| 178 | #define SSL_MD_STREEBOG256_IDX 6 | 178 | #define SSL_MD_STREEBOG256_IDX 6 |
| 179 | #define SSL_MD_STREEBOG512_IDX 7 | 179 | #define SSL_MD_STREEBOG512_IDX 7 |
| 180 | /*Constant SSL_MAX_DIGEST equal to size of digests array should be | 180 | /*Constant SSL_MAX_DIGEST equal to size of digests array should be |
| 181 | * defined in the | 181 | * defined in the |
| 182 | * ssl_locl.h */ | 182 | * ssl_locl.h */ |
| 183 | #define SSL_MD_NUM_IDX SSL_MAX_DIGEST | 183 | #define SSL_MD_NUM_IDX SSL_MAX_DIGEST |
| 184 | static const EVP_MD *ssl_digest_methods[SSL_MD_NUM_IDX] = { | 184 | static const EVP_MD *ssl_digest_methods[SSL_MD_NUM_IDX] = { |
| 185 | NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL | 185 | NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL |
| 186 | }; | 186 | }; |
| @@ -227,7 +227,7 @@ static const SSL_CIPHER cipher_aliases[] = { | |||
| 227 | .name = SSL_TXT_CMPALL, | 227 | .name = SSL_TXT_CMPALL, |
| 228 | .algorithm_enc = SSL_eNULL, | 228 | .algorithm_enc = SSL_eNULL, |
| 229 | }, | 229 | }, |
| 230 | 230 | ||
| 231 | /* | 231 | /* |
| 232 | * "COMPLEMENTOFDEFAULT" | 232 | * "COMPLEMENTOFDEFAULT" |
| 233 | * (does *not* include ciphersuites not found in ALL!) | 233 | * (does *not* include ciphersuites not found in ALL!) |
| @@ -238,7 +238,7 @@ static const SSL_CIPHER cipher_aliases[] = { | |||
| 238 | .algorithm_auth = SSL_aNULL, | 238 | .algorithm_auth = SSL_aNULL, |
| 239 | .algorithm_enc = ~SSL_eNULL, | 239 | .algorithm_enc = ~SSL_eNULL, |
| 240 | }, | 240 | }, |
| 241 | 241 | ||
| 242 | /* | 242 | /* |
| 243 | * key exchange aliases | 243 | * key exchange aliases |
| 244 | * (some of those using only a single bit here combine multiple key | 244 | * (some of those using only a single bit here combine multiple key |
| @@ -257,7 +257,7 @@ static const SSL_CIPHER cipher_aliases[] = { | |||
| 257 | .name = SSL_TXT_DH, | 257 | .name = SSL_TXT_DH, |
| 258 | .algorithm_mkey = SSL_kDHE, | 258 | .algorithm_mkey = SSL_kDHE, |
| 259 | }, | 259 | }, |
| 260 | 260 | ||
| 261 | { | 261 | { |
| 262 | .name = SSL_TXT_kECDHr, | 262 | .name = SSL_TXT_kECDHr, |
| 263 | .algorithm_mkey = SSL_kECDHr, | 263 | .algorithm_mkey = SSL_kECDHr, |
| @@ -278,12 +278,12 @@ static const SSL_CIPHER cipher_aliases[] = { | |||
| 278 | .name = SSL_TXT_ECDH, | 278 | .name = SSL_TXT_ECDH, |
| 279 | .algorithm_mkey = SSL_kECDHr|SSL_kECDHe|SSL_kECDHE, | 279 | .algorithm_mkey = SSL_kECDHr|SSL_kECDHe|SSL_kECDHE, |
| 280 | }, | 280 | }, |
| 281 | 281 | ||
| 282 | { | 282 | { |
| 283 | .name = SSL_TXT_kGOST, | 283 | .name = SSL_TXT_kGOST, |
| 284 | .algorithm_mkey = SSL_kGOST, | 284 | .algorithm_mkey = SSL_kGOST, |
| 285 | }, | 285 | }, |
| 286 | 286 | ||
| 287 | /* server authentication aliases */ | 287 | /* server authentication aliases */ |
| 288 | { | 288 | { |
| 289 | .name = SSL_TXT_aRSA, | 289 | .name = SSL_TXT_aRSA, |
| @@ -416,7 +416,7 @@ static const SSL_CIPHER cipher_aliases[] = { | |||
| 416 | .name = SSL_TXT_CHACHA20, | 416 | .name = SSL_TXT_CHACHA20, |
| 417 | .algorithm_enc = SSL_CHACHA20POLY1305, | 417 | .algorithm_enc = SSL_CHACHA20POLY1305, |
| 418 | }, | 418 | }, |
| 419 | 419 | ||
| 420 | /* MAC aliases */ | 420 | /* MAC aliases */ |
| 421 | { | 421 | { |
| 422 | .name = SSL_TXT_MD5, | 422 | .name = SSL_TXT_MD5, |
| @@ -454,7 +454,7 @@ static const SSL_CIPHER cipher_aliases[] = { | |||
| 454 | .name = SSL_TXT_STREEBOG512, | 454 | .name = SSL_TXT_STREEBOG512, |
| 455 | .algorithm_mac = SSL_STREEBOG512, | 455 | .algorithm_mac = SSL_STREEBOG512, |
| 456 | }, | 456 | }, |
| 457 | 457 | ||
| 458 | /* protocol version aliases */ | 458 | /* protocol version aliases */ |
| 459 | { | 459 | { |
| 460 | .name = SSL_TXT_SSLV3, | 460 | .name = SSL_TXT_SSLV3, |
| @@ -468,7 +468,7 @@ static const SSL_CIPHER cipher_aliases[] = { | |||
| 468 | .name = SSL_TXT_TLSV1_2, | 468 | .name = SSL_TXT_TLSV1_2, |
| 469 | .algorithm_ssl = SSL_TLSV1_2, | 469 | .algorithm_ssl = SSL_TLSV1_2, |
| 470 | }, | 470 | }, |
| 471 | 471 | ||
| 472 | /* strength classes */ | 472 | /* strength classes */ |
| 473 | { | 473 | { |
| 474 | .name = SSL_TXT_LOW, | 474 | .name = SSL_TXT_LOW, |
| @@ -876,7 +876,7 @@ ssl_cipher_collect_ciphers(const SSL_METHOD *ssl_method, int num_of_ciphers, | |||
| 876 | 876 | ||
| 877 | /* | 877 | /* |
| 878 | * Prepare linked list from list entries | 878 | * Prepare linked list from list entries |
| 879 | */ | 879 | */ |
| 880 | if (co_list_num > 0) { | 880 | if (co_list_num > 0) { |
| 881 | co_list[0].prev = NULL; | 881 | co_list[0].prev = NULL; |
| 882 | 882 | ||
