-
Committer:
Teddy Hogeborn
-
Date:
2019-02-09 23:23:26 UTC
-
Revision ID:
teddy@recompile.se-20190209232326-z1z2kzpgfixz7iaj
Add support for using raw public keys in TLS (RFC 7250)
Since GnuTLS removed support for OpenPGP keys in TLS (RFC 6091), and
no other library supports it, we have to change the protocol to use
something else. We choose to use "raw public keys" (RFC 7250). Since
we still use OpenPGP keys to decrypt the secret password, this means
that each client will have two keys: One OpenPGP key and one TLS
public/private key, and the key ID of the latter key is used to
identify clients instead of the fingerprint of the OpenPGP key.
Note that this code is still compatible with GnuTLS before version
3.6.0 (when OpenPGP key support was removed). This commit merely adds
support for using raw pulic keys instead with GnuTLS 3.6.6. or later.
* DBUS-API (Signals/ClientNotFound): Change name of first parameter
from "Fingerprint" to "KeyID".
(Mandos Client Interface/Properties/KeyID): New.
* INSTALL: Document conflict with GnuTLS 3.6.0 (which removed OpenPGP
key support) up until 3.6.6, when support for raw public
keys was added. Also document new dependency of client on
"gnutls-bin" package (for certtool).
* Makefile (run-client): Depend on TLS key files, and also pass them
as arguments to client.
(keydir/tls-privkey.pem, keydir/tls-pubkey.pem): New.
(confdir/clients.conf): Add dependency on TLS public key.
(purge-client): Add removal of TLS key files.
* clients.conf ([foo]/key_id, [bar]/key_id): New.
* debian/control (Source: mandos/Build-Depends): Also allow
libgnutls30 (>= 3.6.6)
(Package: mandos/Depends): - '' -
(Package: mandos/Description): Alter description to match new
design.
(Package: mandos-client/Description): - '' -
(Package: mandos-client/Depends): Move "gnutls-bin | openssl" to
here from "Recommends".
* debian/mandos-client.README.Debian: Add --tls-privkey and
--tls-pubkey options to test
command.
* debian/mandos-client.postinst (create_key): Renamed to "create_keys"
(all callers changed),
and also create TLS key.
* debian/mandos-client.postrm (purge): Also remove TLS key files.
* intro.xml (DESCRIPTION): Describe new dual-key design.
* mandos (GnuTLS): Define different functions depending on whether
support for raw public keys is detected.
(Client.key_id): New attribute.
(ClientDBus.KeyID_dbus_property): New method.
(ProxyClient.__init__): Take new "key_id" parameter.
(ClientHandler.handle): Use key IDs when using raw public keys and
use fingerprints when using OpenPGP keys.
(ClientHandler.peer_certificate): Also handle raw public keys.
(ClientHandler.key_id): New.
(MandosServer.handle_ipc): Pass key ID over the pipe IPC. Also
check for key ID matches when looking up
clients.
(main): Default GnuTLS priority string depends on whether we are
using raw public keys or not. When unpickling clients, set
key_id if not set in the pickle.
(main/MandosDBusService.ClientNotFound): Change name of first
parameter from
"Fingerprint" to "KeyID".
* mandos-clients.conf.xml (OPTIONS): Document new "key_id" option.
(OPTIONS/secret): Mention new key ID matchning.
(EXPANSION/RUNTIME EXPANSION): Add new "key_id" option.
(EXAMPLE): - '' -
* mandos-ctl (tablewords, main/keywords): Add new "KeyID" property.
* mandos-keygen: Create TLS key files. New "--tls-keytype" (-T)
option. Alter help text to be more clear about key
types. When in password mode, also output "key_id"
option.
* mandos-keygen.xml (SYNOPSIS): Add new "--tls-keytype" (-T) option.
(DESCRIPTION): Alter to match new dual-key design.
(OVERVIEW): - '' -
(FILES): Add TLS key files.
* mandos-options.xml (priority): Document new default priority string
when using raw public keys.
* mandos.xml (NETWORK PROTOCOL): Describe new protocol using key ID.
(BUGS): Remove issue about checking expire times of OpenPGP keys,
since TLS public keys do not have expiration times.
(SECURITY/CLIENT): Alter description to match new design.
(SEE ALSO/GnuTLS): - '' -
(SEE ALSO): Add reference to RFC 7250, and alter description of when
RFC 6091 is used.
* overview.xml: Alter text to match new design.
* plugin-runner.xml (EXAMPLE): Add --tls-pubkey and --tls-privkey
options to mandos-client options.
* plugins.d/mandos-client.c: Use raw public keys when compiling with
supporting GnuTLS versions. Add new
"--tls-pubkey" and "--tls-privkey"
options (which do nothing if GnuTLS
library does not support raw public
keys). Alter text throughout to reflect
new design. Only generate new DH
parameters (based on size of OpenPGP key)
when using OpenPGP in TLS. Default
GnuTLS priority string depends on whether
we are using raw public keys or not.
* plugins.d/mandos-client.xml (SYNOPSIS): Add new "--tls-privkey" (-t)
and "--tls-pubkey" (-T)
options.
(DESCRIPTION): Describe new dual-key design.
(OPTIONS): Document new "--tls-privkey" (-t) and "--tls-pubkey" (-T)
options.
(OPTIONS/--dh-bits): No longer necessarily depends on OpenPGP key
size.
(FILES): Add default locations for TLS public and private key files.
(EXAMPLE): Use new --tls-pubkey and --tls-privkey options.
(SECURITY): Alter wording slightly to reflect new dual-key design.
(SEE ALSO/GnuTLS): Alter description to match new design.
(SEE ALSO): Add reference to RFC 7250, and alter description of when
RFC 6091 is used.
..
|
po
|
199
|
15 years ago |
Teddy Hogeborn |
* Makefile: Bug fix: fix syntax error.
* debian/c |
|
|
|
source
|
452.1.1
|
13 years ago |
Teddy Hogeborn |
* debian/source/format: New; contains "3.0 (quilt) |
|
|
|
upstream
|
678
|
10 years ago |
Teddy Hogeborn |
Fix location and format of signing key file.
* de |
|
|
|
changelog |
237.4.100
|
5 years ago |
Teddy Hogeborn |
* Makefile (version): Change to 1.7.20.
* NEWS (Ve |
27.5 KB |
|
|
compat |
921
|
6 years ago |
Teddy Hogeborn |
Update Debian Debhelper compatibility version.
* |
3 bytes |
|
|
control |
962
|
5 years ago |
Teddy Hogeborn |
Add support for using raw public keys in TLS (RFC |
2.9 KB |
|
|
copyright |
923
|
6 years ago |
Teddy Hogeborn |
Update copyright year to 2018
* DBUS-API: Update |
1 KB |
|
|
mandos-client.dirs |
955
|
6 years ago |
Teddy Hogeborn |
Remove workaround for old mkinitramfs-kpkg
* Make |
190 bytes |
|
|
mandos-client.docs |
594
|
12 years ago |
Teddy Hogeborn |
* debian/copyright (Copyright): Join the two lines |
17 bytes |
|
|
mandos-client.examples |
594
|
12 years ago |
Teddy Hogeborn |
* debian/copyright (Copyright): Join the two lines |
16 bytes |
|
|
mandos-client.links |
191
|
15 years ago |
Teddy Hogeborn |
* debian/mandos-client.docs: New. Add README and |
93 bytes |
|
|
mandos-client.lintian-overrides |
839
|
8 years ago |
Teddy Hogeborn |
Client: Make plugin helper override directory mode |
1.7 KB |
|
|
mandos-client.postinst |
962
|
5 years ago |
Teddy Hogeborn |
Add support for using raw public keys in TLS (RFC |
4.5 KB |
|
|
mandos-client.postrm |
962
|
5 years ago |
Teddy Hogeborn |
Add support for using raw public keys in TLS (RFC |
1.3 KB |
|
|
mandos-client.README.Debian |
962
|
5 years ago |
Teddy Hogeborn |
Add support for using raw public keys in TLS (RFC |
4.7 KB |
|
|
mandos.dirs |
841
|
8 years ago |
Teddy Hogeborn |
Server: Debian package bug fix: Include /usr/lib/t |
143 bytes |
|
|
mandos.docs |
423
|
13 years ago |
Teddy Hogeborn |
Documentation changes:
* DBUS-API: New file docum |
26 bytes |
|
|
mandos.lintian-overrides |
930
|
6 years ago |
Teddy Hogeborn |
Update lintian override to use correct line number |
279 bytes |
|
|
mandos.postinst |
837
|
8 years ago |
Teddy Hogeborn |
Server: Make persistent state directory mode u=rwx |
2.3 KB |
|
|
mandos.prerm |
770
|
9 years ago |
Teddy Hogeborn |
* debian/mandos.prerm: Don't run init script, use |
759 bytes |
|
|
mandos.README.Debian |
505.1.2
|
12 years ago |
Teddy Hogeborn |
Change "fukt.bsnet.se" to "recompile.se" throughou |
445 bytes |
|
|
rules |
925
|
6 years ago |
Teddy Hogeborn |
Eliminate unnecessary shell commands in Debian pac |
1.2 KB |
|
|
watch |
922
|
6 years ago |
Teddy Hogeborn |
Update Debian watch file to version 4
* debian/wa |
117 bytes |
|
|