/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 Makefile

  • Committer: Teddy Hogeborn
  • Date: 2015-03-10 18:52:09 UTC
  • Revision ID: teddy@recompile.se-20150310185209-lxuovbu09zwyk9bx
Automatically determine the number of DH bits in the TLS handshake.

Instead of using a default value of 1024, check the OpenPGP key and
determine an appropriate number of DH bits to use, (using GnuTLS
functions made for this).  Document this new default behavior.

* plugins.d/mandos-client.c (safe_string): New function.
  (init_gnutls_global): If not specified, determine the number of DH
                        bits to use, based on the OpenPGP key.
* plugins.d/mandos-client.xml (OPTIONS): Document this new default of
                                         the --dh-bits option.

Thanks to Andreas Fischer <af@bantuX.org> for reporting this issue.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
1
 
WARN:=-O -Wall -Wextra -Wdouble-promotion -Wformat=2 -Winit-self \
 
1
WARN=-O -Wall -Wextra -Wdouble-promotion -Wformat=2 -Winit-self \
2
2
        -Wmissing-include-dirs -Wswitch-default -Wswitch-enum \
3
3
        -Wunused -Wuninitialized -Wstrict-overflow=5 \
4
4
        -Wsuggest-attribute=pure -Wsuggest-attribute=const \
10
10
        -Wmissing-format-attribute -Wnormalized=nfc -Wpacked \
11
11
        -Wredundant-decls -Wnested-externs -Winline -Wvla \
12
12
        -Wvolatile-register-var -Woverlength-strings
13
 
 
14
 
#DEBUG:=-ggdb3 -fsanitize=address $(SANITIZE)
15
 
## Check which sanitizing options can be used
16
 
#SANITIZE:=$(foreach option,$(ALL_SANITIZE_OPTIONS),$(shell \
17
 
#       echo 'int main(){}' | $(CC) --language=c $(option) \
18
 
#       /dev/stdin -o /dev/null >/dev/null 2>&1 && echo $(option)))
19
 
# <https://developerblog.redhat.com/2014/10/16/gcc-undefined-behavior-sanitizer-ubsan/>
20
 
ALL_SANITIZE_OPTIONS:=-fsanitize=leak -fsanitize=undefined \
21
 
        -fsanitize=shift -fsanitize=integer-divide-by-zero \
22
 
        -fsanitize=unreachable -fsanitize=vla-bound -fsanitize=null \
23
 
        -fsanitize=return -fsanitize=signed-integer-overflow \
24
 
        -fsanitize=bounds -fsanitize=alignment \
25
 
        -fsanitize=object-size -fsanitize=float-divide-by-zero \
26
 
        -fsanitize=float-cast-overflow -fsanitize=nonnull-attribute \
27
 
        -fsanitize=returns-nonnull-attribute -fsanitize=bool \
28
 
        -fsanitize=enum -fsanitize-address-use-after-scope
29
 
 
 
13
#DEBUG=-ggdb3
30
14
# For info about _FORTIFY_SOURCE, see feature_test_macros(7)
31
 
# and <https://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>.
32
 
FORTIFY:=-fstack-protector-all -fPIC
33
 
CPPFLAGS+=-D_FORTIFY_SOURCE=3
34
 
LINK_FORTIFY_LD:=-z relro -z now
35
 
LINK_FORTIFY:=
 
15
# and <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>.
 
16
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC
 
17
LINK_FORTIFY_LD=-z relro -z now
 
18
LINK_FORTIFY=
36
19
 
37
20
# If BROKEN_PIE is set, do not build with -pie
38
21
ifndef BROKEN_PIE
40
23
LINK_FORTIFY += -pie
41
24
endif
42
25
#COVERAGE=--coverage
43
 
OPTIMIZE:=-Os -fno-strict-aliasing
44
 
LANGUAGE:=-std=gnu11
45
 
CPPFLAGS+=-D_FILE_OFFSET_BITS=64
46
 
htmldir:=man
47
 
version:=1.8.16
48
 
SED:=sed
49
 
PKG_CONFIG?=pkg-config
50
 
 
51
 
USER:=$(firstword $(subst :, ,$(shell getent passwd _mandos \
52
 
        || getent passwd nobody || echo 65534)))
53
 
GROUP:=$(firstword $(subst :, ,$(shell getent group _mandos \
54
 
        || getent group nogroup || echo 65534)))
55
 
 
56
 
LINUXVERSION:=$(shell uname --kernel-release)
 
26
OPTIMIZE=-Os -fno-strict-aliasing
 
27
LANGUAGE=-std=gnu99
 
28
htmldir=man
 
29
version=1.6.9
 
30
SED=sed
 
31
 
 
32
USER=$(firstword $(subst :, ,$(shell getent passwd _mandos || getent passwd nobody || echo 65534)))
 
33
GROUP=$(firstword $(subst :, ,$(shell getent group _mandos || getent group nobody || echo 65534)))
57
34
 
58
35
## Use these settings for a traditional /usr/local install
59
 
# PREFIX:=$(DESTDIR)/usr/local
60
 
# CONFDIR:=$(DESTDIR)/etc/mandos
61
 
# KEYDIR:=$(DESTDIR)/etc/mandos/keys
62
 
# MANDIR:=$(PREFIX)/man
63
 
# INITRAMFSTOOLS:=$(DESTDIR)/etc/initramfs-tools
64
 
# DRACUTMODULE:=$(DESTDIR)/usr/lib/dracut/modules.d/90mandos
65
 
# STATEDIR:=$(DESTDIR)/var/lib/mandos
66
 
# LIBDIR:=$(PREFIX)/lib
67
 
# DBUSPOLICYDIR:=$(DESTDIR)/etc/dbus-1/system.d
 
36
# PREFIX=$(DESTDIR)/usr/local
 
37
# CONFDIR=$(DESTDIR)/etc/mandos
 
38
# KEYDIR=$(DESTDIR)/etc/mandos/keys
 
39
# MANDIR=$(PREFIX)/man
 
40
# INITRAMFSTOOLS=$(DESTDIR)/etc/initramfs-tools
 
41
# STATEDIR=$(DESTDIR)/var/lib/mandos
 
42
# LIBDIR=$(PREFIX)/lib
68
43
##
69
44
 
70
45
## These settings are for a package-type install
71
 
PREFIX:=$(DESTDIR)/usr
72
 
CONFDIR:=$(DESTDIR)/etc/mandos
73
 
KEYDIR:=$(DESTDIR)/etc/keys/mandos
74
 
MANDIR:=$(PREFIX)/share/man
75
 
INITRAMFSTOOLS:=$(DESTDIR)/usr/share/initramfs-tools
76
 
DRACUTMODULE:=$(DESTDIR)/usr/lib/dracut/modules.d/90mandos
77
 
STATEDIR:=$(DESTDIR)/var/lib/mandos
78
 
LIBDIR:=$(shell \
 
46
PREFIX=$(DESTDIR)/usr
 
47
CONFDIR=$(DESTDIR)/etc/mandos
 
48
KEYDIR=$(DESTDIR)/etc/keys/mandos
 
49
MANDIR=$(PREFIX)/share/man
 
50
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
 
51
STATEDIR=$(DESTDIR)/var/lib/mandos
 
52
LIBDIR=$(shell \
79
53
        for d in \
80
 
        "/usr/lib/`dpkg-architecture \
81
 
                        -qDEB_HOST_MULTIARCH 2>/dev/null`" \
 
54
        "/usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null`" \
82
55
        "`rpm --eval='%{_libdir}' 2>/dev/null`" /usr/lib; do \
83
56
                if [ -d "$$d" -a "$$d" = "$${d%/}" ]; then \
84
57
                        echo "$(DESTDIR)$$d"; \
85
58
                        break; \
86
59
                fi; \
87
60
        done)
88
 
DBUSPOLICYDIR:=$(DESTDIR)/usr/share/dbus-1/system.d
89
61
##
90
62
 
91
 
SYSTEMD:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
92
 
                        --variable=systemdsystemunitdir)
93
 
TMPFILES:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
94
 
                        --variable=tmpfilesdir)
95
 
SYSUSERS:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
96
 
                        --variable=sysusersdir)
 
63
SYSTEMD=$(DESTDIR)$(shell pkg-config systemd --variable=systemdsystemunitdir)
97
64
 
98
 
GNUTLS_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I gnutls)
99
 
GNUTLS_LIBS:=$(shell $(PKG_CONFIG) --libs gnutls)
100
 
AVAHI_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I avahi-core)
101
 
AVAHI_LIBS:=$(shell $(PKG_CONFIG) --libs avahi-core)
102
 
GPGME_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I gpgme 2>/dev/null \
103
 
        || gpgme-config --cflags; getconf LFS_CFLAGS)
104
 
GPGME_LIBS:=$(shell $(PKG_CONFIG) --libs gpgme 2>/dev/null \
105
 
        || gpgme-config --libs; getconf LFS_LIBS; \
 
65
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
 
66
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
 
67
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
 
68
AVAHI_LIBS=$(shell pkg-config --libs avahi-core)
 
69
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
 
70
GPGME_LIBS=$(shell gpgme-config --libs; getconf LFS_LIBS; \
106
71
        getconf LFS_LDFLAGS)
107
 
LIBNL3_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I libnl-route-3.0)
108
 
LIBNL3_LIBS:=$(shell $(PKG_CONFIG) --libs libnl-route-3.0)
109
 
GLIB_CFLAGS:=$(shell $(PKG_CONFIG) --cflags glib-2.0)
110
 
GLIB_LIBS:=$(shell $(PKG_CONFIG) --libs glib-2.0)
111
72
 
112
73
# Do not change these two
113
74
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
114
 
        $(LANGUAGE) -DVERSION='"$(version)"'
115
 
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(strip \
116
 
        ) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
 
75
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
 
76
        -DVERSION='"$(version)"'
 
77
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
117
78
 
118
79
# Commands to format a DocBook <refentry> document into a manual page
119
80
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
125
86
        /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
126
87
        $(notdir $<); \
127
88
        if locale --all 2>/dev/null | grep --regexp='^en_US\.utf8$$' \
128
 
        && command -v man >/dev/null; then LANG=en_US.UTF-8 \
129
 
        MANWIDTH=80 man --warnings --encoding=UTF-8 --local-file \
130
 
        $(notdir $@); fi >/dev/null)
 
89
        && type man 2>/dev/null; then LANG=en_US.UTF-8 MANWIDTH=80 \
 
90
        man --warnings --encoding=UTF-8 --local-file $(notdir $@); \
 
91
        fi >/dev/null)
131
92
 
132
93
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
133
94
        --param make.year.ranges                1 \
139
100
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
140
101
        $<; $(HTMLPOST) $@)
141
102
# Fix citerefentry links
142
 
HTMLPOST:=$(SED) --in-place \
 
103
HTMLPOST=$(SED) --in-place \
143
104
        --expression='s/\(<a class="citerefentry" href="\)\("><span class="citerefentry"><span class="refentrytitle">\)\([^<]*\)\(<\/span>(\)\([^)]*\)\()<\/span><\/a>\)/\1\3.\5\2\3\4\5\6/g'
144
105
 
145
 
PLUGINS:=plugins.d/password-prompt plugins.d/mandos-client \
 
106
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
146
107
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
147
108
        plugins.d/plymouth
148
 
PLUGIN_HELPERS:=plugin-helpers/mandos-client-iprouteadddel
149
 
CPROGS:=plugin-runner dracut-module/password-agent $(PLUGINS) \
150
 
        $(PLUGIN_HELPERS)
151
 
PROGS:=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
152
 
DOCS:=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
 
109
CPROGS=plugin-runner $(PLUGINS)
 
110
PROGS=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
 
111
DOCS=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
153
112
        mandos.conf.5 mandos-clients.conf.5 plugin-runner.8mandos \
154
 
        dracut-module/password-agent.8mandos \
155
113
        plugins.d/mandos-client.8mandos \
156
114
        plugins.d/password-prompt.8mandos plugins.d/usplash.8mandos \
157
115
        plugins.d/splashy.8mandos plugins.d/askpass-fifo.8mandos \
158
116
        plugins.d/plymouth.8mandos intro.8mandos
159
117
 
160
 
htmldocs:=$(addsuffix .xhtml,$(DOCS))
161
 
 
162
 
objects:=$(addsuffix .o,$(CPROGS))
163
 
 
164
 
.PHONY: all
 
118
htmldocs=$(addsuffix .xhtml,$(DOCS))
 
119
 
 
120
objects=$(addsuffix .o,$(CPROGS))
 
121
 
165
122
all: $(PROGS) mandos.lsm
166
123
 
167
 
.PHONY: doc
168
124
doc: $(DOCS)
169
125
 
170
 
.PHONY: html
171
126
html: $(htmldocs)
172
127
 
173
128
%.5: %.xml common.ent legalnotice.xml
232
187
                overview.xml legalnotice.xml
233
188
        $(DOCBOOKTOHTML)
234
189
 
235
 
dracut-module/password-agent.8mandos: \
236
 
                dracut-module/password-agent.xml common.ent \
237
 
                overview.xml legalnotice.xml
238
 
        $(DOCBOOKTOMAN)
239
 
dracut-module/password-agent.8mandos.xhtml: \
240
 
                dracut-module/password-agent.xml common.ent \
241
 
                overview.xml legalnotice.xml
242
 
        $(DOCBOOKTOHTML)
243
 
 
244
190
plugins.d/mandos-client.8mandos: plugins.d/mandos-client.xml \
245
191
                                        common.ent \
246
192
                                        mandos-options.xml \
289
235
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
290
236
                $@)
291
237
 
292
 
# Need to add the GnuTLS, Avahi and GPGME libraries
293
 
plugins.d/mandos-client: CFLAGS += $(GNUTLS_CFLAGS) $(strip \
294
 
        ) $(AVAHI_CFLAGS) $(GPGME_CFLAGS)
295
 
plugins.d/mandos-client: LDLIBS += $(GNUTLS_LIBS) $(strip \
296
 
        ) $(AVAHI_LIBS) $(GPGME_LIBS)
297
 
 
298
 
# Need to add the libnl-route library
299
 
plugin-helpers/mandos-client-iprouteadddel: CFLAGS += $(LIBNL3_CFLAGS)
300
 
plugin-helpers/mandos-client-iprouteadddel: LDLIBS += $(LIBNL3_LIBS)
301
 
 
302
 
# Need to add the GLib and pthread libraries
303
 
dracut-module/password-agent: CFLAGS += $(GLIB_CFLAGS)
304
 
# Note: -lpthread is unnecessary with the GNU C library 2.34 or later
305
 
dracut-module/password-agent: LDLIBS += $(GLIB_LIBS) -lpthread
306
 
 
307
 
.PHONY: clean
 
238
plugins.d/mandos-client: plugins.d/mandos-client.c
 
239
        $(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
 
240
                ) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
 
241
 
 
242
.PHONY : all doc html clean distclean mostlyclean maintainer-clean \
 
243
        check run-client run-server install install-html \
 
244
        install-server install-client-nokey install-client uninstall \
 
245
        uninstall-server uninstall-client purge purge-server \
 
246
        purge-client
 
247
 
308
248
clean:
309
249
        -rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
310
250
 
311
 
.PHONY: distclean
312
251
distclean: clean
313
 
.PHONY: mostlyclean
314
252
mostlyclean: clean
315
 
.PHONY: maintainer-clean
316
253
maintainer-clean: clean
317
254
        -rm --force --recursive keydir confdir statedir
318
255
 
319
 
.PHONY: check
320
 
check: all
 
256
check:  all
321
257
        ./mandos --check
322
258
        ./mandos-ctl --check
323
 
        ./mandos-keygen --version
324
 
        ./plugin-runner --version
325
 
        ./plugin-helpers/mandos-client-iprouteadddel --version
326
 
        ./dracut-module/password-agent --test
327
259
 
328
260
# Run the client with a local config and key
329
 
.PHONY: run-client
330
 
run-client: all keydir/seckey.txt keydir/pubkey.txt \
331
 
                        keydir/tls-privkey.pem keydir/tls-pubkey.pem
332
 
        @echo '######################################################'
333
 
        @echo '# The following error messages are harmless and can  #'
334
 
        @echo '#  be safely ignored:                                #'
335
 
        @echo '## From plugin-runner:                               #'
336
 
        @echo '# setgid: Operation not permitted                    #'
337
 
        @echo '# setuid: Operation not permitted                    #'
338
 
        @echo '## From askpass-fifo:                                #'
339
 
        @echo '# mkfifo: Permission denied                          #'
340
 
        @echo '## From mandos-client:                               #'
341
 
        @echo '# Failed to raise privileges: Operation not permi... #'
342
 
        @echo '# Warning: network hook "*" exited with status *     #'
343
 
        @echo '# ioctl SIOCSIFFLAGS +IFF_UP: Operation not permi... #'
344
 
        @echo '# Failed to bring up interface "*": Operation not... #'
345
 
        @echo '#                                                    #'
346
 
        @echo '# (The messages are caused by not running as root,   #'
347
 
        @echo '# but you should NOT run "make run-client" as root   #'
348
 
        @echo '# unless you also unpacked and compiled Mandos as    #'
349
 
        @echo '# root, which is also NOT recommended.)              #'
350
 
        @echo '######################################################'
 
261
run-client: all keydir/seckey.txt keydir/pubkey.txt
 
262
        @echo "###################################################################"
 
263
        @echo "# The following error messages are harmless and can be safely     #"
 
264
        @echo "# ignored.  The messages are caused by not running as root, but   #"
 
265
        @echo "# you should NOT run \"make run-client\" as root unless you also    #"
 
266
        @echo "# unpacked and compiled Mandos as root, which is NOT recommended. #"
 
267
        @echo "# From plugin-runner: setgid: Operation not permitted             #"
 
268
        @echo "#                     setuid: Operation not permitted             #"
 
269
        @echo "# From askpass-fifo:  mkfifo: Permission denied                   #"
 
270
        @echo "# From mandos-client:                                             #"
 
271
        @echo "#             Failed to raise privileges: Operation not permitted #"
 
272
        @echo "#             Warning: network hook \"*\" exited with status *      #"
 
273
        @echo "###################################################################"
351
274
# We set GNOME_KEYRING_CONTROL to block pam_gnome_keyring
352
275
        ./plugin-runner --plugin-dir=plugins.d \
353
 
                --plugin-helper-dir=plugin-helpers \
354
276
                --config-file=plugin-runner.conf \
355
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--tls-privkey=keydir/tls-privkey.pem,--tls-pubkey=keydir/tls-pubkey.pem,--network-hook-dir=network-hooks.d \
 
277
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--network-hook-dir=network-hooks.d \
356
278
                --env-for=mandos-client:GNOME_KEYRING_CONTROL= \
357
279
                $(CLIENTARGS)
358
280
 
359
281
# Used by run-client
360
 
keydir/seckey.txt keydir/pubkey.txt keydir/tls-privkey.pem keydir/tls-pubkey.pem: mandos-keygen
 
282
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
361
283
        install --directory keydir
362
284
        ./mandos-keygen --dir keydir --force
363
 
        if ! [ -e keydir/tls-privkey.pem ]; then \
364
 
                install --mode=u=rw /dev/null keydir/tls-privkey.pem; \
365
 
        fi
366
 
        if ! [ -e keydir/tls-pubkey.pem ]; then \
367
 
                install --mode=u=rw /dev/null keydir/tls-pubkey.pem; \
368
 
        fi
369
285
 
370
286
# Run the server with a local config
371
 
.PHONY: run-server
372
287
run-server: confdir/mandos.conf confdir/clients.conf statedir
373
288
        ./mandos --debug --no-dbus --configdir=confdir \
374
289
                --statedir=statedir $(SERVERARGS)
377
292
confdir/mandos.conf: mandos.conf
378
293
        install --directory confdir
379
294
        install --mode=u=rw,go=r $^ $@
380
 
confdir/clients.conf: clients.conf keydir/seckey.txt keydir/tls-pubkey.pem
 
295
confdir/clients.conf: clients.conf keydir/seckey.txt
381
296
        install --directory confdir
382
297
        install --mode=u=rw $< $@
383
298
# Add a client password
385
300
statedir:
386
301
        install --directory statedir
387
302
 
388
 
.PHONY: install
389
303
install: install-server install-client-nokey
390
304
 
391
 
.PHONY: install-html
392
305
install-html: html
393
306
        install --directory $(htmldir)
394
307
        install --mode=u=rw,go=r --target-directory=$(htmldir) \
395
308
                $(htmldocs)
396
309
 
397
 
.PHONY: install-server
398
310
install-server: doc
399
311
        install --directory $(CONFDIR)
400
312
        if install --directory --mode=u=rwx --owner=$(USER) \
403
315
        elif install --directory --mode=u=rwx $(STATEDIR); then \
404
316
                chown -- $(USER):$(GROUP) $(STATEDIR) || :; \
405
317
        fi
406
 
        if [ "$(TMPFILES)" != "$(DESTDIR)" \
407
 
                        -a -d "$(TMPFILES)" ]; then \
408
 
                install --mode=u=rw,go=r tmpfiles.d-mandos.conf \
409
 
                        $(TMPFILES)/mandos.conf; \
410
 
        fi
411
 
        if [ "$(SYSUSERS)" != "$(DESTDIR)" \
412
 
                        -a -d "$(SYSUSERS)" ]; then \
413
 
                install --mode=u=rw,go=r sysusers.d-mandos.conf \
414
 
                        $(SYSUSERS)/mandos.conf; \
415
 
        fi
416
318
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
417
319
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
418
320
                mandos-ctl
423
325
        install --mode=u=rw --target-directory=$(CONFDIR) \
424
326
                clients.conf
425
327
        install --mode=u=rw,go=r dbus-mandos.conf \
426
 
                $(DBUSPOLICYDIR)/mandos.conf
 
328
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
427
329
        install --mode=u=rwx,go=rx init.d-mandos \
428
330
                $(DESTDIR)/etc/init.d/mandos
429
331
        if [ "$(SYSTEMD)" != "$(DESTDIR)" -a -d "$(SYSTEMD)" ]; then \
447
349
        gzip --best --to-stdout intro.8mandos \
448
350
                > $(MANDIR)/man8/intro.8mandos.gz
449
351
 
450
 
.PHONY: install-client-nokey
451
352
install-client-nokey: all doc
452
353
        install --directory $(LIBDIR)/mandos $(CONFDIR)
453
354
        install --directory --mode=u=rwx $(KEYDIR) \
454
 
                $(LIBDIR)/mandos/plugins.d \
455
 
                $(LIBDIR)/mandos/plugin-helpers
456
 
        if [ "$(SYSUSERS)" != "$(DESTDIR)" \
457
 
                        -a -d "$(SYSUSERS)" ]; then \
458
 
                install --mode=u=rw,go=r sysusers.d-mandos.conf \
459
 
                        $(SYSUSERS)/mandos-client.conf; \
460
 
        fi
 
355
                $(LIBDIR)/mandos/plugins.d
461
356
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
462
357
                install --mode=u=rwx \
463
 
                        --directory "$(CONFDIR)/plugins.d" \
464
 
                        "$(CONFDIR)/plugin-helpers"; \
 
358
                        --directory "$(CONFDIR)/plugins.d"; \
465
359
        fi
466
360
        install --mode=u=rwx,go=rx --directory \
467
361
                "$(CONFDIR)/network-hooks.d"
468
362
        install --mode=u=rwx,go=rx \
469
363
                --target-directory=$(LIBDIR)/mandos plugin-runner
470
 
        install --mode=u=rwx,go=rx \
471
 
                --target-directory=$(LIBDIR)/mandos \
472
 
                mandos-to-cryptroot-unlock
473
364
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
474
365
                mandos-keygen
475
366
        install --mode=u=rwx,go=rx \
490
381
        install --mode=u=rwxs,go=rx \
491
382
                --target-directory=$(LIBDIR)/mandos/plugins.d \
492
383
                plugins.d/plymouth
493
 
        install --mode=u=rwx,go=rx \
494
 
                --target-directory=$(LIBDIR)/mandos/plugin-helpers \
495
 
                plugin-helpers/mandos-client-iprouteadddel
496
384
        install initramfs-tools-hook \
497
385
                $(INITRAMFSTOOLS)/hooks/mandos
498
 
        install --mode=u=rw,go=r initramfs-tools-conf \
499
 
                $(INITRAMFSTOOLS)/conf.d/mandos-conf
500
 
        install --mode=u=rw,go=r initramfs-tools-conf-hook \
501
 
                $(INITRAMFSTOOLS)/conf-hooks.d/zz-mandos
 
386
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
 
387
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
502
388
        install initramfs-tools-script \
503
389
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
504
 
        install initramfs-tools-script-stop \
505
 
                $(INITRAMFSTOOLS)/scripts/local-premount/mandos
506
 
        install --directory $(DRACUTMODULE)
507
 
        install --mode=u=rw,go=r --target-directory=$(DRACUTMODULE) \
508
 
                dracut-module/ask-password-mandos.path \
509
 
                dracut-module/ask-password-mandos.service
510
 
        install --mode=u=rwxs,go=rx \
511
 
                --target-directory=$(DRACUTMODULE) \
512
 
                dracut-module/module-setup.sh \
513
 
                dracut-module/cmdline-mandos.sh \
514
 
                dracut-module/password-agent
515
390
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
516
391
        gzip --best --to-stdout mandos-keygen.8 \
517
392
                > $(MANDIR)/man8/mandos-keygen.8.gz
529
404
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
530
405
        gzip --best --to-stdout plugins.d/plymouth.8mandos \
531
406
                > $(MANDIR)/man8/plymouth.8mandos.gz
532
 
        gzip --best --to-stdout dracut-module/password-agent.8mandos \
533
 
                > $(MANDIR)/man8/password-agent.8mandos.gz
534
407
 
535
 
.PHONY: install-client
536
408
install-client: install-client-nokey
537
409
# Post-installation stuff
538
410
        -$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)"
539
 
        if command -v update-initramfs >/dev/null; then \
540
 
            update-initramfs -k all -u; \
541
 
        elif command -v dracut >/dev/null; then \
542
 
            for initrd in $(DESTDIR)/boot/initr*-$(LINUXVERSION); do \
543
 
                if [ -w "$$initrd" ]; then \
544
 
                    chmod go-r "$$initrd"; \
545
 
                    dracut --force "$$initrd"; \
546
 
                fi; \
547
 
            done; \
548
 
        fi
 
411
        update-initramfs -k all -u
549
412
        echo "Now run mandos-keygen --password --dir $(KEYDIR)"
550
413
 
551
 
.PHONY: uninstall
552
414
uninstall: uninstall-server uninstall-client
553
415
 
554
 
.PHONY: uninstall-server
555
416
uninstall-server:
556
417
        -rm --force $(PREFIX)/sbin/mandos \
557
418
                $(PREFIX)/sbin/mandos-ctl \
564
425
        update-rc.d -f mandos remove
565
426
        -rmdir $(CONFDIR)
566
427
 
567
 
.PHONY: uninstall-client
568
428
uninstall-client:
569
429
# Refuse to uninstall client if /etc/crypttab is explicitly configured
570
430
# to use it.
581
441
                $(INITRAMFSTOOLS)/hooks/mandos \
582
442
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
583
443
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
584
 
                $(INITRAMFSTOOLS)/scripts/local-premount/mandos \
585
 
                $(DRACUTMODULE)/ask-password-mandos.path \
586
 
                $(DRACUTMODULE)/ask-password-mandos.service \
587
 
                $(DRACUTMODULE)/module-setup.sh \
588
 
                $(DRACUTMODULE)/cmdline-mandos.sh \
589
 
                $(DRACUTMODULE)/password-agent \
590
444
                $(MANDIR)/man8/mandos-keygen.8.gz \
591
445
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
592
446
                $(MANDIR)/man8/mandos-client.8mandos.gz
595
449
                $(MANDIR)/man8/splashy.8mandos.gz \
596
450
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
597
451
                $(MANDIR)/man8/plymouth.8mandos.gz \
598
 
                $(MANDIR)/man8/password-agent.8mandos.gz \
599
452
        -rmdir $(LIBDIR)/mandos/plugins.d $(CONFDIR)/plugins.d \
600
 
                 $(LIBDIR)/mandos $(CONFDIR) $(KEYDIR) $(DRACUTMODULE)
601
 
        if command -v update-initramfs >/dev/null; then \
602
 
            update-initramfs -k all -u; \
603
 
        elif command -v dracut >/dev/null; then \
604
 
            for initrd in $(DESTDIR)/boot/initr*-$(LINUXVERSION); do \
605
 
                test -w "$$initrd" && dracut --force "$$initrd"; \
606
 
            done; \
607
 
        fi
 
453
                 $(LIBDIR)/mandos $(CONFDIR) $(KEYDIR)
 
454
        update-initramfs -k all -u
608
455
 
609
 
.PHONY: purge
610
456
purge: purge-server purge-client
611
457
 
612
 
.PHONY: purge-server
613
458
purge-server: uninstall-server
614
459
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
615
460
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
620
465
                $(DESTDIR)/var/run/mandos.pid
621
466
        -rmdir $(CONFDIR)
622
467
 
623
 
.PHONY: purge-client
624
468
purge-client: uninstall-client
625
 
        -shred --remove $(KEYDIR)/seckey.txt $(KEYDIR)/tls-privkey.pem
 
469
        -shred --remove $(KEYDIR)/seckey.txt
626
470
        -rm --force $(CONFDIR)/plugin-runner.conf \
627
 
                $(KEYDIR)/pubkey.txt $(KEYDIR)/seckey.txt \
628
 
                $(KEYDIR)/tls-pubkey.txt $(KEYDIR)/tls-privkey.txt
 
471
                $(KEYDIR)/pubkey.txt $(KEYDIR)/seckey.txt
629
472
        -rmdir $(KEYDIR) $(CONFDIR)/plugins.d $(CONFDIR)