/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.postinst

  • Committer: Teddy Hogeborn
  • Date: 2015-07-06 20:09:47 UTC
  • mto: (237.7.307 trunk)
  • mto: This revision was merged to the branch mainline in revision 325.
  • Revision ID: teddy@recompile.se-20150706200947-w21u4eq74efgl6r5
Fix minor bugs and typos and add some more debug output.

* Makefile (install-client-nokey): Create plugin-helpers directory and
                                   the mandos-client-iprouteadddel
                                   helper program.
* initramfs-tools-hook (PLUGINHELPERDIR): Fix typo.
* plugins.d/mandos-client.c: Change terminology; routes are "deleted",
                             not "removed".  All occurences changed.
  (add_remove_local_route): Renamed to "add_delete_local_route".  All
                            callers changed.  Also pass "--debug" flag
                            to helper if in debug mode.
  (add_local_route): Add debugging output.
  (remove_local_route): Renamed to "delete_local_route".  All callers
                        changed.  Also pass "--debug" flag to helper
                        if in debug mode.
  (start_mandos_communication): Add debug output when adding route.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/mandos-client.postinst
63
63
    fi
64
64
}
65
65
 
66
 
create_dh_params(){
67
 
    if [ -r /etc/keys/mandos/dhparams.pem ]; then
68
 
        return 0
69
 
    fi
70
 
    # Create a Diffe-Hellman parameters file
71
 
    DHFILE="`mktemp -t mandos-client-dh-parameters.XXXXXXXXXX.pem`"
72
 
    # First try certtool from GnuTLS
73
 
    if ! certtool --generate-dh-params --sec-param high \
74
 
         --outfile "$DHFILE"; then
75
 
        # Otherwise try OpenSSL
76
 
        if ! openssl genpkey -genparam -algorithm DH -out "$DHFILE" \
77
 
             -pkeyopt dh_paramgen_prime_len:3072; then
78
 
            # None of the commands succeded; give up
79
 
            rm -- "$DHFILE"
80
 
            return 1
81
 
        fi
82
 
    fi
83
 
    sed --in-place --expression='0,/^-----BEGIN DH PARAMETERS-----$/d' \
84
 
        "$DHFILE"
85
 
    sed --in-place --expression='1i-----BEGIN DH PARAMETERS-----' \
86
 
            "$DHFILE"
87
 
    cp --archive "$DHFILE" /etc/keys/mandos/dhparams.pem
88
 
    rm -- "$DHFILE"
89
 
}
90
 
 
91
66
case "$1" in
92
67
    configure)
93
68
        add_mandos_user "$@"
94
69
        create_key "$@"
95
 
        create_dh_params "$@" || :
96
70
        update_initramfs "$@"
97
71
        ;;
98
72
    abort-upgrade|abort-deconfigure|abort-remove)