From: Paul Park <pjpark@mit.edu>
Date: Thu, 27 Jul 1995 19:40:09 +0000 (+0000)
Subject: Remove dependence on mit-des.h
X-Git-Tag: krb5-1.0-beta6~1485
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=255a8d31af62e6d8e6c46a4bb698c5f7fa812b6e;p=krb5.git

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 3aeab5aea..60d1b540b 100644
--- 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 08453f0c0..d66d53595 100644
--- 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) {