encryption fixes
git-svn-id: svn+ssh://localhost/home/henryk/svn/cyberflex-shell/trunk@123 f711b948-2313-0410-aaa9-d29f33439f0b
This commit is contained in:
parent
1b26df986b
commit
3bc5f0d3cf
|
@ -78,7 +78,7 @@ class Cyberflex_Shell(Shell):
|
||||||
|
|
||||||
mode = getattr(c_class, "MODE_" + cipherparts[1].upper(), None)
|
mode = getattr(c_class, "MODE_" + cipherparts[1].upper(), None)
|
||||||
if mode is None:
|
if mode is None:
|
||||||
raise ValueError, "Mode '%s' not known, must be one of %s" % (cipherparts[1], ", ".join([e.split()[1].lower() for e in dir(c_class) if e.startswith("MODE_")]))
|
raise ValueError, "Mode '%s' not known, must be one of %s" % (cipherparts[1], ", ".join([e.split("_")[1].lower() for e in dir(c_class) if e.startswith("MODE_")]))
|
||||||
|
|
||||||
cipher = None
|
cipher = None
|
||||||
if iv is None:
|
if iv is None:
|
||||||
|
@ -100,13 +100,12 @@ class Cyberflex_Shell(Shell):
|
||||||
"Encrypt or decrypt with openssl-like interface"
|
"Encrypt or decrypt with openssl-like interface"
|
||||||
|
|
||||||
args = list(args)
|
args = list(args)
|
||||||
print args
|
|
||||||
|
|
||||||
MODE_DECRYPT = "-d"
|
MODE_DECRYPT = "-d"
|
||||||
MODE_ENCRYPT = "-e"
|
MODE_ENCRYPT = "-e"
|
||||||
mode = MODE_ENCRYPT
|
mode = MODE_ENCRYPT
|
||||||
if "-e" in args:
|
if "-d" in args:
|
||||||
mode = MODE_ENCRYPT
|
mode = MODE_DECRYPT
|
||||||
|
|
||||||
input = None
|
input = None
|
||||||
if "-in" in args:
|
if "-in" in args:
|
||||||
|
@ -123,6 +122,7 @@ class Cyberflex_Shell(Shell):
|
||||||
if "-iv" in args:
|
if "-iv" in args:
|
||||||
i = args.index("-iv")
|
i = args.index("-iv")
|
||||||
iv = args[i+1]
|
iv = args[i+1]
|
||||||
|
iv = binascii.a2b_hex("".join(iv.split()))
|
||||||
|
|
||||||
cipher = "des"
|
cipher = "des"
|
||||||
if args[0][0] != "-":
|
if args[0][0] != "-":
|
||||||
|
|
Loading…
Reference in New Issue