X-Git-Url: https://git.distorted.org.uk/~mdw/tripe/blobdiff_plain/44e2927917faa9ab4ad4f3e4931d746192a241b0..ca3aaaeb369633cd65c8cc29dde88daff2c38e8c:/keys/tripe-keys.in diff --git a/keys/tripe-keys.in b/keys/tripe-keys.in index b0dbf945..6e947e52 100644 --- a/keys/tripe-keys.in +++ b/keys/tripe-keys.in @@ -217,10 +217,10 @@ def conf_defaults(): ('conf-file', '${base-dir}tripe-keys.conf'), ('upload-hook', ': run upload hook'), ('kx', 'dh'), - ('kx-param', lambda: {'dh': '-LS -b2048 -B256', + ('kx-param', lambda: {'dh': '-LS -b3072 -B256', 'ec': '-Cnist-p256'}[conf['kx']]), ('kx-expire', 'now + 1 year'), - ('cipher', 'blowfish-cbc'), + ('cipher', 'rijndael-cbc'), ('hash', 'sha256'), ('master-keygen-flags', '-l'), ('mgf', '${hash}-mgf'), @@ -235,10 +235,10 @@ def conf_defaults(): 'rsapss': 'rsa', 'ecdsa': 'ec', 'eckcdsa': 'ec'}[conf['sig']]), - ('sig-param', lambda: {'dh': '-LS -b2048 -B256', - 'dsa': '-b2048 -B256', + ('sig-param', lambda: {'dh': '-LS -b3072 -B256', + 'dsa': '-b3072 -B256', 'ec': '-Cnist-p256', - 'rsa': '-b2048'}[conf['sig-genalg']]), + 'rsa': '-b3072'}[conf['sig-genalg']]), ('sig-hash', '${hash}'), ('sig-expire', 'forever'), ('fingerprint-hash', '${hash}')]: