svn rev #21617: branches/mskrb-integ/src/lib/crypto/

[lhoward@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=21617
Commit By: lhoward
Log Message:
fix a logic error introduced in r21615


Changed Files:
U   branches/mskrb-integ/src/lib/crypto/verify_checksum.c
Modified: branches/mskrb-integ/src/lib/crypto/verify_checksum.c
===================================================================
--- branches/mskrb-integ/src/lib/crypto/verify_checksum.c	2008-12-28 12:40:13 UTC (rev 21616)
+++ branches/mskrb-integ/src/lib/crypto/verify_checksum.c	2008-12-28 12:52:19 UTC (rev 21617)
@@ -56,19 +56,16 @@
 
 	keyhash = krb5_cksumtypes_list[i].keyhash;
 
-	if (keyhash->verify == NULL) {
+	if (keyhash->verify == NULL && keyhash->verify_iov != NULL) {
 	    krb5_crypto_iov iov[1];
 
 	    iov[0].flags = KRB5_CRYPTO_TYPE_DATA;
 	    iov[0].data = *data;
 
-	    assert(keyhash->verify_iov != NULL);
-
-	    ret = (*keyhash->verify_iov)(key, usage, 0, iov, 1, &indata, valid);
-	} else {
-	    ret = (*keyhash->verify)(key, usage, 0, data, &indata, valid);
+	    return (*keyhash->verify_iov)(key, usage, 0, iov, 1, &indata, valid);
+	} else if (keyhash->verify != NULL) {
+	    return (*keyhash->verify)(key, usage, 0, data, &indata, valid);
 	}
-	return(ret);
     }
 
     /* otherwise, make the checksum again, and compare */