1 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index b45289d..98561a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2012-10-10  Alexandre Oliva <aoliva@redhat.com>
 
+	* crypt/crypt-entry.c: Include fips-private.h.
+	(__crypt_r, __crypt): Disable MD5 and DES if FIPS is enabled.
+	* crypt/md5c-test.c (main): Tolerate disabled MD5.
+	* sysdeps/unix/sysv/linux/fips-private.h: New file.
+	* sysdeps/generic/fips-private.h: New file, dummy fallback.
+
+2012-10-10  Alexandre Oliva <aoliva@redhat.com>
+
 	* crypt/crypt-private.h: Include stdbool.h.
 	(_ufc_setup_salt_r): Return bool.
 	* crypt/crypt-entry.c: Include errno.h.