svn rev #23446: trunk/src/lib/crypto/krb/

[ghudson@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=23446
Commit By: ghudson
Log Message:
Remove some code paths in crypto-length which are dead now that the
internal interface can't return an error.



Changed Files:
U   trunk/src/lib/crypto/krb/crypto_length.c
Modified: trunk/src/lib/crypto/krb/crypto_length.c
===================================================================
--- trunk/src/lib/crypto/krb/crypto_length.c	2009-12-04 14:54:57 UTC (rev 23445)
+++ trunk/src/lib/crypto/krb/crypto_length.c	2009-12-04 14:58:10 UTC (rev 23446)
@@ -34,7 +34,6 @@
                      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 @@
         *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_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 @@
         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;