Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Mike Perry
Tor
Commits
b5cfcb20
Commit
b5cfcb20
authored
Jul 16, 2015
by
Nick Mathewson
🎨
Browse files
Fix most check-spaces issues
parent
8cb50703
Changes
9
Hide whitespace changes
Inline
Side-by-side
src/common/compat.c
View file @
b5cfcb20
...
...
@@ -80,7 +80,8 @@ wint_t _getwch(void);
#define WEOF (wchar_t)(0xFFFF)
#endif
#if defined(HAVE_DECL_SECUREZEROMEMORY) && !HAVE_DECL_SECUREZEROMEMORY
static
inline
void
SecureZeroMemory
(
PVOID
ptr
,
SIZE_T
cnt
)
static
inline
void
SecureZeroMemory
(
PVOID
ptr
,
SIZE_T
cnt
)
{
volatile
char
*
vcptr
=
(
volatile
char
*
)
ptr
;
while
(
cnt
--
)
...
...
@@ -3378,3 +3379,4 @@ tor_getpass(const char *prompt, char *output, size_t buflen)
#error "No implementation for tor_getpass found!"
#endif
}
src/common/crypto_curve25519.c
View file @
b5cfcb20
...
...
@@ -353,7 +353,7 @@ curve25519_basepoint_spot_check(void)
/* Check the most basic possible sanity via the test secret/public key pair
* used in "Cryptography in NaCl - 2. Secret keys and public keys". This
* may catch catastrophic failures on systems where Curve25519 is expensive,
* may catch catastrophic failures on systems where Curve25519 is expensive,
* without requiring a ton of key generation.
*/
curve25519_use_ed
=
1
;
...
...
src/common/util.c
View file @
b5cfcb20
...
...
@@ -2561,7 +2561,7 @@ read_file_to_str_until_eof(int fd, size_t max_bytes_to_read, size_t *sz_out)
size_t
string_max
=
0
;
if
(
max_bytes_to_read
+
1
>=
SIZE_T_CEILING
)
{
errno
=
EINVAL
;
errno
=
EINVAL
;
return
NULL
;
}
...
...
src/or/config.c
View file @
b5cfcb20
...
...
@@ -2591,7 +2591,6 @@ options_validate_cb(void *old_options, void *options, void *default_options,
STMT_BEGIN log_warn(LD_CONFIG, args, ##__VA_ARGS__); STMT_END
#endif
/** Log a warning message iff <b>filepath</b> is not absolute.
* Warning message must contain option name <b>option</b> and
* an absolute path that <b>filepath<b> will resolve to.
...
...
src/or/rendcache.c
View file @
b5cfcb20
...
...
@@ -237,7 +237,7 @@ rend_cache_lookup_entry(const char *query, int version, rend_cache_entry_t **e)
*
e
=
entry
;
}
end:
end:
return
ret
;
}
...
...
@@ -374,9 +374,9 @@ rend_cache_store_v2_desc_as_dir(const char *desc)
number_stored
++
;
goto
advance
;
skip:
skip:
rend_service_descriptor_free
(
parsed
);
advance:
advance:
/* advance to next descriptor, if available. */
current_desc
=
next_desc
;
/* check if there is a next descriptor. */
...
...
@@ -566,14 +566,15 @@ rend_cache_store_v2_desc_as_client(const char *desc,
}
return
RCS_OKAY
;
okay:
okay:
if
(
entry
)
{
*
entry
=
e
;
}
retval
=
RCS_OKAY
;
err:
err:
rend_service_descriptor_free
(
parsed
);
tor_free
(
intro_content
);
return
retval
;
}
src/or/rendcache.h
View file @
b5cfcb20
...
...
@@ -54,3 +54,4 @@ rend_cache_store_status_t rend_cache_store_v2_desc_as_client(const char *desc,
size_t
rend_cache_get_total_allocation
(
void
);
#endif
/* TOR_RENDCACHE_H */
src/or/routerkeys.c
View file @
b5cfcb20
...
...
@@ -61,7 +61,6 @@ read_encrypted_secret_key(ed25519_secret_key_t *out,
* it right. */
}
if
(
secret_len
!=
ED25519_SECKEY_LEN
)
{
log_err
(
LD_OR
,
"%s is corrupted."
,
fname
);
saved_errno
=
EINVAL
;
...
...
src/or/routerparse.c
View file @
b5cfcb20
...
...
@@ -4498,7 +4498,6 @@ microdescs_parse_from_string(const char *s, const char *eos,
}
}
if
(
tokenize_string
(
area
,
s
,
start_of_next_microdesc
,
tokens
,
microdesc_token_table
,
flags
))
{
log_warn
(
LD_DIR
,
"Unparseable microdescriptor"
);
...
...
src/test/test_crypto_slow.c
View file @
b5cfcb20
...
...
@@ -172,8 +172,8 @@ test_libscrypt_eq_openssl(void *arg)
p
=
16
;
libscrypt_retval
=
libscrypt_scrypt
((
const
uint8_t
*
)
"password"
,
0
,
(
const
uint8_t
*
)
"NaCl"
,
0
,
libscrypt_scrypt
((
const
uint8_t
*
)
"password"
,
0
,
(
const
uint8_t
*
)
"NaCl"
,
0
,
r
,
N
,
p
,
buf1
,
dk_len
);
openssl_retval
=
EVP_PBE_scrypt
((
const
char
*
)
"password"
,
0
,
...
...
@@ -211,10 +211,10 @@ test_libscrypt_eq_openssl(void *arg)
memset(buf2,0,64);
r = 1048576;
libscrypt_retval =
libscrypt_scrypt((const uint8_t *)"pleaseletmein", 0,
(const uint8_t *)"SodiumChloride", 0,
libscrypt_scrypt((const uint8_t *)"pleaseletmein", 0,
(const uint8_t *)"SodiumChloride", 0,
N, r, p, buf1, dk_len);
openssl_retval =
EVP_PBE_scrypt((const char *)"pleaseletmein", 0,
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment