summaryrefslogtreecommitdiff
path: root/src/common/crypto.c
diff options
context:
space:
mode:
authorSebastian Hahn <sebastian@torproject.org>2009-10-27 04:31:23 +0100
committerSebastian Hahn <sebastian@torproject.org>2009-10-27 04:31:23 +0100
commit70abd843fd006cd25dadd388e5f4ff753c3a4668 (patch)
treed3c14deb20557089f6f277cf3a47aecd54c6be18 /src/common/crypto.c
parent174be15c1a062bb39298418a9c530f73557c4916 (diff)
downloadtor-70abd843fd006cd25dadd388e5f4ff753c3a4668.tar.gz
tor-70abd843fd006cd25dadd388e5f4ff753c3a4668.zip
crypto_cipher_set_key cannot fail
In 5e4d53d535a3cc9903250b3df0caa829f1c5e4bf we made it so that crypto_cipher_set_key cannot fail. The call will now always succeed, to returning a boolean for success/failure makes no sense.
Diffstat (limited to 'src/common/crypto.c')
-rw-r--r--src/common/crypto.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/common/crypto.c b/src/common/crypto.c
index 4c880f6b6f..bc1eb38121 100644
--- a/src/common/crypto.c
+++ b/src/common/crypto.c
@@ -426,10 +426,7 @@ crypto_create_init_cipher(const char *key, int encrypt_mode)
return NULL;
}
- if (crypto_cipher_set_key(crypto, key)) {
- crypto_log_errors(LOG_WARN, "setting symmetric key");
- goto error;
- }
+ crypto_cipher_set_key(crypto, key);
if (encrypt_mode)
r = crypto_cipher_encrypt_init_cipher(crypto);
@@ -1252,16 +1249,14 @@ crypto_cipher_generate_key(crypto_cipher_env_t *env)
/** Set the symmetric key for the cipher in <b>env</b> to the first
* CIPHER_KEY_LEN bytes of <b>key</b>. Does not initialize the cipher.
- * Return 0 on success, -1 on failure.
*/
-int
+void
crypto_cipher_set_key(crypto_cipher_env_t *env, const char *key)
{
tor_assert(env);
tor_assert(key);
memcpy(env->key, key, CIPHER_KEY_LEN);
- return 0;
}
/** Generate an initialization vector for our AES-CTR cipher; store it