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

change crypto_digest_new_env to crypto_new_digest_env 

(and same with _free_)
to match our conventions
i think our conventions may be getting too ad hoc


svn:r940
parent e358a362

src/common/crypto.c

+24 −23
Original line number Diff line number Diff line
@@ -66,8 +66,8 @@ struct crypto_cipher_env_t 
static INLINE int

crypto_cipher_iv_length(int type) {

  /*

  printf("%d -> %d IV\n",type, EVP_CIPHER_iv_length(

						  crypto_cipher_evp_cipher(type,0)));

  printf("%d -> %d IV\n",type,

         EVP_CIPHER_iv_length(crypto_cipher_evp_cipher(type,0)));

  */

  switch(type)

    {
@@ -83,8 +83,8 @@ crypto_cipher_iv_length(int type) { 
static INLINE int

crypto_cipher_key_length(int type) {

  /*

  printf("%d -> %d\n",type, EVP_CIPHER_key_length(

						  crypto_cipher_evp_cipher(type,0)));

  printf("%d -> %d\n",type,

         EVP_CIPHER_key_length(crypto_cipher_evp_cipher(type,0)));

  */

  switch(type)

    {
@@ -830,7 +830,7 @@ struct crypto_digest_env_t { 
};



crypto_digest_env_t *

crypto_digest_new_env(int type)

crypto_new_digest_env(int type)

{

  crypto_digest_env_t *r;

  assert(type == CRYPTO_SHA1_DIGEST);
@@ -840,7 +840,7 @@ crypto_digest_new_env(int type) 
}



void

crypto_digest_free(crypto_digest_env_t *digest) {

crypto_free_digest_env(crypto_digest_env_t *digest) {

  assert(digest);

  tor_free(digest);

}
@@ -997,6 +997,7 @@ int crypto_dh_compute_secret(crypto_dh_env_t *dh, 
    goto error;

  secret_tmp = tor_malloc(crypto_dh_get_bytes(dh)+1);

  secret_len = DH_compute_key(secret_tmp, pubkey_bn, dh->dh);

  assert(secret_len == crypto_dh_get_bytes(dh));

  for (i = 0; i < secret_bytes_out; i += 20) {

    secret_tmp[secret_len] = (unsigned char) i/20;

    if (crypto_SHA_digest(secret_tmp, secret_len+1, hash))

src/common/crypto.h

+2 −2
Original line number Diff line number Diff line
@@ -99,8 +99,8 @@ crypto_cipher_env_t *crypto_create_init_cipher(int cipher_type, char *key, char 


/* SHA-1 */

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

crypto_digest_env_t *crypto_digest_new_env(int type);

void crypto_free_digest_env(crypto_digest_env_t *digest);

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,