/mandos/release

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/release

« back to all changes in this revision

Viewing changes to debian/mandos-client.postrm

  • Committer: Teddy Hogeborn
  • Date: 2015-07-08 21:18:49 UTC
  • mto: (237.7.594 trunk)
  • mto: This revision was merged to the branch mainline in revision 325.
  • Revision ID: teddy@recompile.se-20150708211849-scisutuofnxumqc7
mandos-client: Add --dh-params FILE option.

* plugins.d/mandos-client.c: Added --dh-params FILE option.
  (init_gnutls_global): New "dhparamsfilename" argument.  All callers
                        changed.  Read and use Diffie-Hellman
                        parameters from it.  Bug fix:  check for error
                        when opening seckeyfile for the second time.
  (init_gnutls_session): Remove unnecessary call to
                         gnutls_dh_set_prime_bits();
  (main): New variable "dh_params_file".
  (main/argp_options): Added "--dh-params" option.
  (main/parse_opt): - '' -
* plugins.d/mandos-client.xml (SYNOPSIS): Add --dh-params option.
  (OPTIONS): Document --dh-params option and document that the
             --dh-bits options is potentially overridden by the
             --dh-params option.

Show diffs side-by-side

added added

removed removed

Lines of Context:
31
31
# Update the initial RAM file system image
32
32
update_initramfs()
33
33
{
34
 
    if command -v update-initramfs >/dev/null; then
35
 
        update-initramfs -k all -u
36
 
    elif command -v dracut >/dev/null; then
37
 
        # Logic taken from dracut.postinst
38
 
        for kernel in /boot/vmlinu[xz]-*; do
39
 
            kversion="${kernel#/boot/vmlinu[xz]-}"
40
 
            if [ "$kversion" != "*" ]; then
41
 
                /etc/kernel/postinst.d/dracut "$kversion"
42
 
            fi
43
 
        done
 
34
    if [ -x /usr/sbin/update-initramfs ]; then
 
35
        update-initramfs -u -k all
44
36
    fi
45
37
}
46
38
 
53
45
        shred --remove /etc/keys/mandos/seckey.txt 2>/dev/null || :
54
46
        rm --force /etc/mandos/plugin-runner.conf \
55
47
            /etc/keys/mandos/pubkey.txt \
56
 
            /etc/keys/mandos/seckey.txt \
57
 
            /etc/keys/mandos/tls-privkey.pem \
58
 
            /etc/keys/mandos/tls-pubkey.pem \
59
 
            /etc/keys/mandos/dhparams.pem 2>/dev/null
 
48
            /etc/keys/mandos/seckey.txt 2>/dev/null
60
49
        update_initramfs
61
50
        ;;
62
51
    upgrade|failed-upgrade|disappear|abort-install|abort-upgrade)