/mandos/trunk

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

« back to all changes in this revision

Viewing changes to debian/mandos-client.postinst

  • Committer: Teddy Hogeborn
  • Date: 2012-06-16 23:25:46 UTC
  • Revision ID: teddy@recompile.se-20120616232546-dcrkmnhd4yhq6mvd
* plugins.d/mandos-client (mandos_context): Moved to inside "main()".
                                            All users changed.
  (add_server): Take new "current_server" argument; all callers
                changed.
  (init_gpgme, pgp_packet_decrypt, init_gnutls_global,
  init_gnutls_session, start_mandos_communication,
  avahi_loop_with_timeout): Take new "mc" argument"; all callers
                            changed.
  (resolve_callback, browse_callback): Handle void pointer userdata as
                                       "mc", a pointer to
                                       mandos_context.  All callers
                                       changed.
  (main): New "mc" variable.

Show diffs side-by-side

added added

removed removed

Lines of Context:
20
20
# Update the initial RAM file system image
21
21
update_initramfs()
22
22
{
23
 
    update-initramfs -u -k all
 
23
    if [ -x /usr/sbin/update-initramfs ]; then
 
24
        update-initramfs -u -k all
 
25
    fi
24
26
    
25
27
    if dpkg --compare-versions "$2" lt-nl "1.0.10-1"; then
26
28
        # Make old initrd.img files unreadable too, in case they were
56
58
        -a -r /etc/keys/mandos/seckey.txt ]; then
57
59
        return 0
58
60
    fi
59
 
    mandos-keygen
60
 
}
61
 
 
62
 
create_dh_params(){
63
 
    if [ -r /etc/keys/mandos/dhparams.pem ]; then
64
 
        return 0
65
 
    fi
66
 
    # Create a Diffe-Hellman parameters file
67
 
    DHFILE="`mktemp -t mandos-client-dh-parameters.XXXXXXXXXX.pem`"
68
 
    # First try certtool from GnuTLS
69
 
    if ! certtool --generate-dh-params --sec-param high \
70
 
         --outfile "$DHFILE"; then
71
 
        # Otherwise try OpenSSL
72
 
        if ! openssl genpkey -genparam -algorithm DH -out "$DHFILE" \
73
 
             -pkeyopt dh_paramgen_prime_len:3072; then
74
 
            # None of the commands succeded; give up
75
 
            rm -- "$DHFILE"
76
 
            return 1
77
 
        fi
78
 
    fi
79
 
    sed --in-place --expression='0,/^-----BEGIN DH PARAMETERS-----$/d' \
80
 
        "$DHFILE"
81
 
    sed --in-place --expression='1i-----BEGIN DH PARAMETERS-----' \
82
 
            "$DHFILE"
83
 
    cp --archive "$DHFILE" /etc/keys/mandos/dhparams.pem
84
 
    rm -- "$DHFILE"
 
61
    if [ -x /usr/sbin/mandos-keygen ]; then
 
62
        mandos-keygen
 
63
    fi
85
64
}
86
65
 
87
66
case "$1" in
88
67
    configure)
89
68
        add_mandos_user "$@"
90
69
        create_key "$@"
91
 
        create_dh_params "$@" || :
92
70
        update_initramfs "$@"
93
71
        ;;
94
72
    abort-upgrade|abort-deconfigure|abort-remove)