diff options
| author | Andrea Shepard <andrea@torproject.org> | 2015-06-01 12:59:14 +0000 |
|---|---|---|
| committer | Andrea Shepard <andrea@torproject.org> | 2015-06-01 12:59:14 +0000 |
| commit | 0e0b65db4f0f0c67bcbb3f51a9e6061bc4c96c5e (patch) | |
| tree | c10b78ee986ba214d4fdc4061875919eaa33d4fc /src/common | |
| parent | 90e07ab338cd59caeaeb31a3d207bb34d433b8ab (diff) | |
| download | tor-0e0b65db4f0f0c67bcbb3f51a9e6061bc4c96c5e.tar.gz tor-0e0b65db4f0f0c67bcbb3f51a9e6061bc4c96c5e.zip | |
Appease make check-spaces
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/aes.c | 1 | ||||
| -rw-r--r-- | src/common/crypto_ed25519.h | 1 | ||||
| -rw-r--r-- | src/common/tortls.c | 3 |
3 files changed, 3 insertions, 2 deletions
diff --git a/src/common/aes.c b/src/common/aes.c index dbc12dcd23..8b9d81fa10 100644 --- a/src/common/aes.c +++ b/src/common/aes.c @@ -501,3 +501,4 @@ aes_set_iv(aes_cnt_cipher_t *cipher, const char *iv) } #endif + diff --git a/src/common/crypto_ed25519.h b/src/common/crypto_ed25519.h index 8ffb9f26f3..4d20406d06 100644 --- a/src/common/crypto_ed25519.h +++ b/src/common/crypto_ed25519.h @@ -88,7 +88,6 @@ int ed25519_public_blind(ed25519_public_key_t *out, const ed25519_public_key_t *inp, const uint8_t *param); - /* XXXX move these to crypto_format.h */ #define ED25519_BASE64_LEN 43 int ed25519_public_from_base64(ed25519_public_key_t *pkey, diff --git a/src/common/tortls.c b/src/common/tortls.c index 098df9db6c..a4b6c487fe 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -1810,7 +1810,8 @@ rectify_client_ciphers(SSL *ssl) SSL_CIPHER_get_name(cipher)); ++j; } else if (cipher && - (SSL_CIPHER_get_id(cipher) & 0xffff) == CLIENT_CIPHER_INFO_LIST[i].id) { + (SSL_CIPHER_get_id(cipher) & 0xffff) == + CLIENT_CIPHER_INFO_LIST[i].id) { /* "cipher" is the cipher we expect. Put it on the list. */ log_debug(LD_NET, "Found cipher %s", SSL_CIPHER_get_name(cipher)); sk_SSL_CIPHER_push(CLIENT_CIPHER_STACK, cipher); |