PBKDF2 passwords available

.bzrignore

@@ -0,0 +1,56 @@
+00_header
+10_*
+30_os-prober
+40_custom
+autom4te.cache
+build_env.mk
+.bzrignore
+config.cache
+config.h
+config.h.in
+config.log
+config.status
+configure
+conf/*.mk
+*.d
+DISTLIST
+docs/*.info
+docs/stamp-vti
+docs/version.texi
+*.elf
+*.exec
+genkernsyms.sh
+gensymlist.sh
+grub-dumpbios
+grub-editenv
+grub-emu
+grub_emu_init.c
+grub_emu_init.h
+grub-fstest
+grub_fstest_init.c
+grub_fstest_init.h
+grub-install
+grub-mk*
+grub-pbkdf2
+grub-pe2elf
+grub-probe
+grub_probe_init.c
+grub_probe_init.h
+grub_script.tab.c
+grub_script.tab.h
+grub-setup
+grub_setup_init.c
+grub_setup_init.h
+*.img
+include/grub/cpu
+include/grub/machine
+*.lst
+Makefile
+*.mod
+mod-*.c
+*.pf2
+stamp-h
+stamp-h1
+stamp-h.in
+symlist.c
+update-grub_lib

commands/password_pbkdf2.c

@@ -0,0 +1,202 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2009  Free Software Foundation, Inc.
+ *  Copyright (C) 2009  Vladimir 'phcoder' Serbineko <phcoder@gmail.com>
+ *
+ *  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 <grub/crypto.h>
+#include <grub/list.h>
+#include <grub/mm.h>
+#include <grub/misc.h>
+#include <grub/env.h>
+#include <grub/normal.h>
+#include <grub/dl.h>
+
+static grub_dl_t my_mod;
+
+struct pbkdf2_password
+{
+  grub_uint8_t *salt;
+  grub_size_t saltlen;
+  unsigned int c;
+  grub_uint8_t *expected;
+  grub_size_t buflen;
+};
+
+static grub_err_t
+check_password (const char *user, void *pin)
+{
+  char entered[1024];
+  grub_uint8_t *buf;
+  struct pbkdf2_password *pass = pin;
+  gcry_err_code_t err;
+
+  grub_memset (entered, 0, sizeof (entered));
+
+  if (!GRUB_GET_PASSWORD (entered, sizeof (entered) - 1))
+    return GRUB_ACCESS_DENIED;
+
+  buf = grub_malloc (pass->buflen);
+  if (!buf)
+    return grub_crypto_gcry_error (GPG_ERR_OUT_OF_MEMORY);
+
+  err = grub_crypto_pbkdf2 (GRUB_MD_SHA512, (grub_uint8_t *) &entered,
+			    grub_strlen (entered),
+			    pass->salt, pass->saltlen, pass->c,
+			    buf, pass->buflen);
+  if (err)
+    {
+      grub_free (buf);
+      return grub_crypto_gcry_error (err);
+    }
+
+  if (grub_crypto_memcmp (buf, pass->expected, pass->buflen) != 0)
+    return GRUB_ACCESS_DENIED;
+
+  grub_auth_authenticate (user);
+
+  return GRUB_ERR_NONE;
+}
+
+static inline int
+hex2val (char hex)
+{
+  if ('0' <= hex && hex <= '9')
+    return hex - '0';
+  if ('a' <= hex && hex <= 'f')
+    return hex - 'a' + 10;
+  if ('A' <= hex && hex <= 'F')
+    return hex - 'A' + 10;
+  return -1;
+}
+
+static grub_err_t
+grub_cmd_password (grub_command_t cmd __attribute__ ((unused)),
+		   int argc, char **args)
+{
+  grub_err_t err;
+  char *ptr, *ptr2;
+  grub_uint8_t *ptro;
+  struct pbkdf2_password *pass;
+
+  if (argc != 2)
+    return grub_error (GRUB_ERR_BAD_ARGUMENT, "Two arguments expected.");
+
+  if (grub_memcmp (args[1], "grub.pbkdf2.sha512.",
+		   sizeof ("grub.pbkdf2.sha512.") - 1) != 0)
+    return grub_error (GRUB_ERR_BAD_ARGUMENT, "Incorrect PBKDF2 password.");
+
+  ptr = args[1] + sizeof ("grub.pbkdf2.sha512.") - 1;
+
+  pass = grub_malloc (sizeof (*pass));
+  if (!pass)
+    return grub_errno;
+
+  pass->c = grub_strtoul (ptr, &ptr, 0);
+  if (*ptr != '.')
+    {
+      grub_free (pass);
+      return grub_error (GRUB_ERR_BAD_ARGUMENT, "Incorrect PBKDF2 password.");
+    }
+  ptr++;
+
+  ptr2 = grub_strchr (ptr, '.');
+  if (!ptr2 || ((ptr2 - ptr) & 1) || grub_strlen (ptr2 + 1) & 1)
+    {
+      grub_free (pass);
+      return grub_error (GRUB_ERR_BAD_ARGUMENT, "Incorrect PBKDF2 password.");
+    }
+
+  pass->saltlen = (ptr2 - ptr) >> 1;
+  pass->buflen = grub_strlen (ptr2 + 1) >> 1;
+  ptro = pass->salt = grub_malloc (pass->saltlen);
+  if (!ptro)
+    {
+      grub_free (pass);
+      return grub_errno;
+    }
+  while (ptr < ptr2)
+    {
+      int hex1, hex2;
+      hex1 = hex2val (*ptr);
+      ptr++;
+      hex2 = hex2val (*ptr);
+      ptr++;
+      if (hex1 < 0 || hex2 < 0)
+	{
+	  grub_free (pass->salt);
+	  grub_free (pass);
+	  return grub_error (GRUB_ERR_BAD_ARGUMENT,
+			     "Incorrect PBKDF2 password.");
+	}
+
+      *ptro = (hex1 << 4) | hex2;
+      ptro++;
+    }
+
+  ptro = pass->expected = grub_malloc (pass->buflen);
+  if (!ptro)
+    {
+      grub_free (pass->salt);
+      grub_free (pass);
+      return grub_errno;
+    }
+  ptr = ptr2 + 1;
+  ptr2 += grub_strlen (ptr2); 
+  while (ptr < ptr2)
+    {
+      int hex1, hex2;
+      hex1 = hex2val (*ptr);
+      ptr++;
+      hex2 = hex2val (*ptr);
+      ptr++;
+      if (hex1 < 0 || hex2 < 0)
+	{
+	  grub_free (pass->expected);
+	  grub_free (pass->salt);
+	  grub_free (pass);
+	  return grub_error (GRUB_ERR_BAD_ARGUMENT,
+			     "Incorrect PBKDF2 password.");
+	}
+
+      *ptro = (hex1 << 4) | hex2;
+      ptro++;
+    }
+
+  err = grub_auth_register_authentication (args[0], check_password, pass);
+  if (err)
+    {
+      grub_free (pass);
+      return err;
+    }
+  grub_dl_ref (my_mod);
+  return GRUB_ERR_NONE;
+}
+
+static grub_command_t cmd;
+
+GRUB_MOD_INIT(password_pbkdf2)
+{
+  my_mod = mod;
+  cmd = grub_register_command ("password_pbkdf2", grub_cmd_password,
+			       "password_pbkdf2 USER PBKDF2_PASSWORD",
+			       "Set user password (PBKDF2). ");
+}
+
+GRUB_MOD_FINI(password_pbkdf2)
+{
+  grub_unregister_command (cmd);
+}

conf/common.rmk

@@ -629,4 +629,13 @@ pbkdf2_mod_SOURCES = lib/pbkdf2.c
 pbkdf2_mod_CFLAGS = $(COMMON_CFLAGS)
 pbkdf2_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
+# For password_pbkdf2.mod.
+pkglib_MODULES += password_pbkdf2.mod
+password_pbkdf2_mod_SOURCES = commands/password_pbkdf2.c
+password_pbkdf2_mod_CFLAGS = $(COMMON_CFLAGS)
+password_pbkdf2_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+bin_UTILITIES += grub-pbkdf2
+grub_pbkdf2_SOURCES = util/grub-pbkdf2.c lib/crypto.c gcry/cipher/sha512.c lib/pbkdf2.c util/misc.c kern/err.c
+
 include $(srcdir)/conf/gcry.mk

conf/i386-coreboot.rmk

@@ -130,7 +130,7 @@ grub_emu_SOURCES = commands/minicmd.c commands/cat.c commands/cmp.c	\
 	kern/partition.c kern/reader.c kern/term.c			\
 	kern/rescue_reader.c kern/rescue_parser.c                       \
 	lib/arg.c normal/cmdline.c normal/misc.c			\
-	normal/handler.c normal/auth.c normal/autofs.c			\
+	normal/handler.c normal/auth.c lib/crypto.c normal/autofs.c			\
 	normal/completion.c normal/datetime.c normal/main.c 		\
 	normal/menu_text.c						\
 	normal/menu.c normal/menu_entry.c normal/menu_viewer.c		\

conf/i386-efi.rmk

@@ -57,7 +57,7 @@ grub_emu_SOURCES = commands/minicmd.c commands/cat.c commands/cmp.c 	\
 	kern/partition.c kern/reader.c kern/term.c			\
 	kern/rescue_reader.c kern/rescue_parser.c                       \
 	lib/arg.c normal/cmdline.c normal/command.c normal/datetime.c 	\
-	normal/auth.c normal/autofs.c					\
+	normal/auth.c lib/crypto.c normal/autofs.c					\
 	normal/completion.c normal/context.c normal/main.c		\
 	normal/menu.c normal/menu_entry.c normal/menu_viewer.c		\
 	normal/menu_text.c						\

conf/i386-ieee1275.rmk

@@ -85,7 +85,7 @@ grub_emu_SOURCES = commands/minicmd.c commands/cat.c commands/cmp.c	\
 	kern/partition.c kern/reader.c kern/term.c			\
 	kern/rescue_reader.c kern/rescue_parser.c 			\
 	lib/arg.c normal/cmdline.c normal/datetime.c normal/misc.c	\
-	normal/handler.c normal/auth.c normal/autofs.c			\
+	normal/handler.c normal/auth.c lib/crypto.c normal/autofs.c			\
 	normal/completion.c normal/main.c normal/menu_text.c		\
 	normal/menu.c normal/menu_entry.c normal/menu_viewer.c		\
 	normal/color.c							\

conf/i386-pc.rmk

@@ -137,7 +137,7 @@ grub_emu_SOURCES = commands/minicmd.c commands/cat.c commands/cmp.c	\
 	kern/partition.c kern/reader.c kern/term.c			\
 	kern/rescue_reader.c kern/rescue_parser.c			\
 	lib/arg.c normal/cmdline.c normal/datetime.c normal/misc.c	\
-	normal/handler.c normal/auth.c normal/autofs.c				\
+	normal/handler.c normal/auth.c lib/crypto.c normal/autofs.c				\
 	normal/completion.c normal/main.c normal/color.c		\
 	normal/menu.c normal/menu_entry.c normal/menu_viewer.c		\
 	normal/menu_text.c						\

conf/powerpc-ieee1275.rmk

@@ -65,7 +65,7 @@ grub_emu_SOURCES = commands/minicmd.c commands/cat.c commands/cmp.c 	\
 	kern/command.c kern/corecmd.c commands/extcmd.c			\
 	lib/arg.c normal/cmdline.c normal/datetime.c 			\
 	normal/completion.c normal/misc.c		 		\
-	normal/handler.c normal/auth.c normal/autofs.c normal/main.c	\
+	normal/handler.c normal/auth.c lib/crypto.c normal/autofs.c normal/main.c	\
 	normal/menu.c 							\
 	normal/menu_text.c						\
 	normal/menu_entry.c normal/menu_viewer.c 	 		\

conf/sparc64-ieee1275.rmk

@@ -123,7 +123,7 @@ grub_emu_SOURCES = commands/minicmd.c commands/cat.c commands/cmp.c 	\
 	kern/command.c kern/corecmd.c commands/extcmd.c			\
 	lib/arg.c normal/cmdline.c normal/datetime.c 			\
 	normal/completion.c normal/misc.c		 		\
-	normal/handler.c normal/auth.c normal/autofs.c normal/main.c	\
+	normal/handler.c normal/auth.c lib/crypto.c normal/autofs.c normal/main.c	\
 	normal/menu.c 							\
 	normal/menu_text.c						\
 	normal/menu_entry.c normal/menu_viewer.c 	 		\

conf/x86_64-efi.rmk

@@ -53,7 +53,7 @@ grub_emu_SOURCES = commands/minicmd.c commands/cat.c commands/cmp.c 	\
 	kern/command.c kern/corecmd.c commands/extcmd.c kern/file.c 	\
 	kern/fs.c commands/boot.c kern/main.c kern/misc.c kern/parser.c	\
 	kern/partition.c kern/readerescue.c kern/term.c			\
-	lib/arg.c normal/cmdline.c normal/misc.c normal/auth.c		\
+	lib/arg.c normal/cmdline.c normal/misc.c normal/auth.c lib/crypto.c		\
 	normal/autofs.c	\
 	normal/completion.c normal/datetime.c normal/context.c 		\
 	normal/main.c		\

include/grub/crypto.h

@@ -244,9 +244,11 @@ grub_crypto_hmac_buffer (const struct gcry_md_spec *md,
 extern gcry_md_spec_t _gcry_digest_spec_md5;
 extern gcry_md_spec_t _gcry_digest_spec_sha1;
 extern gcry_md_spec_t _gcry_digest_spec_sha256;
+extern gcry_md_spec_t _gcry_digest_spec_sha512;
 #define GRUB_MD_MD5 ((const gcry_md_spec_t *) &_gcry_digest_spec_md5)
 #define GRUB_MD_SHA1 ((const gcry_md_spec_t *) &_gcry_digest_spec_sha1)
 #define GRUB_MD_SHA256 ((const gcry_md_spec_t *) &_gcry_digest_spec_sha256)
+#define GRUB_MD_SHA512 ((const gcry_md_spec_t *) &_gcry_digest_spec_sha512)
 
 /* Implement PKCS#5 PBKDF2 as per RFC 2898.  The PRF to use is HMAC variant
    of digest supplied by MD.  Inputs are the password P of length PLEN,

util/grub-pbkdf2.c

@@ -0,0 +1,337 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 1992-1999,2001,2003,2004,2005,2009 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 <grub/types.h>
+#include <grub/crypto.h>
+#include <grub/util/misc.h>
+
+#include <unistd.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <getopt.h>
+#include <termios.h>
+
+
+/* Few functions to make crypto happy.  */
+void *
+grub_memmove (void *dest, const void *src, grub_size_t n)
+{
+  return memmove (dest, src, n);
+}
+
+void *
+grub_memset (void *s, int c, grub_size_t n)
+{
+  return memset (s, c, n);
+}
+
+int 
+grub_vprintf (const char *fmt, va_list args)
+{
+  return vprintf (fmt, args);
+}
+
+int 
+grub_vsprintf (char *str, const char *fmt, va_list args)
+{
+  return vsprintf (str, fmt, args);
+}
+
+void
+grub_abort (void)
+{
+  abort ();
+}
+
+static struct option options[] =
+  {
+    {"iteration_count", required_argument, 0, 'c'},
+    {"buflen", required_argument, 0, 'l'},
+    {"saltlen", required_argument, 0, 's'},
+    {"help", no_argument, 0, 'h'},
+    {"version", no_argument, 0, 'V'},
+  };
+
+static void
+usage (int status)
+{
+  if (status)
+    fprintf (stderr, "Try ``grub-scrypt --help'' for more information.\n");
+  else
+    printf ("\
+Usage: grub-scrypt [OPTIONS]\n\
+\nOptions:\n\
+     -c number, --iteration-count=number  Number of PBKDF2 iterations\n\
+     -l number, --buflen=number           Length of generated hash\n\
+     -s number, --salt=number             Length of salt\n\
+\n\
+Report bugs to <%s>.\n", PACKAGE_BUGREPORT);
+
+  exit (status);
+}
+
+static void
+hexify (char *hex, grub_uint8_t *bin, grub_size_t n)
+{
+  while (n--)
+    {
+      if (((*bin & 0xf0) >> 4) < 10)
+	*hex = ((*bin & 0xf0) >> 4) + '0';
+      else
+	*hex = ((*bin & 0xf0) >> 4) + 'A' - 10;
+      hex++;
+
+      if ((*bin & 0xf) < 10)
+	*hex = (*bin & 0xf) + '0';
+      else
+	*hex = (*bin & 0xf) + 'A' - 10;
+      hex++;
+      bin++;
+    }
+  *hex = 0;
+}
+
+int
+main (int argc, char *argv[])
+{
+  unsigned int c = 10000, buflen = 64, saltlen = 64;
+  char *pass1, *pass2;
+  char *bufhex, *salthex;
+  gcry_err_code_t gcry_err;
+  grub_uint8_t *buf, *salt;
+  ssize_t nr;
+  FILE *in, *out;
+  struct termios s, t;
+  int tty_changed;
+
+  progname = "grub-pbkdf2";
+
+  /* Check for options.  */
+  while (1)
+    {
+      int c = getopt_long (argc, argv, "c:l:s:hvV", options, 0);
+
+      if (c == -1)
+	break;
+
+      switch (c)
+	{
+	case 'c':
+	  c = strtoul (optarg, NULL, 0);
+	  break;
+
+	case 'l':
+	  buflen = strtoul (optarg, NULL, 0);
+	  break;
+
+	case 's':
+	  saltlen = strtoul (optarg, NULL, 0);
+	  break;
+
+	case 'h':
+	  usage (0);
+	  return 0;
+	  
+	case 'V':
+	  printf ("%s (%s) %s\n", progname,
+		  PACKAGE_NAME, PACKAGE_VERSION);
+	  return 0;
+	    
+	default:
+	  usage (1);
+	  return 1;
+	}
+    }
+
+  bufhex = malloc (buflen * 2 + 1);
+  if (!bufhex)
+    grub_util_error ("Out of memory");
+  buf = malloc (buflen);
+  if (!buf)
+    {
+      free (bufhex);
+      grub_util_error ("Out of memory");
+    }
+
+  salt = malloc (saltlen);
+  if (!salt)
+    {
+      free (bufhex);
+      free (buf);
+      grub_util_error ("Out of memory");
+    }
+  salthex = malloc (saltlen * 2 + 1);
+  if (!salthex)
+    {
+      free (salt);
+      free (bufhex);
+      free (buf);
+      grub_util_error ("Out of memory");
+    }
+
+  /* Disable echoing. Based on glibc.  */
+  in = fopen ("/dev/tty", "w+c");
+  if (in == NULL)
+    {
+      in = stdin;
+      out = stderr;
+    }
+  else
+    out = in;
+
+  if (tcgetattr (fileno (in), &t) == 0)
+    {
+      /* Save the old one. */
+      s = t;
+      /* Tricky, tricky. */
+      t.c_lflag &= ~(ECHO|ISIG);
+      tty_changed = (tcsetattr (fileno (in), TCSAFLUSH, &t) == 0);
+    }
+  else
+    tty_changed = 0;
+  
+  printf ("Enter password: ");
+  pass1 = NULL;
+  {
+    grub_size_t n;
+    nr = getline (&pass1, &n, stdin);
+  }
+  if (nr < 0 || !pass1)
+    {
+      free (buf);
+      free (bufhex);
+      free (salthex);
+      free (salt);
+      /* Restore the original setting.  */
+      if (tty_changed)
+	(void) tcsetattr (fileno (in), TCSAFLUSH, &s);
+      grub_util_error ("Failure to read password");
+    }
+  if (nr >= 1 && pass1[nr-1] == '\n')
+    pass1[nr-1] = 0;
+
+  printf ("\nReenter password: ");
+  pass2 = NULL;
+  {
+    grub_size_t n;
+    nr = getline (&pass2, &n, stdin);
+  }
+  /* Restore the original setting.  */
+  if (tty_changed)
+    (void) tcsetattr (fileno (in), TCSAFLUSH, &s);
+  printf ("\n");
+
+  if (nr < 0 || !pass2)
+    {
+      memset (pass1, 0, strlen (pass1));
+      free (pass1);
+      free (buf);
+      free (bufhex);
+      free (salthex);
+      free (salt);
+      grub_util_error ("Failure to read password");
+    }
+  if (nr >= 1 && pass2[nr-1] == '\n')
+    pass2[nr-1] = 0;
+
+  if (strcmp (pass1, pass2) != 0)
+    {
+      memset (pass1, 0, strlen (pass1));
+      memset (pass2, 0, strlen (pass2));
+      free (pass1);
+      free (pass2);
+      free (buf);
+      free (bufhex);
+      free (salthex);
+      free (salt);
+      grub_util_error ("Passwords don't match");
+    }
+  memset (pass2, 0, strlen (pass2));
+  free (pass2);
+
+#if ! defined (__linux__) && ! defined (__FreeBSD__)
+  printf ("WARNING: your random generator isn't known to be secure\n");
+#endif
+
+  {
+    FILE *f;
+    size_t rd;
+    f = fopen ("/dev/random", "rb");
+    if (!f)
+      {
+	memset (pass1, 0, strlen (pass1));
+	free (pass1);
+	free (buf);
+	free (bufhex);
+	free (salthex);
+	free (salt);
+	fclose (f);
+	grub_util_error ("Couldn't retrieve random data for salt");
+      }
+    rd = fread (salt, 1, saltlen, f);
+    if (rd != saltlen)
+      {
+	fclose (f);
+	memset (pass1, 0, strlen (pass1));
+	free (pass1);
+	free (buf);
+	free (bufhex);
+	free (salthex);
+	free (salt);
+	fclose (f);
+	grub_util_error ("Couldn't retrieve random data for salt");
+      }
+    fclose (f);
+  }
+
+  gcry_err = grub_crypto_pbkdf2 (GRUB_MD_SHA512,
+				 (grub_uint8_t *) pass1, strlen (pass1),
+				 salt, saltlen,
+				 c, buf, buflen);
+  memset (pass1, 0, strlen (pass1));
+  free (pass1);
+
+  if (gcry_err)
+    {
+      memset (buf, 0, buflen);
+      memset (bufhex, 0, 2 * buflen);
+      free (buf);
+      free (bufhex);
+      memset (salt, 0, saltlen);
+      memset (salthex, 0, 2 * saltlen);
+      free (salt);
+      free (salthex);
+      grub_util_error ("Cryptographic error number %d", gcry_err);
+    }
+
+  hexify (bufhex, buf, buflen);
+  hexify (salthex, salt, saltlen);
+
+  printf ("Your PBKDF2 is grub.pbkdf2.sha512.%d.%s.%s\n", c, salthex, bufhex);
+  memset (buf, 0, buflen);
+  memset (bufhex, 0, 2 * buflen);
+  free (buf);
+  free (bufhex);
+  memset (salt, 0, saltlen);
+  memset (salthex, 0, 2 * saltlen);
+  free (salt);
+  free (salthex);
+
+  return 0;
+}