self.next_pfx ()
- def set_parameters (self, password, paramversion, nacl=None, counter=None,
- nextpfx=None):
+ def set_parameters (self, password, paramversion=None, nacl=None,
+ counter=None, nextpfx=None):
if nextpfx is not None:
self.next_pfx = nextpfx
self.next_pfx ()
tag = None # GCM tag, part of header
- def __init__ (self, password, paramversion=None, nacl=None, counter=None,
- fixedparts=None):
+ def __init__ (self, password, counter=None, fixedparts=None):
# passwort
if isinstance (password, str) is False:
raise InvalidParameter ("__init__: password must be a string, not %s"
if len (password) == 0:
raise InvalidParameter ("__init__: supplied empty password but not "
"permitted for PDT encrypted files")
- # version
- if isinstance (version, int) is False:
- raise InvalidParameter ("__init__: version number must be an "
- "integer, not %s" % type (version))
- if version < 0:
- raise InvalidParameter ("__init__: version number must be a "
- "nonnegative integer, not %d" % version)
- # paramversion
- if isinstance (paramversion, int) is False:
- raise InvalidParameter ("__init__: crypto parameter version number "
- "must be an integer, not %s"
- % type (paramversion))
- if paramversion < 0:
- raise InvalidParameter ("__init__: crypto parameter version number "
- "must be a nonnegative integer, not %d"
- % paramversion)
# fixed parts
if fixedparts is not None:
if isinstance (fixedparts, list) is False:
% type (fixedparts))
self.fixed = fixedparts
self.fixed.sort ()
- super().__init__ (password, paramversion, nacl, counter=counter)
- super().__init__ (password, paramversion, nacl, counter=counter)
+ super().__init__ (password, counter=counter)
+ super().__init__ (password, counter=counter)
def valid_fixed_part (self, iv):