diff options
| author |   Alexandre Oliva <aoliva@redhat.com> | 2012-10-10 07:05:46 -0300 |
|---|---|---|
| committer | Alexandre Oliva <aoliva@redhat.com> | 2012-10-10 07:05:46 -0300 |
| commit | e745142509a427ccb9b14ee94ff24f7f36f7f4b6 (patch) | |
| tree | 4edd9f6cf6db3b386639494f831105ee557d452a /crypt/md5c-test.c | |
| parent | * crypt/crypt-private.h: Include stdbool.h. (diff) | |
| download | glibc-e745142509a427ccb9b14ee94ff24f7f36f7f4b6.tar.gz glibc-e745142509a427ccb9b14ee94ff24f7f36f7f4b6.tar.bz2 glibc-e745142509a427ccb9b14ee94ff24f7f36f7f4b6.zip | |
* 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.
Diffstat (limited to 'crypt/md5c-test.c')
| -rw-r--r-- | crypt/md5c-test.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/crypt/md5c-test.c b/crypt/md5c-test.c index f56d0eb4ab..c80e40202d 100644 --- a/crypt/md5c-test.c +++ b/crypt/md5c-test.c @@ -9,7 +9,10 @@ main (int argc, char *argv[]) int result = 0; cp = crypt ("Hello world!", salt); - result |= strcmp ("$1$saltstri$YMyguxXMBpd2TEZ.vS/3q1", cp); + + /* MD5 is disabled in FIPS mode. */ + if (cp) + result |= strcmp ("$1$saltstri$YMyguxXMBpd2TEZ.vS/3q1", cp); return result; } |