diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-05-20 15:33:22 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-05-20 15:33:22 -0400 |
| commit | ed02a409cfdd51671ff1d80c86cfc7d6458f201f (patch) | |
| tree | 527aeae3937418ca204426b682d7efd61c0ad57b /src/common/crypto.h | |
| parent | 32bd533ddac5bd7d594a81119449b3d30206eedd (diff) | |
| parent | e9677c8f8d3a24bc572d63dd85fa14e8d596ad78 (diff) | |
| download | tor-ed02a409cfdd51671ff1d80c86cfc7d6458f201f.tar.gz tor-ed02a409cfdd51671ff1d80c86cfc7d6458f201f.zip | |
Merge branch 'bug16034_no_more_openssl_098_squashed'
Conflicts:
src/test/testing_common.c
Diffstat (limited to 'src/common/crypto.h')
| -rw-r--r-- | src/common/crypto.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/crypto.h b/src/common/crypto.h index 8b620d910c..05572f4565 100644 --- a/src/common/crypto.h +++ b/src/common/crypto.h @@ -253,7 +253,7 @@ int crypto_expand_key_material_rfc5869_sha256( uint8_t *key_out, size_t key_out_len); /* random numbers */ -int crypto_seed_rng(int startup); +int crypto_seed_rng(void); MOCK_DECL(int,crypto_rand,(char *to, size_t n)); int crypto_strongest_rand(uint8_t *out, size_t out_len); int crypto_rand_int(unsigned int max); |