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

* grub-core/lib/crypto.c (grub_password_get) [GRUB_UTIL]: Add

Browse source 
windows variant.
	* util/grub-mkpasswd-pbkdf2.c: Add windows flavour for retrieving random
	data.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-08-22 20:14:07 +02:00
parent 8f0baaac38
commit 6b87c10a0b
3 changed files with 95 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

28
grub-core/lib/crypto.c
View file

@ -26,7 +26,11 @@
#include <grub/env.h>
#ifdef GRUB_UTIL
#if !defined (_WIN32) || defined (__CYGWIN__)
#include <termios.h>
#else
#include <windows.h>
#endif
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
@ -441,11 +445,14 @@ int
grub_password_get (char buf[], unsigned buf_size)
{
#ifdef GRUB_UTIL
#if !defined (_WIN32) || defined (__CYGWIN__)
FILE *in;
struct termios s, t;
int tty_changed = 0;
char *ptr;
grub_refresh ();
/* Disable echoing. Based on glibc. */
in = fopen ("/dev/tty", "w+c");
if (in == NULL)
@ -473,6 +480,27 @@ grub_password_get (char buf[], unsigned buf_size)
grub_refresh ();
return 1;
#else
HANDLE hStdin = GetStdHandle (STD_INPUT_HANDLE);
DWORD mode = 0;
char *ptr;
grub_refresh ();
GetConsoleMode (hStdin, &mode);
SetConsoleMode (hStdin, mode & (~ENABLE_ECHO_INPUT));
fgets (buf, buf_size, stdin);
ptr = buf + strlen (buf) - 1;
while (buf <= ptr && (*ptr == '\n' || *ptr == '\r'))
*ptr-- = 0;
SetConsoleMode (hStdin, mode);
grub_refresh ();
return 1;
#endif
#else
unsigned cur_len = 0;
int key;