r15481: Update heimdal/ to match current lorikeet-heimdal.

[amitay/samba.git] / source4 / heimdal / lib / des / des.c

diff --git a/source4/heimdal/lib/des/des.c b/source4/heimdal/lib/des/des.c
index 32d479e372b4680911d4263acef1221ea62a5ea4..5b1f5c29f4f5e4fb409a6c00aaf40dd0ec2fd270 100644 (file)
--- a/source4/heimdal/lib/des/des.c
+++ b/source4/heimdal/lib/des/des.c
@@ -45,7 +45,7 @@
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id: des.c,v 1.17 2006/04/14 14:19:36 lha Exp $");
+RCSID("$Id: des.c,v 1.18 2006/04/24 14:26:19 lha Exp $");
 #endif
 
 #include <stdio.h>
@@ -513,9 +513,10 @@ DES_cfb64_encrypt(const void *in, void *out,
 
     load(*iv, uiv);
 
+    assert(*num >= 0 && *num < DES_CBLOCK_LEN);
+
     if (forward_encrypt) {
        int i = *num;
-       assert(i >= 0);
 
        while (length > 0) {
            if (i == 0)
@@ -537,7 +538,6 @@ DES_cfb64_encrypt(const void *in, void *out,
     } else {
        int i = *num;
        unsigned char c;
-       assert(i >= 0);
 
        while (length > 0) {
            if (i == 0) {