Changeset 740 for vendor/current/source4/heimdal/lib/hcrypto/des.c

Timestamp:

Nov 14, 2012, 12:59:34 PM (12 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

File:

• vendor/current/source4/heimdal/lib/hcrypto/des.c (modified) (2 diffs)

vendor/current/source4/heimdal/lib/hcrypto/des.c ¶

@@ -92 +92 @@
 #include <krb5-types.h>
 #include <assert.h>
+
+#include <roken.h>
 
 #include "des.h"
@@ -181 +183 @@
 DES_is_weak_key(DES_cblock *key)
 {
+    int weak = 0;
     int i;
 
-    for (i = 0; i < sizeof(weak_keys)/sizeof(weak_keys[0]); i++) {
-        if (memcmp(weak_keys[i], key, DES_CBLOCK_LEN) == 0)
-            return 1;
-    }
-    return 0;
+    for (i = 0; i < sizeof(weak_keys)/sizeof(weak_keys[0]); i++)
+        weak ^= (ct_memcmp(weak_keys[i], key, DES_CBLOCK_LEN) == 0);
+
+    return !!weak;
 }