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

Split random retrieving code into separate files.

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-10-04 01:29:10 +02:00
parent c7c177f07f
commit 24ca45125e
7 changed files with 122 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2013-10-04 Vladimir Serbinenko <phcoder@gmail.com>
Split random retrieving code into separate files.
2013-10-03 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/kern/arm/dl.c (do_relocations): Accept and ignore

1
Makefile.util.def
View file

@ -222,6 +222,7 @@ program = {
common = util/grub-mkpasswd-pbkdf2.c;
common = grub-core/kern/emu/argp_common.c;
common = util/random.c;
ldadd = libgrubmods.a;
ldadd = libgrubgcry.a;

4
include/grub/crypto.h
View file

@ -406,6 +406,10 @@ void _gcry_log_error( const char *fmt, ... ) __attribute__ ((format (printf, 1,
#ifdef GRUB_UTIL
void grub_gcry_init_all (void);
void grub_gcry_fini_all (void);
int
grub_get_random (void *out, grub_size_t len);
#endif
#endif

47
util/grub-mkpasswd-pbkdf2.c
View file

@ -34,11 +34,6 @@
#include <argp.h>
#if defined (_WIN32) || defined (__CYGWIN__)
#include <windows.h>
#include <wincrypt.h>
#endif
#include "progname.h"
static struct argp_option options[] = {
@ -109,48 +104,6 @@ hexify (char *hex, grub_uint8_t *bin, grub_size_t n)
*hex = 0;
}
static int
grub_get_random (void *out, grub_size_t len)
{
#if ! defined (__linux__) && ! defined (__FreeBSD__) && ! defined (__OpenBSD__) && !defined (__GNU__) && ! defined (_WIN32) && !defined(__CYGWIN__)
/* 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
#if defined (_WIN32) || defined (__CYGWIN__)
HCRYPTPROV hCryptProv;
if (!CryptAcquireContext (&hCryptProv,
NULL,
MS_DEF_PROV,
PROV_RSA_FULL,
CRYPT_VERIFYCONTEXT))
return 1;
if (!CryptGenRandom (hCryptProv, len, out))
{
CryptReleaseContext (hCryptProv, 0);
return 1;
}
CryptReleaseContext (hCryptProv, 0);
return 0;
#else
FILE *f;
size_t rd;
f = fopen ("/dev/urandom", "rb");
if (!f)
return 1;
rd = fread (out, 1, len, f);
fclose (f);
if (rd != len)
return 1;
return 0;
#endif
}
int
main (int argc, char *argv[])
{

5
util/random.c Normal file
View file

@ -0,0 +1,5 @@
#if defined (_WIN32) || defined (__CYGWIN__)
#include "random_windows.c"
#else
#include "random_unix.c"
#endif

53
util/random_unix.c Normal file
View file

@ -0,0 +1,53 @@
/*
* 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)
{
#if ! defined (__linux__) && ! defined (__FreeBSD__) && ! defined (__OpenBSD__) && !defined (__GNU__) && ! defined (_WIN32) && !defined(__CYGWIN__)
/* 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;
size_t rd;
f = fopen ("/dev/urandom", "rb");
if (!f)
return 1;
rd = fread (out, 1, len, f);
fclose (f);
if (rd != len)
return 1;
return 0;
}

55
util/random_windows.c Normal file
View file

@ -0,0 +1,55 @@
/*
* 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>
#include <windows.h>
#include <wincrypt.h>
int
grub_get_random (void *out, grub_size_t len)
{
HCRYPTPROV hCryptProv;
if (!CryptAcquireContext (&hCryptProv,
NULL,
MS_DEF_PROV,
PROV_RSA_FULL,
CRYPT_VERIFYCONTEXT))
return 1;
if (!CryptGenRandom (hCryptProv, len, out))
{
CryptReleaseContext (hCryptProv, 0);
return 1;
}
CryptReleaseContext (hCryptProv, 0);
return 0;
}