/mandos/trunk : revision 628

To get this branch, use:

bzr branch
http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to mandos-ctl

Committer: Teddy Hogeborn
Date: 2013-10-20 21:04:35 UTC
Revision ID: teddy@recompile.se-20131020210435-jc94ovr5i4sve16r

* Makefile (install-client-nokey): Install "mandos-change-keytype".
  (uninstall-client): Uninstall "mandos-change-keytype".
* mandos (priority): Changed back default GnuTLS priority string to
                     "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP".
* mandos-change-keytype: New script which, assuming the Mandos server
                         is responding, will generate a new key with
                         the new mandos-keygen default parameters
                         (currently 4096-bit RSA), and output a
                         replacement section for clients.conf on the
                         Mandos server.
* mandos-keygen: Bug fix: output password prompt even when redirecting
                 stdout.
* mandos-options.xml (priority): Document new default value.
* mandos.conf (priority): - '' -

Show diffs side-by-side

added added

removed removed

mandos-ctl

server_path = "/"

server_interface = domain + ".Mandos"

client_interface = domain + ".Mandos.Client"

version = "1.6.0"

version = "1.6.1"

def timedelta_to_milliseconds(td):

"""Convert a datetime.timedelta object to milliseconds"""

199

>>> string_to_delta("5m 30s")

200

datetime.timedelta(0, 330)

201

"""

202

value = datetime.timedelta(0)

203

regexp = re.compile(r"(\d+)([dsmhw]?)")

204

202

205

203

try:

206

204

return rfc3339_duration_to_delta(interval)

207

205

except ValueError:

208

206

pass

209

207

208

value = datetime.timedelta(0)

209

regexp = re.compile(r"(\d+)([dsmhw]?)")

210

211

for num, suffix in regexp.findall(interval):

211

212

if suffix == "d":

212

213

value += datetime.timedelta(int(num))

Older »