commit e1c94d9d25db6b0dd7a5028ffee31d1057855d73
author cristy <urban-warrior@git.imagemagick.org> Sun Jun 28 12:16:33 2015 +0000
committer cristy <urban-warrior@git.imagemagick.org> Sun Jun 28 12:16:33 2015 +0000
tree f23e14cc395bc63a40cd8fa6be3f8506ba034ab0
parent c8e4bcc9fa12696b13fdafa8052dc74be5eb208a

MagickCore/cipher.c

diff --git a/MagickCore/cipher.c b/MagickCore/cipher.c
index e26b4aa..22e5475 100644
--- a/MagickCore/cipher.c
+++ b/MagickCore/cipher.c
@@ -205,7 +205,7 @@
       (aes_info->decipher_key == (unsigned int *) NULL))
     ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed");
   aes_info->timestamp=(ssize_t) time(0);
-  aes_info->signature=MagickSignature;
+  aes_info->signature=MagickCoreSignature;
   return(aes_info);
 }
 
@@ -235,7 +235,7 @@
 {
   (void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
   assert(aes_info != (AESInfo *) NULL);
-  assert(aes_info->signature == MagickSignature);
+  assert(aes_info->signature == MagickCoreSignature);
   if (aes_info->decipher_key != (unsigned int *) NULL)
     aes_info->decipher_key=(unsigned int *) RelinquishMagickMemory(
       aes_info->decipher_key);
@@ -244,7 +244,7 @@
       aes_info->encipher_key);
   if (aes_info->key != (StringInfo *) NULL)
     aes_info->key=DestroyStringInfo(aes_info->key);
-  aes_info->signature=(~MagickSignature);
+  aes_info->signature=(~MagickCoreSignature);
   aes_info=(AESInfo *) RelinquishMagickMemory(aes_info);
   return(aes_info);
 }
@@ -604,11 +604,11 @@
     Generate decipher key and nonce.
   */
   assert(image != (Image *) NULL);
-  assert(image->signature == MagickSignature);
+  assert(image->signature == MagickCoreSignature);
   if (image->debug != MagickFalse)
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
   assert(exception != (ExceptionInfo *) NULL);
-  assert(exception->signature == MagickSignature);
+  assert(exception->signature == MagickCoreSignature);
   if (passkey == (const StringInfo *) NULL)
     return(MagickTrue);
   aes_info=AcquireAESInfo();
@@ -817,11 +817,11 @@
     Generate encipher key and nonce.
   */
   assert(image != (Image *) NULL);
-  assert(image->signature == MagickSignature);
+  assert(image->signature == MagickCoreSignature);
   if (image->debug != MagickFalse)
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
   assert(exception != (ExceptionInfo *) NULL);
-  assert(exception->signature == MagickSignature);
+  assert(exception->signature == MagickCoreSignature);
   if (passkey == (const StringInfo *) NULL)
     return(MagickTrue);
   if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse)
@@ -1011,7 +1011,7 @@
   */
   (void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
   assert(aes_info != (AESInfo *) NULL);
-  assert(aes_info->signature == MagickSignature);
+  assert(aes_info->signature == MagickCoreSignature);
   assert(key != (StringInfo *) NULL);
   n=4;
   aes_info->rounds=10;
@@ -1107,11 +1107,11 @@
   const char *passphrase,ExceptionInfo *exception)
 {
   assert(image != (Image *) NULL);
-  assert(image->signature == MagickSignature);
+  assert(image->signature == MagickCoreSignature);
   if (image->debug != MagickFalse)
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
   assert(exception != (ExceptionInfo *) NULL);
-  assert(exception->signature == MagickSignature);
+  assert(exception->signature == MagickCoreSignature);
   (void) passphrase;
   ThrowBinaryException(ImageError,"CipherSupportNotEnabled",image->filename);
 }
@@ -1120,11 +1120,11 @@
   const StringInfo *passkey,ExceptionInfo *exception)
 {
   assert(image != (Image *) NULL);
-  assert(image->signature == MagickSignature);
+  assert(image->signature == MagickCoreSignature);
   if (image->debug != MagickFalse)
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
   assert(exception != (ExceptionInfo *) NULL);
-  assert(exception->signature == MagickSignature);
+  assert(exception->signature == MagickCoreSignature);
   (void) passkey;
   ThrowBinaryException(ImageError,"CipherSupportNotEnabled",image->filename);
 }
@@ -1163,11 +1163,11 @@
   const char *passphrase,ExceptionInfo *exception)
 {
   assert(image != (Image *) NULL);
-  assert(image->signature == MagickSignature);
+  assert(image->signature == MagickCoreSignature);
   if (image->debug != MagickFalse)
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
   assert(exception != (ExceptionInfo *) NULL);
-  assert(exception->signature == MagickSignature);
+  assert(exception->signature == MagickCoreSignature);
   (void) passphrase;
   ThrowBinaryException(ImageError,"CipherSupportNotEnabled",image->filename);
 }
@@ -1176,11 +1176,11 @@
   const StringInfo *passkey,ExceptionInfo *exception)
 {
   assert(image != (Image *) NULL);
-  assert(image->signature == MagickSignature);
+  assert(image->signature == MagickCoreSignature);
   if (image->debug != MagickFalse)
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
   assert(exception != (ExceptionInfo *) NULL);
-  assert(exception->signature == MagickSignature);
+  assert(exception->signature == MagickCoreSignature);
   (void) passkey;
   ThrowBinaryException(ImageError,"CipherSupportNotEnabled",image->filename);
 }