* encr-data.c (decrypt_data): Give a warning with a weak key, but still
authorDavid Shaw <dshaw@jabberwocky.com>
Fri, 8 Oct 2004 21:54:26 +0000 (21:54 +0000)
committerDavid Shaw <dshaw@jabberwocky.com>
Fri, 8 Oct 2004 21:54:26 +0000 (21:54 +0000)
allow to decrypt the message.

g10/ChangeLog
g10/encr-data.c

index c506f21..0ae89ae 100644 (file)
@@ -1,3 +1,8 @@
+2004-10-08  David Shaw  <dshaw@jabberwocky.com>
+
+       * encr-data.c (decrypt_data): Give a warning with a weak key, but
+       still allow to decrypt the message.
+
 2004-10-07  David Shaw  <dshaw@jabberwocky.com>
 
        * pkclist.c (build_pk_list): Keystrify.
index c8a8c85..e059945 100644 (file)
@@ -85,15 +85,20 @@ decrypt_data( void *procctx, PKT_encrypted *ed, DEK *dek )
     dfx.cipher_hd = cipher_open( dek->algo,
                                 ed->mdc_method? CIPHER_MODE_CFB
                                               : CIPHER_MODE_AUTO_CFB, 1 );
-/* log_hexdump( "thekey", dek->key, dek->keylen );*/
+    /* log_hexdump( "thekey", dek->key, dek->keylen );*/
     rc = cipher_setkey( dfx.cipher_hd, dek->key, dek->keylen );
     if( rc == G10ERR_WEAK_KEY )
-       log_info(_("WARNING: message was encrypted with "
-                   "a weak key in the symmetric cipher.\n"));
-    else if( rc ) {
+      {
+       log_info(_("WARNING: message was encrypted with"
+                  " a weak key in the symmetric cipher.\n"));
+       rc=0;
+      }
+    else if( rc )
+      {
        log_error("key setup failed: %s\n", g10_errstr(rc) );
        goto leave;
-    }
+      
+}
     if (!ed->buf) {
         log_error(_("problem handling encrypted packet\n"));
         goto leave;