r17491@catbus: nickm | 2008-01-07 11:50:24 -0500

Remove some dead code.


svn:r13053
This commit is contained in:
Nick Mathewson 2008-01-07 16:50:33 +00:00
parent 491298a067
commit becbafc9db
3 changed files with 0 additions and 65 deletions

View File

@ -26,11 +26,6 @@ void aes_set_key(aes_cnt_cipher_t *cipher, const char *key, int key_bits);
void aes_crypt(aes_cnt_cipher_t *cipher, const char *input, size_t len,
char *output);
void aes_set_iv(aes_cnt_cipher_t *cipher, const char *iv);
#if 0
uint64_t aes_get_counter(aes_cnt_cipher_t *cipher);
void aes_set_counter(aes_cnt_cipher_t *cipher, uint64_t counter);
void aes_adjust_counter(aes_cnt_cipher_t *cipher, long delta);
#endif
#endif

View File

@ -499,16 +499,6 @@ void *
smartlist_bsearch(smartlist_t *sl, const void *key,
int (*compare)(const void *key, const void **member))
{
#if 0
void ** r;
if (!sl->num_used)
return NULL;
r = bsearch(key, sl->list, sl->num_used, sizeof(void*),
(int (*)(const void *, const void *))compare);
return r ? *r : NULL;
#endif
int found, idx;
idx = smartlist_bsearch_idx(sl, key, compare, &found);
return found ? smartlist_get(sl, idx) : NULL;

View File

@ -1311,56 +1311,6 @@ crypto_digest_assign(crypto_digest_env_t *into,
memcpy(into,from,sizeof(crypto_digest_env_t));
}
#if 0
/**DOCDOC */
#define DIGEST_BLOCKSIZE 64
/** Compute the HMAC-SHA-1 of the <b>msg_len</b> bytes in <b>msg</b>, using
* the <b>key</b> of length <b>key_len</b>. Store the DIGEST_LEN-byte result
* in <b>hmac_out</b>.
*/
void
crypto_hmac_sha1(char *hmac_out,
const char *key, size_t key_len,
const char *msg, size_t msg_len)
{
SHA_CTX sha;
uint8_t K[DIGEST_BLOCKSIZE], D[DIGEST_LEN], K_SHORT[DIGEST_LEN];
const uint8_t *real_key;
unsigned int i;
if (key_len > DIGEST_BLOCKSIZE) {
SHA1((const unsigned char*)key, key_len, K_SHORT);
key_len = DIGEST_LEN;
real_key = K_SHORT;
} else {
real_key = (const uint8_t*)key;
}
memset(K, 0, sizeof(K));
memcpy(K, real_key, key_len);
for (i=0; i < sizeof(K); ++i)
K[i] ^= 0x36;
SHA1_Init(&sha);
SHA1_Update(&sha, K, sizeof(K));
SHA1_Update(&sha, msg, msg_len);
SHA1_Final(D, &sha);
/*
memset(K, 0, sizeof(K));
memcpy(K, real_key, key_len);
for (i=0; i < sizeof(K); ++i)
K[i] ^= 0x5c;
*/
for (i=0; i < sizeof(K); ++i)
K[i] ^= (0x36 ^ 0x5c);
SHA1_Init(&sha);
SHA1_Update(&sha, K, sizeof(K));
SHA1_Update(&sha, D, sizeof(D));
SHA1_Final((unsigned char*)hmac_out, &sha);
}
#endif
/** Compute the HMAC-SHA-1 of the <b>msg_len</b> bytes in <b>msg</b>, using
* the <b>key</b> of length <b>key_len</b>. Store the DIGEST_LEN-byte result
* in <b>hmac_out</b>.