Handle encrypted usb stick images.
PATCH 1/1 Handle encrypted usb stick images.
* Move asking for password to vl.c instead of duplicate code
in vl.c and monitor.c;
* Call the same code for usb mass storage;
* Fix a typo where a char * pointer is compared against '\0';
--- hw/usb-msd.c | 2 ++ monitor.c | 12 +----------- vl.c | 35 ++++++++++++++++++++++------------- vl.h | 2 ++ 4 files changed, 27 insertions(+), 24 deletions(-)
hw/usb-msd.c +2 -0
@@ -522,6 +522,8 @@ USBDevice *usb_msd_init(const char *file bdrv =bdrv_new ("usb" );if (bdrv_open (bdrv, filename,0 ) <0 ) goto fail; +if (qemu_key_check (bdrv, filename)) + goto fail; s->bs = bdrv; s->dev.speed =USB_SPEED_FULL ;
monitor.c +1 -11
@@ -337,8 +337,6 @@ static void do_eject(int force, const chstatic void do_change (const char *device,const char *filename) {BlockDriverState *bs; -int i; -char password[256 ]; bs =bdrv_find (device);if (!bs) {
@@ -348,15 +346,7 @@ static void do_change(const char *deviceif (eject_device (bs,0 ) <0 )return ;bdrv_open (bs, filename,0 ); -if (bdrv_is_encrypted (bs)) { -term_printf ("%s is encrypted.\n" , device); -for (i =0 ; i <3 ; i++) { -monitor_readline ("Password: " ,1 , password,sizeof (password)); -if (bdrv_set_key (bs, password) ==0 ) -break ; -term_printf ("invalid password\n" ); - } - } +qemu_key_check (bs, filename); }static void do_screen_dump (const char *filename)
vl.c +22 -13
@@ -6108,6 +6108,24 @@ #endif/* password input */ +int qemu_key_check (BlockDriverState *bs,const char *name) +{ +char password[256 ]; +int i; + +if (!bdrv_is_encrypted (bs)) +return 0 ; + +term_printf ("%s is encrypted.\n" , name); +for (i =0 ; i <3 ; i++) { +monitor_readline ("Password: " ,1 , password,sizeof (password)); +if (bdrv_set_key (bs, password) ==0 ) +return 0 ; +term_printf ("invalid password\n" ); + } +return -EPERM ; +} +static BlockDriverState *get_bdrv (int index) {BlockDriverState *bs;
@@ -6125,21 +6143,12 @@ static BlockDriverState *get_bdrv(int instatic void read_passwords (void ) {BlockDriverState *bs; -int i, j; -char password[256 ]; +int i;for (i =0 ; i <6 ; i++) { bs =get_bdrv (i); -if (bs &&bdrv_is_encrypted (bs)) { -term_printf ("%s is encrypted.\n" ,bdrv_get_device_name (bs)); -for (j =0 ; j <3 ; j++) { -monitor_readline ("Password: " , -1 , password,sizeof (password)); -if (bdrv_set_key (bs, password) ==0 ) -break ; -term_printf ("invalid password\n" ); - } - } +if (bs) +qemu_key_check (bs,bdrv_get_device_name (bs)); } }
@@ -6838,7 +6847,7 @@ #endif fd_table[i] =bdrv_new (buf);bdrv_set_type_hint (fd_table[i],BDRV_TYPE_FLOPPY ); } -if (fd_filename[i] !='\0' ) { +if (fd_filename[i][0 ] !='\0' ) {if (bdrv_open (fd_table[i], fd_filename[i], snapshot ?BDRV_O_SNAPSHOT :0 ) <0 ) { fprintf(stderr, "qemu: could not open floppy disk image '%s'\n",
vl.h +2 -0
@@ -585,6 +585,8 @@ void qemu_aio_wait_start(void);void qemu_aio_wait (void );void qemu_aio_wait_end (void ); +int qemu_key_check (BlockDriverState *bs,const char *name); +/* Ensure contents are flushed to disk. */ void bdrv_flush (BlockDriverState *bs);
Signature · 1 line
1.4.3.2