moan(msg)
exit(1)
-def chomp(pp):
- """Return the string PP, without its trailing newline if it has one."""
- if len(pp) > 0 and pp[-1] == '\n':
- pp = pp[:-1]
- return pp
-
###--------------------------------------------------------------------------
### Subcommand implementations.
## Parse the options.
try:
- opts, args = getopt(av, 'c:h:m:', ['cipher=', 'mac=', 'hash='])
+ opts, args = getopt(av, 'c:d:h:m:',
+ ['cipher=', 'database=', 'mac=', 'hash='])
except GetoptError:
return 1
+ dbty = 'gdbm'
for o, a in opts:
if o in ('-c', '--cipher'): cipher = a
elif o in ('-m', '--mac'): mac = a
elif o in ('-h', '--hash'): hash = a
+ elif o in ('-d', '--database'): dbty = a
else: raise 'Barf!'
if len(args) > 2: return 1
if len(args) >= 1: tag = args[0]
## Set up the database.
if mac is None: mac = hash + '-hmac'
- PW.create(file, C.gcciphers[cipher], C.gchashes[hash], C.gcmacs[mac], tag)
+ try: dbcls = StorageBackend.byname(dbty)
+ except KeyError: die("Unknown database backend `%s'" % dbty)
+ PW.create(dbcls, file, tag,
+ C.gcciphers[cipher], C.gchashes[hash], C.gcmacs[mac])
def cmd_changepp(av):
if len(av) != 0: return 1
vpp = C.getpass("Confirm passphrase `%s': " % tag)
if pp != vpp: die("passphrases don't match")
elif av[1] == '-':
- pp = stdin.readline()
+ pp = stdin.readline().rstrip('\n')
else:
pp = av[1]
- pw[av[0]] = chomp(pp)
+ pw[av[0]] = pp
def cmd_copy(av):
if len(av) < 1 or len(av) > 2: return 1
except KeyError, exc: die("Password `%s' not found" % exc.args[0])
commands = { 'create': [cmd_create,
- '[-c CIPHER] [-h HASH] [-m MAC] [PP-TAG]'],
+ '[-c CIPHER] [-d DBTYPE] [-h HASH] [-m MAC] [PP-TAG]'],
'find' : [cmd_find, 'LABEL'],
'store' : [cmd_store, 'LABEL [VALUE]'],
'list' : [cmd_list, '[GLOB-PATTERN]'],
def version():
print '%s 1.0.0' % prog
+ print 'Backend types: %s' % \
+ ' '.join([c.NAME for c in StorageBackend.classes()])
def usage(fp):
print >>fp, 'Usage: %s COMMAND [ARGS...]' % prog