Commit e358a362 authored by Roger Dingledine's avatar Roger Dingledine
Browse files

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


svn:r939
parent 7c439c30

src/common/crypto.c

+9 −7
Original line number Diff line number Diff line
@@ -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,6 +844,7 @@ 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)
@@ -852,6 +853,7 @@ crypto_digest_add_bytes(crypto_digest_env_t *digest, const char *data, 
  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)

{
@@ -863,12 +865,13 @@ 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
@@ -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;

src/common/crypto.h

+4 −4
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ void crypto_digest_add_bytes(crypto_digest_env_t *digest, const char *data, 
                             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);

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);