Subversion Repositories pub

Compare Revisions

Ignore whitespace Rev 168 → Rev 167

/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/README
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/test/test.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/test/test_doctests.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/LICENSE
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/README.relevation
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/.gitignore
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/setup.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/Random/OSRNG.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/Random/Fortuna.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/Random/__init__.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/Hash/pysha224.py
File deleted
\ No newline at end of file
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/Hash/pysha512.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/Hash/python_SHA.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/Hash/RIPEMD.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/Hash/python_whirlpool.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/Hash/pysha256.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/Hash/pypbkdf2.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/Hash/pysha384.py
File deleted
\ No newline at end of file
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/Hash/pysha.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/Hash/python_MD5.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/Hash/pywhirlpool.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/Hash/pymd5.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/Hash/python_RadioGatun.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/Hash/__init__.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/Hash/python_SHA224.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/Hash/python_SHA512.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/Hash/pyradiogatun.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/Hash/python_SHA256.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/Hash/python_PBKDF2.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/Hash/python_SHA384.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/__init__.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/Protocol.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/SelfTest/Hash/test_SHA.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/SelfTest/Hash/test_RIPEMD.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/SelfTest/Hash/__init__.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/SelfTest/Hash/test_MD2.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/SelfTest/Hash/test_MD4.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/SelfTest/Hash/test_MD5.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/SelfTest/Hash/test_SHA256.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/SelfTest/Hash/test_HMAC.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/SelfTest/Hash/common.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/SelfTest/st_common.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/SelfTest/__init__.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/SelfTest/PublicKey/test_RSA.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/SelfTest/PublicKey/__init__.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/SelfTest/Cipher/test_ARC2.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/SelfTest/Cipher/test_AES.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/SelfTest/Cipher/test_XOR.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/SelfTest/Cipher/test_ARC4.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/SelfTest/Cipher/test_RC5.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/SelfTest/Cipher/common.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/SelfTest/Cipher/test_python_AES.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/SelfTest/Cipher/test_CAST.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/SelfTest/Cipher/test_DES.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/SelfTest/Cipher/test_Blowfish.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/SelfTest/Cipher/test_DES3.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/SelfTest/Cipher/__init__.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/SelfTest/Cipher/test_IDEA.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/SelfTest/Util/test_number.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/SelfTest/Util/test_winrandom.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/SelfTest/Util/__init__.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/SelfTest/Random/Fortuna/test_FortunaAccumulator.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/SelfTest/Random/Fortuna/__init__.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/SelfTest/Random/Fortuna/test_FortunaGenerator.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/SelfTest/Random/Fortuna/test_SHAd256.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/SelfTest/Random/test_rpoolcompat.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/SelfTest/Random/__init__.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/SelfTest/Random/test_random.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/SelfTest/Random/OSRNG/test_generic.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/SelfTest/Random/OSRNG/test_winrandom.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/SelfTest/Random/OSRNG/test_fallback.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/SelfTest/Random/OSRNG/__init__.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/SelfTest/Random/OSRNG/test_nt.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/SelfTest/Random/OSRNG/test_posix.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/Cipher/CAST.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/Cipher/pytwofish.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/Cipher/DES3.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/Cipher/python_DES3.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/Cipher/__init__.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/Cipher/IDEA.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/Cipher/AES.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/Cipher/python_AES.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/Cipher/DES.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/Cipher/python_DES.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/Cipher/Blowfish.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/Cipher/python_Blowfish.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/Cipher/python_Serpent.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/Cipher/python_PRESENT.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/Cipher/python_Twofish.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/Cipher/pyDes.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/Cipher/blockcipher.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/Cipher/pyblowfish.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/Cipher/ARC2.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/Cipher/rijndael.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/Cipher/pypresent.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/Cipher/python_Rijndael.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/Cipher/RC5.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/Cipher/pyserpent.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/testvectors.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/Util/util.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/Util/randpool.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/Util/__init__.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/Util/python_compat.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/Util/padding.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/Util/number.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/Util/RFC1751.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/python-cryptoplus/src/CryptoPlus/PublicKey.py
File deleted
/relevation/branches/1.1-PyCryptoPlus/README.Windows
File deleted
/relevation/branches/1.1-PyCryptoPlus/CHANGELOG
1,11 → 1,5
$Date$
 
1.1 (2011-07-05):
- Support PyCryptoPlus if PyCrypto is not available. Enhances
cross-platform support.
- Print an error message if the decryption produced wrong data
(normally caused by a bad password)
 
1.0 (2011-06-30):
- First public release
 
/relevation/branches/1.1-PyCryptoPlus/relevation.py
48,20 → 48,10
import sys
import zlib
 
# Import PyCrypto if present, fall back to PyCryptoPlus otherwise
try:
from Crypto.Cipher import AES
except ImportError:
try:
from CryptoPlus.Cipher import AES
except ImportError:
sys.stderr.write('Error: Either PyCrypto or PyCryptoPlus must be installed\n')
raise
 
__author__ = 'Toni Corvera'
__date__ = '$Date$'
__revision__ = '$Rev$'
__version_info__ = ( 1, 1 ) #, 0 )
__version_info__ = ( 1, 0 ) #, 0 )
__version__ = '.'.join(map(str, __version_info__))
RELEASE=True
 
317,7 → 307,7
sys.stderr.write('Password is required\n')
sys.exit(os.EX_USAGE)
# ---------- PASSWORDS FILE DECRYPTION AND DECOMPRESSION ---------- #
# ---------- PASSWORDS FILE DECRYPTION ---------- #
f = None
try:
if not os.access(datafile, os.R_OK):
367,9 → 357,6
if __name__ == '__main__':
try:
main()
except zlib.error:
sys.stderr.write('Failed to decompress decrypted data. Wrong password?\n')
sys.exit(os.EX_DATAERR)
except libxml2.parserError as e:
sys.stderr.write('XML parsing error\n')
if not RELEASE: