X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/catacomb-python/blobdiff_plain/0e29d9164d5cc4e3cafa509cda19de2e025446c1..9444777c58c60253afdabf5b45011440845770e0:/algorithms.py diff --git a/algorithms.py b/algorithms.py index 3ceb207..84ea439 100644 --- a/algorithms.py +++ b/algorithms.py @@ -33,7 +33,7 @@ latindances = ''' salsa20 salsa20/12 salsa20/8 xsalsa20 xsalsa20/12 xsalsa20/8 chacha20 chacha12 chacha8 xchacha20 xchacha12 xchacha8 '''.split() -streamciphers += map(lambda s: s.translate(None, '/'), latindances) +streamciphers += map(lambda s: s.replace('/', ''), latindances) hashes = ''' md2 md4 md5 tiger has160 sha sha224 sha256 sha384 sha512 @@ -86,7 +86,7 @@ for i in latindances: raise ValueError, 'failed to find root name for %s' % i print ('\t_("%(name)s", %(root)s_keysz, %(id)s_rand, ' + 'RNGF_NONCE, %(ROOT)s_NONCESZ) \\') % \ - {'name': i, 'id': i.translate(None, '/'), + {'name': i, 'id': i.replace('/', ''), 'root': root, 'ROOT': root.upper()} print '\t/* end */' print