Hey, what are you talking about? I tried with empty file as passphrase, surely not working :) On Mon, Sep 28, 2009 at 9:51 PM, Milan Broz <mbroz@xxxxxxxxxx> wrote: > Ludwig Nussel wrote: >> Allows keyscripts that pipe into cryptsetup to quit due to e.g. a >> timeout or user pressing ^D. > >> @@ -490,6 +490,8 @@ void get_key(char *prompt, char **key, unsigned int *passLen, int key_size, >> } >> if(key_file) >> close(fd); >> + if(!i) // we didn't read anything, user pressed ^D? >> + goto out_err; > > there are two situations which with this patch fails now: > > if the key-file is empty (but regular) file, it should not fail here, I mean: > touch empty > cryptsetup luksOpen ... --key-file=empty > > You probably mean to fix only this situation (it should fail if piped input is closed > and not try empty passphrase) > $(sleep 1) | cryptsetup luksOpen ... > > I committed modified patch (see svn), please verify that it fixes reported problem. > > Thanks, > Milan > -- > mbroz@xxxxxxxxxx > > _______________________________________________ > dm-crypt mailing list > dm-crypt@xxxxxxxx > http://www.saout.de/mailman/listinfo/dm-crypt > -- ai. http://biwwy.com/ last.fm: littlewizard _______________________________________________ dm-crypt mailing list dm-crypt@xxxxxxxx http://www.saout.de/mailman/listinfo/dm-crypt
