mirror of
				https://git.proxmox.com/git/grub2
				synced 2025-11-04 02:06:28 +00:00 
			
		
		
		
	Merge crypto branch. * Makefile.in (pkglib_DATA): Add crypto.lst. (crypto.lst): New target. * commands/hashsum.c: New file. * commands/password.c (check_password): Use grub_crypto_memcmp. * commands/password_pbkdf2.c: New file. * commands/xnu_uuid.c: Remove MD5. Use GRUB_MD_MD5. * conf/any-emu.rmk (grub_emu_SOURCES): Add lib/crypto.c, normal/crypto.c and lib/libgcrypt-grub/cipher/md5.c. (grub_emu_CFLAGS): Add -Wno-missing-field-initializers -Wno-error -I$(srcdir)/lib/libgcrypt_wrap. * conf/common.rmk (normal_mod_SOURCES): Add normal/crypto.c. (pkglib_MODULES): Add crypto.mod, hashsum.mod, pbkdf2.mod and password_pbkdf2.mod. (crypto_mod_SOURCES): New variable. (crypto_mod_CFLAGS): Likewise. (crypto_mod_LDFLAGS): Likewise. (hashsum_mod_SOURCES): New variable. (hashsum_mod_CFLAGS): Likewise. (hashsum_mod_LDFLAGS): Likewise. (pbkdf2_mod_SOURCES): New variable. (pbkdf2_mod_CFLAGS): Likewise. (pbkdf2_mod_LDFLAGS): Likewise. (password_pbkdf2_mod_SOURCES): New variable. (password_pbkdf2_mod_CFLAGS): Likewise. (password_pbkdf2_mod_LDFLAGS): Likewise. (bin_UTILITIES): Add grub-mkpasswd-pbkdf2. (grub_mkpasswd_pbkdf2_SOURCES): New variable. (grub_mkpasswd_pbkdf2_CFLAGS): Likewise. Include conf/gcry.rmk. * include/grub/auth.h: Rewritten. * include/grub/crypto.h: New file. * include/grub/disk.h (grub_disk_dev_id): Add GRUB_DISK_DEVICE_LUKS_ID. * include/grub/normal.h (read_crypto_list): New prototype. * lib/crypto.c: New file. * lib/libgcrypt_wrap/cipher_wrap.h: Likewise. * lib/pbkdf2.c: Likewise. * normal/auth.c (grub_auth_strcmp): Removed. (grub_iswordseparator): Likewise. (grub_auth_strword): Likewise. (is_authenticated): Use grub_strword. (grub_auth_check_authentication): Use grub_strcmp, grub_password_get and grub_strword. Pass entered password to authentication callback. * normal/crypto.c: New file. * normal/main.c: Call read_crypto_list. * util/grub-mkpasswd-pbkdf2.c: New file. * util/import_gcry.py: Generate crypto.lst. Add hash blocklen.
		
			
				
	
	
		
			178 lines
		
	
	
		
			5.0 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			178 lines
		
	
	
		
			5.0 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 *  GRUB  --  GRand Unified Bootloader
 | 
						|
 *  Copyright (C) 2002,2003,2004,2005,2006,2007,2008,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/>.
 | 
						|
 */
 | 
						|
 | 
						|
#ifndef GRUB_DISK_HEADER
 | 
						|
#define GRUB_DISK_HEADER	1
 | 
						|
 | 
						|
#include <grub/symbol.h>
 | 
						|
#include <grub/err.h>
 | 
						|
#include <grub/types.h>
 | 
						|
#include <grub/device.h>
 | 
						|
 | 
						|
/* These are used to set a device id. When you add a new disk device,
 | 
						|
   you must define a new id for it here.  */
 | 
						|
enum grub_disk_dev_id
 | 
						|
  {
 | 
						|
    GRUB_DISK_DEVICE_BIOSDISK_ID,
 | 
						|
    GRUB_DISK_DEVICE_OFDISK_ID,
 | 
						|
    GRUB_DISK_DEVICE_LOOPBACK_ID,
 | 
						|
    GRUB_DISK_DEVICE_EFIDISK_ID,
 | 
						|
    GRUB_DISK_DEVICE_RAID_ID,
 | 
						|
    GRUB_DISK_DEVICE_LVM_ID,
 | 
						|
    GRUB_DISK_DEVICE_HOST_ID,
 | 
						|
    GRUB_DISK_DEVICE_ATA_ID,
 | 
						|
    GRUB_DISK_DEVICE_MEMDISK_ID,
 | 
						|
    GRUB_DISK_DEVICE_NAND_ID,
 | 
						|
    GRUB_DISK_DEVICE_UUID_ID,
 | 
						|
    GRUB_DISK_DEVICE_PXE_ID,
 | 
						|
    GRUB_DISK_DEVICE_SCSI_ID,
 | 
						|
    GRUB_DISK_DEVICE_FILE_ID,
 | 
						|
    GRUB_DISK_DEVICE_LUKS_ID
 | 
						|
  };
 | 
						|
 | 
						|
struct grub_disk;
 | 
						|
#ifdef GRUB_UTIL
 | 
						|
struct grub_disk_memberlist;
 | 
						|
#endif
 | 
						|
 | 
						|
/* Disk device.  */
 | 
						|
struct grub_disk_dev
 | 
						|
{
 | 
						|
  /* The device name.  */
 | 
						|
  const char *name;
 | 
						|
 | 
						|
  /* The device id used by the cache manager.  */
 | 
						|
  enum grub_disk_dev_id id;
 | 
						|
 | 
						|
  /* Call HOOK with each device name, until HOOK returns non-zero.  */
 | 
						|
  int (*iterate) (int (*hook) (const char *name));
 | 
						|
 | 
						|
  /* Open the device named NAME, and set up DISK.  */
 | 
						|
  grub_err_t (*open) (const char *name, struct grub_disk *disk);
 | 
						|
 | 
						|
  /* Close the disk DISK.  */
 | 
						|
  void (*close) (struct grub_disk *disk);
 | 
						|
 | 
						|
  /* Read SIZE sectors from the sector SECTOR of the disk DISK into BUF.  */
 | 
						|
  grub_err_t (*read) (struct grub_disk *disk, grub_disk_addr_t sector,
 | 
						|
		      grub_size_t size, char *buf);
 | 
						|
 | 
						|
  /* Write SIZE sectors from BUF into the sector SECTOR of the disk DISK.  */
 | 
						|
  grub_err_t (*write) (struct grub_disk *disk, grub_disk_addr_t sector,
 | 
						|
		       grub_size_t size, const char *buf);
 | 
						|
 | 
						|
#ifdef GRUB_UTIL
 | 
						|
  struct grub_disk_memberlist *(*memberlist) (struct grub_disk *disk);
 | 
						|
#endif
 | 
						|
 | 
						|
  /* The next disk device.  */
 | 
						|
  struct grub_disk_dev *next;
 | 
						|
};
 | 
						|
typedef struct grub_disk_dev *grub_disk_dev_t;
 | 
						|
 | 
						|
struct grub_partition;
 | 
						|
 | 
						|
/* Disk.  */
 | 
						|
struct grub_disk
 | 
						|
{
 | 
						|
  /* The disk name.  */
 | 
						|
  const char *name;
 | 
						|
 | 
						|
  /* The underlying disk device.  */
 | 
						|
  grub_disk_dev_t dev;
 | 
						|
 | 
						|
  /* The total number of sectors.  */
 | 
						|
  grub_uint64_t total_sectors;
 | 
						|
 | 
						|
  /* If partitions can be stored.  */
 | 
						|
  int has_partitions;
 | 
						|
 | 
						|
  /* The id used by the disk cache manager.  */
 | 
						|
  unsigned long id;
 | 
						|
 | 
						|
  /* The partition information. This is machine-specific.  */
 | 
						|
  struct grub_partition *partition;
 | 
						|
 | 
						|
  /* Called when a sector was read. OFFSET is between 0 and
 | 
						|
     the sector size minus 1, and LENGTH is between 0 and the sector size.  */
 | 
						|
  void NESTED_FUNC_ATTR (*read_hook) (grub_disk_addr_t sector,
 | 
						|
		     unsigned offset, unsigned length);
 | 
						|
 | 
						|
  /* Device-specific data.  */
 | 
						|
  void *data;
 | 
						|
};
 | 
						|
typedef struct grub_disk *grub_disk_t;
 | 
						|
 | 
						|
#ifdef GRUB_UTIL
 | 
						|
struct grub_disk_memberlist
 | 
						|
{
 | 
						|
  grub_disk_t disk;
 | 
						|
  struct grub_disk_memberlist *next;
 | 
						|
};
 | 
						|
typedef struct grub_disk_memberlist *grub_disk_memberlist_t;
 | 
						|
#endif
 | 
						|
 | 
						|
/* The sector size.  */
 | 
						|
#define GRUB_DISK_SECTOR_SIZE	0x200
 | 
						|
#define GRUB_DISK_SECTOR_BITS	9
 | 
						|
 | 
						|
/* The maximum number of disk caches.  */
 | 
						|
#define GRUB_DISK_CACHE_NUM	1021
 | 
						|
 | 
						|
/* The size of a disk cache in sector units.  */
 | 
						|
#define GRUB_DISK_CACHE_SIZE	8
 | 
						|
#define GRUB_DISK_CACHE_BITS	3
 | 
						|
 | 
						|
/* This is called from the memory manager.  */
 | 
						|
void grub_disk_cache_invalidate_all (void);
 | 
						|
 | 
						|
void EXPORT_FUNC(grub_disk_dev_register) (grub_disk_dev_t dev);
 | 
						|
void EXPORT_FUNC(grub_disk_dev_unregister) (grub_disk_dev_t dev);
 | 
						|
int EXPORT_FUNC(grub_disk_dev_iterate) (int (*hook) (const char *name));
 | 
						|
 | 
						|
grub_disk_t EXPORT_FUNC(grub_disk_open) (const char *name);
 | 
						|
void EXPORT_FUNC(grub_disk_close) (grub_disk_t disk);
 | 
						|
grub_err_t EXPORT_FUNC(grub_disk_read) (grub_disk_t disk,
 | 
						|
					grub_disk_addr_t sector,
 | 
						|
					grub_off_t offset,
 | 
						|
					grub_size_t size,
 | 
						|
					void *buf);
 | 
						|
grub_err_t EXPORT_FUNC(grub_disk_write) (grub_disk_t disk,
 | 
						|
					 grub_disk_addr_t sector,
 | 
						|
					 grub_off_t offset,
 | 
						|
					 grub_size_t size,
 | 
						|
					 const void *buf);
 | 
						|
 | 
						|
grub_uint64_t EXPORT_FUNC(grub_disk_get_size) (grub_disk_t disk);
 | 
						|
 | 
						|
extern void (* EXPORT_VAR(grub_disk_firmware_fini)) (void);
 | 
						|
extern int EXPORT_VAR(grub_disk_firmware_is_tainted);
 | 
						|
 | 
						|
/* ATA pass through parameters and function.  */
 | 
						|
struct grub_disk_ata_pass_through_parms
 | 
						|
{
 | 
						|
  grub_uint8_t taskfile[8];
 | 
						|
  void * buffer;
 | 
						|
  int size;
 | 
						|
};
 | 
						|
 | 
						|
extern grub_err_t (* EXPORT_VAR(grub_disk_ata_pass_through)) (grub_disk_t,
 | 
						|
		   struct grub_disk_ata_pass_through_parms *);
 | 
						|
 | 
						|
#endif /* ! GRUB_DISK_HEADER */
 |