summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
44e2927)
A small number of related changes.
* Make the default encryption algorithm be Rijndael (AES) rather than
Blowfish. I think this is now the right recommendation to make,
even if it's not my personal taste. (I'm actually using Twofish
nowadays anyway.)
* Make the default field size for Schnorr groups be 3072 bits rather
than 2048, which reflects the advice given by NIST and IEEE 1363.
* Reformat the tripe-keys.master file in line with current thinking.
* Fix a minor typo in tripe-keys.conf.5.in.
ec \-Cnist-p256
_
.TE
.TP
.I kx-expire
Expiry time for generated keys. Default is
ec \-Cnist-p256
_
.TE
.TP
.I kx-expire
Expiry time for generated keys. Default is
.TP
.I hash
Hashing algorithm to use. Default is
.TP
.I hash
Hashing algorithm to use. Default is
-dh \-LS \-b2048 \-B256
-dsa \-b2048 \-B256
-rsa \-b2048
+dh \-LS \-b3072 \-B256
+dsa \-b3072 \-B256
+rsa \-b3072
.IB repos-base .
.TP
.I sig-file
.IB repos-base .
.TP
.I sig-file
-Tempalte for repository signatures. Default is the concatenation of
+Template for repository signatures. Default is the concatenation of
.I base-dir
and
.IR sig-base .
.I base-dir
and
.IR sig-base .
('conf-file', '${base-dir}tripe-keys.conf'),
('upload-hook', ': run upload hook'),
('kx', 'dh'),
('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'),
'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'),
('hash', 'sha256'),
('master-keygen-flags', '-l'),
('mgf', '${hash}-mgf'),
'rsapss': 'rsa',
'ecdsa': 'ec',
'eckcdsa': 'ec'}[conf['sig']]),
'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',
- 'rsa': '-b2048'}[conf['sig-genalg']]),
+ 'rsa': '-b3072'}[conf['sig-genalg']]),
('sig-hash', '${hash}'),
('sig-expire', 'forever'),
('fingerprint-hash', '${hash}')]:
('sig-hash', '${hash}'),
('sig-expire', 'forever'),
('fingerprint-hash', '${hash}')]:
-# tripe-keys configuration file
-#
-# see tripe-keys.conf(5) for full details
+### -*-conf-*-
+###
+### tripe-keys configuration file
+###
+### see tripe-keys.conf(5) for full details
-### File locations (required)
+###--------------------------------------------------------------------------
+### File locations (required).
-# The base URL for the repository files. Include the trailing slash if
-# necessary.
+## The base URL for the repository files. Include the trailing slash if
+## necessary.
# base-url = http://some.server.somewhere/blah/
# base-url = http://some.server.somewhere/blah/
-# The local directory name for the repository files. Again, include the
-# trailing slash if necessary.
+## The local directory name for the repository files. Again, include the
+## trailing slash if necessary.
# base-dir = /some/directory/blah/
# base-dir = /some/directory/blah/
+###--------------------------------------------------------------------------
+### Crypto parameters.
-# The key-exchange type. May be `dh' or `ec'.
+## The key-exchange type. May be `dh' or `ec'.
-# Key-generation parameters for key exchange group.
-# kx-param = -LS -b2048 -B256
+## Key-generation parameters for key exchange group.
+# kx-param = -LS -b3072 -B256
+# kx-param = -Pnist-p256
-# Expiry time for peer key-exchange keys.
-# kx-expire = now + 1 day
+## Expiry time for peer key-exchange keys.
+# kx-expire = now + 1 year
-# Symmetric encryption scheme to use.
-# cipher = blowfish-cbc
+## Symmetric encryption scheme to use.
+# cipher = rijndael-cbc
-# Hash function to use. (We derive the MGF and MAC from this.)
+## Hash function to use. (We derive the MGF and MAC from this.)
-# Signature scheme to use for signing/verifying repository archives.
+## Signature scheme to use for signing/verifying repository archives.
-# How recently an archive must have been signed to be valid.
+## How recently an archive must have been signed to be valid.
-# When the signing key expires.
+## When the master signing key expires.
+###--------------------------------------------------------------------------
-# Since the master public key is contained within the repository, we must
-# check its integrity: therefore we record its sequence number and
-# fingerprint here. These are filled in automatically by
-# `tripe-keys upload'. Leave them as they are.
+## Since the master public key is contained within the repository, we must
+## check its integrity: therefore we record its sequence number and
+## fingerprint here. These are filled in automatically by `tripe-keys
+## upload'. Leave them as they are.
master-sequence = @MASTER-SEQUENCE@
hk-master = @HK-MASTER@
master-sequence = @MASTER-SEQUENCE@
hk-master = @HK-MASTER@