Merged with gpg 1.4.3 code.

The gpg part does not yet build.

1 files changed, 38 insertions, 38 deletions

diff --git a/g10/cipher.c b/g10/cipher.c
index 3d51a874a..ff1080495 100644
--- a/g10/cipher.c
+++ b/g10/cipher.c
@@ -1,5 +1,6 @@
 /* cipher.c - En-/De-ciphering filter
- * Copyright (C) 1998, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001, 2003,
+ *               2006 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -15,7 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
@@ -28,7 +30,6 @@
 #include "gpg.h"
 #include "errors.h"
 #include "iobuf.h"
-#include "memory.h"
 #include "util.h"
 #include "filter.h"
 #include "packet.h"
@@ -41,17 +42,17 @@
 
 
 static void
-write_header( cipher_filter_context_t *cfx, iobuf_t a )
+write_header( cipher_filter_context_t *cfx, IOBUF a )
 {
+     gcry_error_t err;
     PACKET pkt;
     PKT_encrypted ed;
     byte temp[18];
     unsigned int blocksize;
     unsigned int nprefix;
-    gpg_error_t rc;
 
-    blocksize = gcry_cipher_get_algo_blklen ( cfx->dek->algo );
-    if( blocksize < 8 || blocksize > 16 )
+    blocksize = gcry_cipher_algo_blklen (cfx->dek->algo);
+    if ( blocksize < 8 || blocksize > 16 )
 	log_fatal("unsupported blocksize %u\n", blocksize );
 
     memset( &ed, 0, sizeof ed );
@@ -60,9 +61,9 @@ write_header( cipher_filter_context_t *cfx, iobuf_t a )
     ed.new_ctb = !ed.len && !RFC1991;
     if( cfx->dek->use_mdc ) {
 	ed.mdc_method = DIGEST_ALGO_SHA1;
-	gcry_md_open (&cfx->mdc_hash, GCRY_MD_SHA1, 0 );
+	gcry_md_open (&cfx->mdc_hash, DIGEST_ALGO_SHA1, 0);
 	if ( DBG_HASHING )
-	    gcry_md_start_debug ( cfx->mdc_hash, "creatmdc" );
+	    gcry_md_start_debug (cfx->mdc_hash, "creatmdc");
     }
 
     {
@@ -78,28 +79,31 @@ write_header( cipher_filter_context_t *cfx, iobuf_t a )
     if( build_packet( a, &pkt ))
 	log_bug("build_packet(ENCR_DATA) failed\n");
     nprefix = blocksize;
-    gcry_randomize ( temp, nprefix, GCRY_STRONG_RANDOM);
+    gcry_randomize (temp, nprefix, GCRY_STRONG_RANDOM );
     temp[nprefix] = temp[nprefix-2];
     temp[nprefix+1] = temp[nprefix-1];
     print_cipher_algo_note( cfx->dek->algo );
-    rc = gcry_cipher_open (&cfx->cipher_hd, cfx->dek->algo,
-                           GCRY_CIPHER_MODE_CFB,
-                           GCRY_CIPHER_SECURE
-                           | ((cfx->dek->use_mdc || cfx->dek->algo >= 100) ?
-                              0 : GCRY_CIPHER_ENABLE_SYNC));
+    err = gcry_cipher_open (&cfx->cipher_hd, 
+                            cfx->dek->algo,
+                            GCRY_CIPHER_MODE_CFB,
+                            (GCRY_CIPHER_SECURE
+                             | ((cfx->dek->use_mdc || cfx->dek->algo >= 100)?
+                                0 : GCRY_CIPHER_ENABLE_SYNC));
     if (rc) {
-	/* we should never get an error here cause we already checked, that
-	 * the algorithm is available. */
+	/* We should never get an error here cause we already checked,
+	 * that the algorithm is available.  */
 	BUG();
     }
+
+
 /*   log_hexdump( "thekey", cfx->dek->key, cfx->dek->keylen );*/
     gcry_cipher_setkey( cfx->cipher_hd, cfx->dek->key, cfx->dek->keylen );
     gcry_cipher_setiv( cfx->cipher_hd, NULL, 0 );
 /*  log_hexdump( "prefix", temp, nprefix+2 ); */
-    if( cfx->mdc_hash ) /* hash the "IV" */
-	gcry_md_write( cfx->mdc_hash, temp, nprefix+2 );
-    gcry_cipher_encrypt( cfx->cipher_hd, temp, nprefix+2, NULL, 0);
-    gcry_cipher_sync( cfx->cipher_hd );
+    if (cfx->mdc_hash) /* Hash the "IV". */
+	gcry_md_write (cfx->mdc_hash, temp, nprefix+2 );
+    gcry_cipher_encrypt (cfx->cipher_hd, temp, nprefix+2, NULL, 0);
+    gcry_cipher_sync (cfx->cipher_hd);
     iobuf_write(a, temp, nprefix+2);
     cfx->header=1;
 }
@@ -111,7 +115,7 @@ write_header( cipher_filter_context_t *cfx, iobuf_t a )
  */
 int
 cipher_filter( void *opaque, int control,
-	       iobuf_t a, byte *buf, size_t *ret_len)
+	       IOBUF a, byte *buf, size_t *ret_len)
 {
     size_t size = *ret_len;
     cipher_filter_context_t *cfx = opaque;
@@ -125,32 +129,31 @@ cipher_filter( void *opaque, int control,
 	if( !cfx->header ) {
 	    write_header( cfx, a );
 	}
-	if( cfx->mdc_hash )
-	    gcry_md_write( cfx->mdc_hash, buf, size );
-	gcry_cipher_encrypt( cfx->cipher_hd, buf, size, NULL, 0);
+	if (cfx->mdc_hash)
+	    gcry_md_write (cfx->mdc_hash, buf, size);
+	gcry_cipher_encrypt (cfx->cipher_hd, buf, size, NULL, 0);
 	rc = iobuf_write( a, buf, size );
     }
     else if( control == IOBUFCTRL_FREE ) {
 	if( cfx->mdc_hash ) {
 	    byte *hash;
-	    int hashlen = gcry_md_get_algo_dlen (gcry_md_get_algo (
-                                                            cfx->mdc_hash));
+	    int hashlen = gcry_md_get_algo_dlen (gcry_md_get_algo
+                                                 (cfx->mdc_hash));
 	    byte temp[22];
 
 	    assert( hashlen == 20 );
 	    /* we must hash the prefix of the MDC packet here */
 	    temp[0] = 0xd3;
 	    temp[1] = 0x14;
-	    gcry_md_putc ( cfx->mdc_hash, temp[0] );
-	    gcry_md_putc ( cfx->mdc_hash, temp[1] );
+	    gcry_md_putc (cfx->mdc_hash, temp[0]);
+	    gcry_md_putc (cfx->mdc_hash, temp[1]);
 
-	    gcry_md_final ( cfx->mdc_hash );
-	    hash = gcry_md_read ( cfx->mdc_hash, 0 );
+	    gcry_md_final (cfx->mdc_hash);
+	    hash = gcry_md_read (cfx->mdc_hash, 0);
 	    memcpy(temp+2, hash, 20);
-	    gcry_cipher_encrypt( cfx->cipher_hd, temp, 22, NULL, 0 );
-	    gcry_md_close ( cfx->mdc_hash ); cfx->mdc_hash = NULL;
-	    rc = iobuf_write( a, temp, 22 );
-            if (rc)
+	    gcry_cipher_encrypt (cfx->cipher_hd, temp, 22, NULL, 0);
+	    gcry_md_close (cfx->mdc_hash); cfx->mdc_hash = NULL;
+	    if( iobuf_write( a, temp, 22 ) )
 		log_error("writing MDC packet failed\n" );
 	}
 	gcry_cipher_close (cfx->cipher_hd);
@@ -160,6 +163,3 @@ cipher_filter( void *opaque, int control,
     }
     return rc;
 }
-
-
-