/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-12 01:41:14 UTC
  • mto: (237.7.594 trunk)
  • mto: This revision was merged to the branch mainline in revision 325.
  • Revision ID: teddy@recompile.se-20150712014114-qbala4mutkixxct3
Handle local Zeroconf service name collisions on startup, too.

* mandos (AvahiService.server_state_changed): Catch name collision
                                              error when adding
                                              server.

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
 
66
91
case "$1" in
67
92
    configure)
68
93
        add_mandos_user "$@"
69
94
        create_key "$@"
 
95
        create_dh_params "$@" || :
70
96
        update_initramfs "$@"
71
97
        ;;
72
98
    abort-upgrade|abort-deconfigure|abort-remove)