Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
* 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.
- Loading branch information
Alexandre Oliva
committed
Oct 10, 2012
1 parent
4ba74a3
commit e745142
Showing
5 changed files
with
143 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
/* Dummy implementation of FIPS compliance status test. | ||
Copyright (C) 2012 Free Software Foundation, Inc. | ||
This file is part of the GNU C Library. | ||
The GNU C Library is free software; you can redistribute it and/or | ||
modify it under the terms of the GNU Lesser General Public | ||
License as published by the Free Software Foundation; either | ||
version 2.1 of the License, or (at your option) any later version. | ||
The GNU C Library is distributed in the hope that it will be useful, | ||
but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
Lesser General Public License for more details. | ||
You should have received a copy of the GNU Lesser General Public | ||
License along with the GNU C Library; if not, see | ||
<http://www.gnu.org/licenses/>. */ | ||
|
||
#ifndef _FIPS_PRIVATE_H | ||
#define _FIPS_PRIVATE_H | ||
|
||
#include <stdbool.h> | ||
|
||
/* Return true if compliance with the FIPS security standards is | ||
enabled. | ||
This is only relevant within crypt, to tell whether MD5 and DES | ||
algorithms should be rejected. */ | ||
|
||
static inline bool | ||
fips_enabled_p (void) | ||
{ | ||
return false; | ||
} | ||
|
||
#endif /* _FIPS_PRIVATE_H */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,74 @@ | ||
/* FIPS compliance status test for GNU/Linux systems. | ||
Copyright (C) 2012 Free Software Foundation, Inc. | ||
This file is part of the GNU C Library. | ||
The GNU C Library is free software; you can redistribute it and/or | ||
modify it under the terms of the GNU Lesser General Public | ||
License as published by the Free Software Foundation; either | ||
version 2.1 of the License, or (at your option) any later version. | ||
The GNU C Library is distributed in the hope that it will be useful, | ||
but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
Lesser General Public License for more details. | ||
You should have received a copy of the GNU Lesser General Public | ||
License along with the GNU C Library; if not, see | ||
<http://www.gnu.org/licenses/>. */ | ||
|
||
#ifndef _FIPS_PRIVATE_H | ||
#define _FIPS_PRIVATE_H | ||
|
||
#include <errno.h> | ||
#include <fcntl.h> | ||
#include <stdlib.h> | ||
#include <unistd.h> | ||
#include <not-cancel.h> | ||
#include <stdbool.h> | ||
|
||
/* Return true if FIPS mode is enabled. See | ||
sysdeps/generic/fips-private.h for more information. */ | ||
|
||
static inline bool | ||
fips_enabled_p (void) | ||
{ | ||
static enum | ||
{ | ||
FIPS_UNTESTED = 0, | ||
FIPS_ENABLED = 1, | ||
FIPS_DISABLED = -1, | ||
FIPS_TEST_FAILED = -2 | ||
} checked; | ||
|
||
if (checked == FIPS_UNTESTED) | ||
{ | ||
int fd = open_not_cancel_2 ("/proc/sys/crypto/fips_enabled", O_RDONLY); | ||
|
||
if (fd != -1) | ||
{ | ||
/* This is more than enough, the file contains a single integer. */ | ||
char buf[32]; | ||
ssize_t n; | ||
n = TEMP_FAILURE_RETRY (read_not_cancel (fd, buf, sizeof (buf) - 1)); | ||
close_not_cancel_no_status (fd); | ||
|
||
if (n > 0) | ||
{ | ||
/* Terminate the string. */ | ||
buf[n] = '\0'; | ||
|
||
char *endp; | ||
long int res = strtol (buf, &endp, 10); | ||
if (endp != buf && (*endp == '\0' || *endp == '\n')) | ||
checked = (res > 0) ? FIPS_ENABLED : FIPS_DISABLED; | ||
} | ||
} | ||
|
||
if (checked == FIPS_UNTESTED) | ||
checked = FIPS_TEST_FAILED; | ||
} | ||
|
||
return checked == FIPS_ENABLED; | ||
} | ||
|
||
#endif /* _FIPS_PRIVATE_H */ |