Pull up r17504 from trunk

ticket: 3250
version_fixed: 1.4.4

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-4@17506 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/crypto/ChangeLog b/src/lib/crypto/ChangeLog
index 80f269ea7ad2732840f713610c336ac04f43cfbe..b5b1f08a3b8e285926db4e850fa70d1607a74470 100644 (file)
--- a/src/lib/crypto/ChangeLog
+++ b/src/lib/crypto/ChangeLog
@@ -1,3 +1,7 @@
+2005-11-28  Tom Yu  <tlyu@mit.edu>
+
+       * t_cts.c, vectors.c: Don't include krb5.h.
+
 2005-11-17  Ken Raeburn  <raeburn@mit.edu>
 
        * t_hmac.c, t_pkcs5.c: Don't include krb5.h.

diff --git a/src/lib/crypto/t_cts.c b/src/lib/crypto/t_cts.c
index b105bd2752f69768b0e84aa58be4b603902044cd..5066a26df6688e2c04ac7670fe4d879e538b81f1 100644 (file)
--- a/src/lib/crypto/t_cts.c
+++ b/src/lib/crypto/t_cts.c
@@ -36,7 +36,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
-#include <krb5.h>
+#include "hash_provider.h"
 
 #define ASIZE(ARRAY) (sizeof(ARRAY)/sizeof(ARRAY[0]))
 
@@ -169,8 +169,6 @@ static void test_cts()
     }
 }
 
-#include "hash_provider.h"
-
 int main (int argc, char **argv)
 {
     whoami = argv[0];

diff --git a/src/lib/crypto/vectors.c b/src/lib/crypto/vectors.c
index 20c5d7cc7b8bc9cf62f7ad453182756fb39f4e7a..27b6206c964cb11e0314513f2aad548267a8ea44 100644 (file)
--- a/src/lib/crypto/vectors.c
+++ b/src/lib/crypto/vectors.c
@@ -36,7 +36,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
-#include <krb5.h>
+#include "hash_provider.h"
 
 #define ASIZE(ARRAY) (sizeof(ARRAY)/sizeof(ARRAY[0]))
 
@@ -443,8 +443,6 @@ test_pbkdf2()
     }
 }
 
-#include "hash_provider.h"
-
 int main (int argc, char **argv)
 {
     whoami = argv[0];