Remove dependence on mit-des.h

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6335 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/kadmin/v5server/ChangeLog b/src/kadmin/v5server/ChangeLog
index 3aeab5aeaca2e7bbe7f5717f9341c615fc4ac3a2..60d1b540be6a666253c00a49e3f5d0ebe7c4ab4c 100644 (file)
--- a/src/kadmin/v5server/ChangeLog
+++ b/src/kadmin/v5server/ChangeLog
@@ -1,4 +1,9 @@
 
+Thu Jul 27 15:08:29 EDT 1995   Paul Park       (pjpark@mit.edu)
+       * srv_key.c - Remove inclusion of "mit-des.h", it's no longer needed.
+               Use KRB5_MIT_DES_KEYSIZE instead of sizeof(mit_des_cblock).
+
+
 Mon Jul 17 15:07:08 EDT 1995   Paul Park       (pjpark@mit.edu)
        * srv_main.c - Add stash-file handling and supply appropriate value to
                krb5_db_fetch_mkey().  Add KDC profile reading/handling to

diff --git a/src/kadmin/v5server/srv_key.c b/src/kadmin/v5server/srv_key.c
index 08453f0c0c29bc4bbc75bdded7a1cf6db7b60f2e..d66d53595f086fccc0235c5dfdf4b10841e41da7 100644 (file)
--- a/src/kadmin/v5server/srv_key.c
+++ b/src/kadmin/v5server/srv_key.c
@@ -29,7 +29,6 @@
 #include "adm.h"
 #include "com_err.h"
 #include "kadm5_defs.h"
-#include "mit-des.h"
 
 /*
  * These control the maximum [renewable] life of the changepw principal, if
@@ -833,11 +832,11 @@ key_pwd_is_weak(kcontext, principal, string, psalttype, asalttype)
                                  &asalt);
        if (!kret) {
            if (primary.length &&
-               (primary.length == sizeof(mit_des_cblock)) &&
+               (primary.length == KRB5_MIT_DES_KEYSIZE) &&
                mit_des_is_weak_key(primary.contents))
                weakness = 1;
            if (alternate.length &&
-               (alternate.length == sizeof(mit_des_cblock)) &&
+               (alternate.length == KRB5_MIT_DES_KEYSIZE) &&
                mit_des_is_weak_key(alternate.contents))
                weakness = 1;
            if (primary.contents) {