/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: 2019-02-09 23:34:15 UTC
  • Revision ID: teddy@recompile.se-20190209233415-m1ntebuepwna1xg1
Doc fix: Change some "/etc/mandos" to "/etc/keys/mandos"

* clients.conf: Change "/etc/mandos" to "/etc/keys/mandos" where
                appropriate
* mandos-keygen.xml: - '' -

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/mandos-client.postinst
50
50
    fi
51
51
}
52
52
 
53
 
# Create client key pair
54
 
create_key(){
55
 
    if [ -r /etc/keys/mandos/pubkey.txt \
56
 
        -a -r /etc/keys/mandos/seckey.txt ]; then
57
 
        return 0
58
 
    fi
59
 
    mandos-keygen
 
53
# Create client key pairs
 
54
create_keys(){
 
55
    # If the OpenPGP key files do not exist, generate all keys using
 
56
    # mandos-keygen
 
57
    if ! [ -r /etc/keys/mandos/pubkey.txt \
 
58
              -a -r /etc/keys/mandos/seckey.txt ]; then
 
59
        mandos-keygen
 
60
        gpg-connect-agent KILLAGENT /bye || :
 
61
        return 0
 
62
    fi
 
63
 
 
64
    # If the TLS keys already exists, do nothing
 
65
    if [ -r /etc/keys/mandos/tls-privkey.pem \
 
66
            -a -r /etc/keys/mandos/tls-pubkey.pem ]; then
 
67
        return 0
 
68
    fi
 
69
 
 
70
    # If this is an upgrade from an old installation, the TLS keys
 
71
    # will not exist; create them.
 
72
 
 
73
    # First try certtool from GnuTLS
 
74
    if ! certtool --generate-privkey --password='' \
 
75
         --outfile /etc/keys/mandos/tls-privkey.pem \
 
76
         --sec-param ultra --key-type=ed25519 --pkcs8 --no-text \
 
77
         2>/dev/null; then
 
78
        # Otherwise try OpenSSL
 
79
        if ! openssl genpkey -algorithm X25519 \
 
80
             -out /etc/keys/mandos/tls-privkey.pem; then
 
81
            rm --force /etc/keys/mandos/tls-privkey.pem
 
82
            # None of the commands succeded; give up
 
83
            return 1
 
84
        fi
 
85
    fi
 
86
 
 
87
    local umask=$(umask)
 
88
    umask 077
 
89
    # First try certtool from GnuTLS
 
90
    if ! certtool --password='' \
 
91
         --load-privkey=/etc/keys/mandos/tls-privkey.pem \
 
92
         --outfile=/etc/keys/mandos/tls-pubkey.pem --pubkey-info \
 
93
         --no-text 2>/dev/null; then
 
94
        # Otherwise try OpenSSL
 
95
        if ! openssl pkey -in /etc/keys/mandos/tls-privkey.pem \
 
96
             -out /etc/keys/mandos/tls-pubkey.pem -pubout; then
 
97
            rm --force /etc/keys/mandos/tls-pubkey.pem
 
98
            # None of the commands succeded; give up
 
99
            umask $umask
 
100
            return 1
 
101
        fi
 
102
    fi
 
103
    umask $umask
60
104
}
61
105
 
62
106
create_dh_params(){
87
131
case "$1" in
88
132
    configure)
89
133
        add_mandos_user "$@"
90
 
        create_key "$@"
 
134
        create_keys "$@"
91
135
        create_dh_params "$@" || :
92
136
        update_initramfs "$@"
93
 
        if dpkg --compare-versions "$2" lt-nl "1.7.7-1"; then
 
137
        if dpkg --compare-versions "$2" lt-nl "1.7.10-1"; then
94
138
            PLUGINHELPERDIR=/usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null)/mandos/plugin-helpers
95
139
            if ! dpkg-statoverride --list "$PLUGINHELPERDIR" \
96
140
                 >/dev/null 2>&1; then
97
141
                chmod u=rwx,go= -- "$PLUGINHELPERDIR"
98
142
            fi
 
143
            if ! dpkg-statoverride --list /etc/mandos/plugin-helpers \
 
144
                 >/dev/null 2>&1; then
 
145
                chmod u=rwx,go= -- /etc/mandos/plugin-helpers
 
146
            fi
99
147
        fi
100
148
        ;;
101
149
    abort-upgrade|abort-deconfigure|abort-remove)