Fixes for CVE-2006-6235

1 files changed, 1 insertions, 16 deletions

diff --git a/g10/mainproc.c b/g10/mainproc.c
index c4eb3b0ca..dc7988987 100644
--- a/g10/mainproc.c
+++ b/g10/mainproc.c
@@ -290,23 +290,8 @@ proc_symkey_enc( CTX c, PACKET *pkt )
 	  }
 	else
 	  {
-            int canceled;
-
 	    c->dek = passphrase_to_dek (NULL, 0, algo, &enc->s2k, 0,
-                                        NULL, &canceled);
-            if (canceled)
-              {
-                /* For unknown reasons passphrase_to_dek does only
-                   return NULL if a new passphrase has been requested
-                   and has not been repeated correctly.  Thus even
-                   with a cancel requested (by means of the gpg-agent)
-                   it won't return NULL but an empty passphrase.  We
-                   take the most conservative approach for now and
-                   work around it right here. */
-                xfree (c->dek);
-                c->dek = NULL;
-              }
-
+                                        NULL, NULL);
 	    if(c->dek)
 	      {
 		c->dek->symmetric=1;