nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-20 21:16:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

rename digest_copy to digest_dup, make it return, make gcc happier

Browse Source 
svn:r939
This commit is contained in:
Roger Dingledine 2003-12-16 05:47:21 +00:00
parent 7c439c30d0
commit e358a362ee
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/common/crypto.c
View File

@ -818,7 +818,6 @@ crypto_cipher_advance(crypto_cipher_env_t *env, long delta)
}
}
/* SHA-1 */
int crypto_SHA_digest(const unsigned char *m, int len, unsigned char *digest)
{
@ -833,8 +832,9 @@ struct crypto_digest_env_t {
crypto_digest_env_t *
crypto_digest_new_env(int type)
{
crypto_digest_env_t *r;
assert(type == CRYPTO_SHA1_DIGEST);
crypto_digest_env_t *r = tor_malloc(sizeof(crypto_digest_env_t));
r = tor_malloc(sizeof(crypto_digest_env_t));
SHA1_Init(&r->d);
return r;
}
@ -844,16 +844,18 @@ crypto_digest_free(crypto_digest_env_t *digest) {
assert(digest);
tor_free(digest);
}
void
crypto_digest_add_bytes(crypto_digest_env_t *digest, const char *data,
size_t len)
size_t len)
{
assert(digest);
assert(data);
SHA1_Update(&digest->d, (void*)data, len);
}
void crypto_digest_get_digest(crypto_digest_env_t *digest,
char *out, size_t out_len)
char *out, size_t out_len)
{
static char r[SHA_DIGEST_LENGTH];
assert(digest && out);
@ -863,17 +865,18 @@ void crypto_digest_get_digest(crypto_digest_env_t *digest,
}
crypto_digest_env_t *
crypto_digest_copy(const crypto_digest_env_t *digest)
crypto_digest_dup(const crypto_digest_env_t *digest)
{
crypto_digest_env_t *r;
assert(digest);
r = tor_malloc(sizeof(crypto_digest_env_t));
memcpy(r,digest,sizeof(crypto_digest_env_t));
return r;
}
void
crypto_digest_assign(crypto_digest_env_t *into,
const crypto_digest_env_t *from)
const crypto_digest_env_t *from)
{
assert(into && from);
memcpy(into,from,sizeof(crypto_digest_env_t));
@ -883,7 +886,6 @@ crypto_digest_assign(crypto_digest_env_t *into,
static BIGNUM *dh_param_p = NULL;
static BIGNUM *dh_param_g = NULL;
static void init_dh_param() {
BIGNUM *p, *g;
int r;

8
src/common/crypto.h
View File

@ -102,12 +102,12 @@ int crypto_SHA_digest(const unsigned char *m, int len, unsigned char *digest);
crypto_digest_env_t *crypto_new_digest_env(int type);
void crypto_digest_free(crypto_digest_env_t *digest);
void crypto_digest_add_bytes(crypto_digest_env_t *digest, const char *data,
size_t len);
size_t len);
void crypto_digest_get_digest(crypto_digest_env_t *digest,
char *out, size_t out_len);
crypto_digest_env_t *crypto_digest_copy(const crypto_digest_env_t *digest);
char *out, size_t out_len);
crypto_digest_env_t *crypto_digest_dup(const crypto_digest_env_t *digest);
void crypto_digest_assign(crypto_digest_env_t *into,
const crypto_digest_env_t *from);
const crypto_digest_env_t *from);
/* random numbers */
int crypto_seed_rng();