commit 9a90320f3d21f4be780bc85c4bfbd06d5b560818
author cristy <urban-warrior@git.imagemagick.org> Mon Jun 11 01:08:56 2012 +0000
committer cristy <urban-warrior@git.imagemagick.org> Mon Jun 11 01:08:56 2012 +0000
tree 0cf0232da60ea5ed058829787befd6f0e6bb688c
parent 53ea28bdea98fe4b2cbd5811ef61b2ac4fa5d721

MagickCore/cipher.c

diff --git a/MagickCore/cipher.c b/MagickCore/cipher.c
index 314e83a..ca8086b 100644
--- a/MagickCore/cipher.c
+++ b/MagickCore/cipher.c
@@ -613,7 +613,9 @@
       ThrowBinaryException(ResourceLimitError,"MemoryAllocationFailed",
         image->filename);
     }
-  nonce=SplitStringInfo(key,GetStringInfoLength(key)/2);
+  SetAESKey(aes_info,key);
+  key=DestroyStringInfo(key);
+  nonce=AcquireStringInfo(0);
   if (nonce == (StringInfo *) NULL)
     {
       key=DestroyStringInfo(key);
@@ -622,10 +624,7 @@
       ThrowBinaryException(ResourceLimitError,"MemoryAllocationFailed",
         image->filename);
     }
-  SetAESKey(aes_info,key);
-  key=DestroyStringInfo(key);
   signature_info=AcquireSignatureInfo();
-  UpdateSignature(signature_info,nonce);
   SetStringInfoLength(nonce,sizeof(quantum_info->extent));
   SetStringInfoDatum(nonce,(const unsigned char *) &quantum_info->extent);
   UpdateSignature(signature_info,nonce);
@@ -814,7 +813,9 @@
       ThrowBinaryException(ResourceLimitError,"MemoryAllocationFailed",
         image->filename);
     }
-  nonce=SplitStringInfo(key,GetStringInfoLength(key)/2);
+  SetAESKey(aes_info,key);
+  key=DestroyStringInfo(key);
+  nonce=AcquireStringInfo(0);
   if (nonce == (StringInfo *) NULL)
     {
       key=DestroyStringInfo(key);
@@ -823,10 +824,7 @@
       ThrowBinaryException(ResourceLimitError,"MemoryAllocationFailed",
         image->filename);
     }
-  SetAESKey(aes_info,key);
-  key=DestroyStringInfo(key);
   signature_info=AcquireSignatureInfo();
-  UpdateSignature(signature_info,nonce);
   SetStringInfoLength(nonce,sizeof(quantum_info->extent));
   SetStringInfoDatum(nonce,(const unsigned char *) &quantum_info->extent);
   UpdateSignature(signature_info,nonce);