aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Hudson <ghudson@mit.edu>2009-12-04 14:58:10 +0000
committerGreg Hudson <ghudson@mit.edu>2009-12-04 14:58:10 +0000
commit241a5e70b94f4312ba76199631f5931504bd2a57 (patch)
treef755ae8c15ec781b9ad76c4c057f4b6b71336ebb
parent08c0a1ca2d7a4a0bf9e27dbaff409a3ffb9d2360 (diff)
downloadkrb5-241a5e70b94f4312ba76199631f5931504bd2a57.zip
krb5-241a5e70b94f4312ba76199631f5931504bd2a57.tar.gz
krb5-241a5e70b94f4312ba76199631f5931504bd2a57.tar.bz2
Remove some code paths in crypto-length which are dead now that the
internal interface can't return an error. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23446 dc483132-0cff-0310-8789-dd5450dbe970
-rw-r--r--src/lib/crypto/krb/crypto_length.c13
1 files changed, 2 insertions, 11 deletions
diff --git a/src/lib/crypto/krb/crypto_length.c b/src/lib/crypto/krb/crypto_length.c
index 91593ce..3b0a9ac 100644
--- a/src/lib/crypto/krb/crypto_length.c
+++ b/src/lib/crypto/krb/crypto_length.c
@@ -34,7 +34,6 @@ krb5_c_crypto_length(krb5_context context, krb5_enctype enctype,
krb5_cryptotype type, unsigned int *size)
{
const struct krb5_keytypes *ktp;
- krb5_error_code ret = 0;
ktp = find_enctype(enctype);
if (ktp == NULL)
@@ -55,11 +54,10 @@ krb5_c_crypto_length(krb5_context context, krb5_enctype enctype,
*size = ktp->crypto_length(ktp, type);
break;
default:
- ret = EINVAL;
- break;
+ return EINVAL;
}
- return ret;
+ return 0;
}
krb5_error_code KRB5_CALLCONV
@@ -80,7 +78,6 @@ krb5_error_code KRB5_CALLCONV
krb5_c_crypto_length_iov(krb5_context context, krb5_enctype enctype,
krb5_crypto_iov *data, size_t num_data)
{
- krb5_error_code ret = 0;
size_t i;
const struct krb5_keytypes *ktp;
unsigned int data_length = 0, pad_length;
@@ -118,14 +115,8 @@ krb5_c_crypto_length_iov(krb5_context context, krb5_enctype enctype,
default:
break;
}
-
- if (ret != 0)
- break;
}
- if (ret != 0)
- return ret;
-
pad_length = krb5int_c_padding_length(ktp, data_length);
if (pad_length != 0 && padding == NULL)
return EINVAL;