Moved 1.9 branch to trunk

1 files changed, 12 insertions, 12 deletions

diff --git a/g10/free-packet.c b/g10/free-packet.c
index be49bb5e4..8aab06370 100644
--- a/g10/free-packet.c
+++ b/g10/free-packet.c
@@ -26,13 +26,13 @@
 #include <string.h>
 #include <assert.h>
 
+#include "gpg.h"
 #include "packet.h"
-#include "iobuf.h"
-#include "mpi.h"
+#include "../common/iobuf.h"
 #include "util.h"
 #include "cipher.h"
-#include "memory.h"
-#include "options.h"
+#include "options.h" 
+
 
 void
 free_symkey_enc( PKT_symkey_enc *enc )
@@ -46,9 +46,9 @@ free_pubkey_enc( PKT_pubkey_enc *enc )
     int n, i;
     n = pubkey_get_nenc( enc->pubkey_algo );
     if( !n )
-	mpi_free(enc->data[0]);
+	mpi_release(enc->data[0]);
     for(i=0; i < n; i++ )
-	mpi_free( enc->data[i] );
+	mpi_release( enc->data[i] );
     xfree(enc);
 }
 
@@ -59,9 +59,9 @@ free_seckey_enc( PKT_signature *sig )
 
   n = pubkey_get_nsig( sig->pubkey_algo );
   if( !n )
-    mpi_free(sig->data[0]);
+    mpi_release(sig->data[0]);
   for(i=0; i < n; i++ )
-    mpi_free( sig->data[i] );
+    mpi_release( sig->data[i] );
 
   xfree(sig->revkey);
   xfree(sig->hashed);
@@ -83,9 +83,9 @@ release_public_key_parts( PKT_public_key *pk )
     int n, i;
     n = pubkey_get_npkey( pk->pubkey_algo );
     if( !n )
-	mpi_free(pk->pkey[0]);
+	mpi_release(pk->pkey[0]);
     for(i=0; i < n; i++ ) {
-	mpi_free( pk->pkey[i] );
+	mpi_release( pk->pkey[i] );
 	pk->pkey[i] = NULL;
     }
     if (pk->prefs) {
@@ -265,9 +265,9 @@ release_secret_key_parts( PKT_secret_key *sk )
 
     n = pubkey_get_nskey( sk->pubkey_algo );
     if( !n )
-	mpi_free(sk->skey[0]);
+	mpi_release(sk->skey[0]);
     for(i=0; i < n; i++ ) {
-	mpi_free( sk->skey[i] );
+	mpi_release( sk->skey[i] );
 	sk->skey[i] = NULL;
     }
 }