[Pymoul-svn] SF.net SVN: pymoul: [222] pymoul/trunk/src/moul/crypt/whatdoyousee.py

[<ti...@us...>]

Revision: 222
          http://pymoul.svn.sourceforge.net/pymoul/?rev=222&view=rev
Author:   tiran
Date:     2007-03-01 09:41:40 -0800 (Thu, 01 Mar 2007)

Log Message:
-----------
Use new xtea module

Modified Paths:
--------------
    pymoul/trunk/src/moul/crypt/whatdoyousee.py

Modified: pymoul/trunk/src/moul/crypt/whatdoyousee.py
===================================================================
--- pymoul/trunk/src/moul/crypt/whatdoyousee.py	2007-03-01 17:33:31 UTC (rev 221)
+++ pymoul/trunk/src/moul/crypt/whatdoyousee.py	2007-03-01 17:41:40 UTC (rev 222)
@@ -29,19 +29,16 @@
 __revision__ = "$Revision$"
 
 import struct
+import xtea
 from logging import getLogger
-
 from moul.crypt.binary import BinaryFile
-from xtea import xtea_decrypt
-from xtea import xtea_encrypt
 
-
 HEADER = "whatdoyousee"
 CROSS_REF = (0x6c0a5452, 0x03827d0f, 0x3a170b92, 0x16db7fc2)
 CROSS_KEY = struct.pack("<4L", *CROSS_REF)
-ENDIAN="<" # little endian (not network/big endian)
-
 LOG = getLogger('moul.crypt.whatdoyousee')
+XTEA = xtea.new(CROSS_KEY, endian=xtea.LITTLE_ENDIAN)
+ENDIAN = "<"
 
 def decryptWDYS(fin):
     """Decrypt whatdoyousee files
@@ -62,7 +59,7 @@
         if not block:
             break
         try:
-            block = xtea_decrypt(CROSS_KEY, block, endian=ENDIAN)
+            block = XTEA.decrypt(block)
         except:
             LOG.exception("xTEA failure at block %r" % block)
             raise
@@ -101,7 +98,7 @@
             block = block + '\0' * (8-len(block))
         assert len(block) == 8
         try:
-            block = xtea_encrypt(CROSS_KEY, block, endian=ENDIAN)
+            block = XTEA.encrypt(block)
         except:
             LOG.exception("xTEA failure at block %r" % block)
             raise


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.