vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* grub-core/osdep/basic/random.c: New file. Abort on an attempt to

Browse source 
get random when no RNG is available.
	* grub-core/osdep/random.c: Use basic/random.c on OS out of whitelist.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-10-08 21:28:14 +02:00
parent acbbe5cbad
commit b102ce6909
4 changed files with 53 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2013-10-08 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/osdep/basic/random.c: New file. Abort on an attempt to
get random when no RNG is available.
* grub-core/osdep/random.c: Use basic/random.c on OS out of whitelist.
2013-10-08 Vladimir Serbinenko <phcoder@gmail.com> 2013-10-08 Vladimir Serbinenko <phcoder@gmail.com>
* include/grub/util/lvm.h: Removed. * include/grub/util/lvm.h: Removed.

41
grub-core/osdep/basic/random.c Normal file
View file

@ -0,0 +1,41 @@
/*
* GRUB -- GRand Unified Bootloader
* Copyright (C) 1992-1999,2001,2003,2004,2005,2009,2010,2011,2012,2013 Free Software Foundation, Inc.
*
* GRUB is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* GRUB 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 General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
*/
#include <config.h>
#include <grub/types.h>
#include <grub/crypto.h>
#include <grub/auth.h>
#include <grub/emu/misc.h>
#include <grub/util/misc.h>
#include <grub/i18n.h>
#include <unistd.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
int
grub_get_random (void *out, grub_size_t len)
{
#warning "No random number generator is available for your OS. \
Some functions like grub-mkpaswd and installing on UUID-less disks will be \
disabled."
grub_util_error ("%s",
_("no random number generator is available for your OS"));
}

7
grub-core/osdep/random.c
View file

@ -1,5 +1,10 @@
#if defined (_WIN32) || defined (__CYGWIN__) #if defined (_WIN32) || defined (__CYGWIN__)
#include "windows/random.c" #include "windows/random.c"
#else #elif defined (__linux__) || defined (__FreeBSD__) \
|| defined (__FreeBSD_kernel__) || defined (__OpenBSD__) \
|| defined (__GNU__) || defined (__NetBSD__) \
|| defined (__APPLE__) || defined(__sun__)
#include "unix/random.c" #include "unix/random.c"
#else
#include "basic/random.c"
#endif #endif

5
grub-core/osdep/unix/random.c
View file

@ -33,11 +33,6 @@
int int
grub_get_random (void *out, grub_size_t len) grub_get_random (void *out, grub_size_t len)
{ {
#if ! defined (__linux__) && ! defined (__FreeBSD__) && ! defined (__FreeBSD_kernel__) && ! defined (__OpenBSD__) && !defined (__GNU__) && ! defined (_WIN32) && !defined(__CYGWIN__) && !defined (__NetBSD__) && !defined (__APPLE__) && !defined(__sun__)
/* TRANSLATORS: The generator might still be secure just GRUB isn't sure about it. */
printf ("%s", _("WARNING: your random generator isn't known to be secure\n"));
#warning "your random generator isn't known to be secure"
#endif
FILE *f; FILE *f;
size_t rd; size_t rd;