summaryrefslogtreecommitdiffstats
path: root/src/lib/crypto
diff options
context:
space:
mode:
authorEzra Peisach <epeisach@mit.edu>2011-07-24 12:17:13 +0000
committerEzra Peisach <epeisach@mit.edu>2011-07-24 12:17:13 +0000
commitd5429c251d8559d58040a36401f09a14494aa628 (patch)
tree99d2a76ee8594e60772b70f71f8c9feaf45ba9b4 /src/lib/crypto
parentb11e3ceee62898638d18abd764b0b2193e593876 (diff)
downloadkrb5-d5429c251d8559d58040a36401f09a14494aa628.tar.gz
krb5-d5429c251d8559d58040a36401f09a14494aa628.tar.xz
krb5-d5429c251d8559d58040a36401f09a14494aa628.zip
Clean up a number of variables set but not used warnings
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@25041 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/crypto')
-rw-r--r--src/lib/crypto/builtin/des/f_aead.c3
-rw-r--r--src/lib/crypto/builtin/pbkdf2.c3
2 files changed, 2 insertions, 4 deletions
diff --git a/src/lib/crypto/builtin/des/f_aead.c b/src/lib/crypto/builtin/des/f_aead.c
index 08bd5f8b2..5d8028626 100644
--- a/src/lib/crypto/builtin/des/f_aead.c
+++ b/src/lib/crypto/builtin/des/f_aead.c
@@ -161,7 +161,7 @@ krb5int_des_cbc_mac(const krb5_crypto_iov *data, unsigned long num_data,
const unsigned DES_INT32 *kp;
const unsigned char *ip;
struct iov_block_state input_pos;
- unsigned char storage[MIT_DES_BLOCK_LENGTH], *block = NULL, *ptr;
+ unsigned char storage[MIT_DES_BLOCK_LENGTH], *ptr;
IOV_BLOCK_STATE_INIT(&input_pos);
input_pos.include_sign_only = 1;
@@ -181,7 +181,6 @@ krb5int_des_cbc_mac(const krb5_crypto_iov *data, unsigned long num_data,
if (!krb5int_c_iov_get_block_nocopy(storage, MIT_DES_BLOCK_LENGTH,
data, num_data, &input_pos, &ptr))
break;
- block = ptr;
/* Decompose this block and xor it with the previous ciphertext. */
GET_HALF_BLOCK(temp, ptr);
diff --git a/src/lib/crypto/builtin/pbkdf2.c b/src/lib/crypto/builtin/pbkdf2.c
index 5c483b189..e6d13f6fb 100644
--- a/src/lib/crypto/builtin/pbkdf2.c
+++ b/src/lib/crypto/builtin/pbkdf2.c
@@ -150,7 +150,7 @@ krb5int_pbkdf2 (prf_fn prf, size_t hlen, krb5_key pass,
const krb5_data *salt, unsigned long count,
const krb5_data *output)
{
- int l, r, i;
+ int l, i;
char *utmp1, *utmp2;
char utmp3[20]; /* XXX length shouldn't be hardcoded! */
@@ -161,7 +161,6 @@ krb5int_pbkdf2 (prf_fn prf, size_t hlen, krb5_key pass,
abort();
/* Step 2. */
l = (output->length + hlen - 1) / hlen;
- r = output->length - (l - 1) * hlen;
utmp1 = /*output + dklen; */ malloc(hlen);
if (utmp1 == NULL)