rpms/volume_key/devel volume_key-0.3.1-empty-passphrase.patch, NONE, 1.1 volume_key.spec, 1.5, 1.6

[Miloslav Trmac]

Author: mitr

Update of /cvs/pkgs/rpms/volume_key/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24356

Modified Files:
	volume_key.spec 
Added Files:
	volume_key-0.3.1-empty-passphrase.patch 
Log Message:
* Fri Feb  5 2010 Miloslav Trmač <mitr at redhat.com> - 0.3.1-2
- Fix a crash when an empty passphrase is provided
  Resolves: #558410


volume_key-0.3.1-empty-passphrase.patch:
 ChangeLog        |    4 ++++
 src/volume_key.c |    9 +++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

--- NEW FILE volume_key-0.3.1-empty-passphrase.patch ---
commit 02ba974efaf3b12f548d83f0584917dfcfd1cb1b
Author: Miloslav Trmač <mitr at redhat.com>
Date:   Fri Feb 5 17:53:21 2010 +0100

    Fix crash if passphrase_ui_cb () fails.
    
    2010-02-05  Miloslav Trmač  <mitr at redhat.com>
    
    	* src/volume_key.c (pos_init): Set *error if passphrase_ui_cb () fails.

diff --git a/ChangeLog b/ChangeLog
index 72f053b..1ab28d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-02-05  Miloslav Trmač  <mitr at redhat.com>
+
+	* src/volume_key.c (pos_init): Set *error if passphrase_ui_cb () fails.
+
 2009-12-11  Miloslav Trmač  <mitr at redhat.com>
 
 	* configure.ac: Release 0.3.1.
diff --git a/src/volume_key.c b/src/volume_key.c
index 361aa86..68c837a 100644
--- a/src/volume_key.c
+++ b/src/volume_key.c
@@ -581,7 +581,7 @@ pos_init (struct packet_output_state *pos, GError **error)
 					 : _("Passphrases do not match.  "
 					     "New packet passphrase"), failed);
 	  if (passphrase == NULL)
-	    return -1;
+	    goto no_passphrase;
 	  passphrase2 = passphrase_ui_cb (NULL,
 					  _("Repeat new packet passphrase"),
 					  failed);
@@ -589,7 +589,7 @@ pos_init (struct packet_output_state *pos, GError **error)
 	    {
 	      memset (passphrase, 0, strlen (passphrase));
 	      g_free (passphrase);
-	      return -1;
+	      goto no_passphrase;
 	    }
 	  passphrase_ok = strcmp (passphrase, passphrase2) == 0;
 	  memset (passphrase2, 0, strlen (passphrase2));
@@ -607,6 +607,11 @@ pos_init (struct packet_output_state *pos, GError **error)
       pos->passphrase = passphrase;
     }
   return 0;
+
+ no_passphrase:
+  g_set_error (error, LIBVK_ERROR, LIBVK_ERROR_UI_NO_RESPONSE,
+	       _("Passphrase not provided"));
+  return -1;
 }
 
 /* Free data in POS */


Index: volume_key.spec
===================================================================
RCS file: /cvs/pkgs/rpms/volume_key/devel/volume_key.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- volume_key.spec	11 Dec 2009 13:37:02 -0000	1.5
+++ volume_key.spec	5 Feb 2010 17:01:26 -0000	1.6
@@ -3,13 +3,15 @@
 Summary: An utility for manipulating storage encryption keys and passphrases
 Name: volume_key
 Version: 0.3.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: Applications/System
 URL: https://fedorahosted.org/volume_key/
 Requires: volume_key-libs = %{version}-%{release}
 
 Source0: https://fedorahosted.org/releases/v/o/volume_key/volume_key-%{version}.tar.bz2
+# Committed upstrean
+Patch0: volume_key-0.3.1-empty-passphrase.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires: cryptsetup-luks-devel, gettext-devel, glib2-devel, gnupg
 BuildRequires: gpgme-devel, libblkid-devel, nss-devel, python-devel
@@ -74,6 +76,7 @@ for other formats is possible, some form
 
 %prep
 %setup -q
+%patch0 -p1 -b .empty-passphrase
 
 %build
 %configure
@@ -116,6 +119,10 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/volume_key.py*
 
 %changelog
+* Fri Feb  5 2010 Miloslav Trmač <mitr at redhat.com> - 0.3.1-2
+- Fix a crash when an empty passphrase is provided
+  Resolves: #558410
+
 * Fri Dec 11 2009 Miloslav Trmač <mitr at redhat.com> - 0.3.1-1
 - Update to volume_key-0.3.1.