OBS User autobuild 2009-09-24 22:02:29 +00:00 committed by Git OBS Bridge
parent a6c37864ed
commit afd9ac749a
5 changed files with 4 additions and 30 deletions

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:32bdc236d3d90ee0d099d78b0d931fb3d179907a547fea83bc8d043bedb3d752
size 17650

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7ac820de8fc0c338c0686854dd8d923bc4e50040ed4147a0dcd84715e9f6cc16
size 17758

View File

@ -1,13 +0,0 @@
Index: cryptsetup-1.0.7/lib/utils.c
===================================================================
--- cryptsetup-1.0.7.orig/lib/utils.c
+++ cryptsetup-1.0.7/lib/utils.c
@@ -452,6 +452,8 @@ int get_key(char *prompt, char **key, un
}
if(key_file)
close(fd);
+ if(!i) // we didn't read anything, user pressed ^D?
+ goto out_err;
pass[i] = 0;
*key = pass;
*passLen = i;

View File

@ -1,14 +1,3 @@
-------------------------------------------------------------------
Thu Sep 24 13:36:52 UTC 2009 - lnussel@suse.de
- boot.crypto:
* don't use hashalot if keyfile is specified
* to comply with Debian, keyscripts must only output the password.
In order to allow keyscript to use different methods to retrieve
a key, add a keyscript_rawkey option.
- cryptsetup:
* When reading no single byte for the key abort.
-------------------------------------------------------------------
Mon Sep 21 08:51:40 UTC 2009 - lnussel@suse.de

View File

@ -25,7 +25,7 @@ BuildRequires: libselinux-devel
# hashalot version
%define haver 0.3
# boot.crypto version
%define bcver 0_200909241541
%define bcver 0_200909211050
License: BSD 3-clause (or similar) ; GPL v2 only ; GPL v2 or later
Group: System/Base
AutoReqProv: on
@ -38,7 +38,6 @@ Source1: hashalot-%haver.tar.bz2
Source2: boot.crypto-%{bcver}.tar.bz2
# use this to create the tarball from svn
Source99: cryptsetup-mktar
Patch0: cryptsetup-1.0.7-eofpw.diff
Patch10: hashalot-fixes.diff
Patch11: hashalot-libgcrypt.diff
Patch12: hashalot-ctrl-d.diff
@ -115,7 +114,6 @@ Authors:
%prep
%setup -q -b 1 -b 2
%patch0 -p1
pushd ../hashalot-%haver
%patch10 -p1
%patch11 -p1