/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-07-20 03:03:33 UTC
  • Revision ID: teddy@recompile.se-20150720030333-203m2aeblypcsfte
Bug fix for GnuTLS 3: be compatible with old 2048-bit DSA keys.

The mandos-keygen program in Mandos version 1.6.0 and older generated
2048-bit DSA keys, and when GnuTLS uses these it has trouble
connecting using the Mandos default priority string.  This was
previously fixed in Mandos 1.6.2, but the bug reappeared when using
GnuTLS 3, so the default priority string has to change again; this
time also the Mandos client has to change its default, so now the
server and the client should use the same default priority string:

SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA:+SIGN-DSA-SHA256

* mandos (main/server_defaults): Changed default priority string.
* mandos-options.xml (/section/para[id="priority_compat"]): Removed.
  (/section/para[id="priority"]): Changed default priority string.
* mandos.conf ([DEFAULT]/priority): - '' -
* mandos.conf.xml (OPTIONS/priority): Refer to the id "priority"
                                      instead of "priority_compat".
* mandos.xml (OPTIONS/--priority): - '' -
* plugins.d/mandos-client.c (main): Changed default priority string.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
1
 
WARN=-O -Wall -Wformat=2 -Winit-self -Wmissing-include-dirs \
2
 
        -Wswitch-default -Wswitch-enum -Wunused-parameter \
3
 
        -Wstrict-aliasing=1 -Wextra -Wfloat-equal -Wundef -Wshadow \
 
1
WARN=-O -Wall -Wextra -Wdouble-promotion -Wformat=2 -Winit-self \
 
2
        -Wmissing-include-dirs -Wswitch-default -Wswitch-enum \
 
3
        -Wunused -Wuninitialized -Wstrict-overflow=5 \
 
4
        -Wsuggest-attribute=pure -Wsuggest-attribute=const \
 
5
        -Wsuggest-attribute=noreturn -Wfloat-equal -Wundef -Wshadow \
4
6
        -Wunsafe-loop-optimizations -Wpointer-arith \
5
7
        -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings \
6
 
        -Wconversion -Wstrict-prototypes -Wold-style-definition \
7
 
        -Wpacked -Wnested-externs -Winline -Wvolatile-register-var
8
 
#       -Wunreachable-code
 
8
        -Wconversion -Wlogical-op -Waggregate-return \
 
9
        -Wstrict-prototypes -Wold-style-definition \
 
10
        -Wmissing-format-attribute -Wnormalized=nfc -Wpacked \
 
11
        -Wredundant-decls -Wnested-externs -Winline -Wvla \
 
12
        -Wvolatile-register-var -Woverlength-strings
9
13
#DEBUG=-ggdb3
10
 
# For info about _FORTIFY_SOURCE, see
11
 
# <http://www.kernel.org/doc/man-pages/online/pages/man7/feature_test_macros.7.html>
 
14
# For info about _FORTIFY_SOURCE, see feature_test_macros(7)
12
15
# and <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>.
13
16
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC
14
17
LINK_FORTIFY_LD=-z relro -z now
20
23
LINK_FORTIFY += -pie
21
24
endif
22
25
#COVERAGE=--coverage
23
 
OPTIMIZE=-Os
24
 
LANGUAGE=-std=gnu99
 
26
OPTIMIZE=-Os -fno-strict-aliasing
 
27
LANGUAGE=-std=gnu11
25
28
htmldir=man
26
 
version=1.4.1
 
29
version=1.6.9
27
30
SED=sed
28
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)))
 
34
 
29
35
## Use these settings for a traditional /usr/local install
30
36
# PREFIX=$(DESTDIR)/usr/local
31
37
# CONFDIR=$(DESTDIR)/etc/mandos
32
38
# KEYDIR=$(DESTDIR)/etc/mandos/keys
33
39
# MANDIR=$(PREFIX)/man
34
40
# INITRAMFSTOOLS=$(DESTDIR)/etc/initramfs-tools
 
41
# STATEDIR=$(DESTDIR)/var/lib/mandos
 
42
# LIBDIR=$(PREFIX)/lib
35
43
##
36
44
 
37
45
## These settings are for a package-type install
40
48
KEYDIR=$(DESTDIR)/etc/keys/mandos
41
49
MANDIR=$(PREFIX)/share/man
42
50
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
 
51
STATEDIR=$(DESTDIR)/var/lib/mandos
 
52
LIBDIR=$(shell \
 
53
        for d in \
 
54
        "/usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null`" \
 
55
        "`rpm --eval='%{_libdir}' 2>/dev/null`" /usr/lib; do \
 
56
                if [ -d "$$d" -a "$$d" = "$${d%/}" ]; then \
 
57
                        echo "$(DESTDIR)$$d"; \
 
58
                        break; \
 
59
                fi; \
 
60
        done)
43
61
##
44
62
 
 
63
SYSTEMD=$(DESTDIR)$(shell pkg-config systemd --variable=systemdsystemunitdir)
 
64
 
45
65
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
46
66
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
47
67
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
49
69
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
50
70
GPGME_LIBS=$(shell gpgme-config --libs; getconf LFS_LIBS; \
51
71
        getconf LFS_LDFLAGS)
 
72
LIBNL3_CFLAGS=$(shell pkg-config --cflags-only-I libnl-route-3.0)
 
73
LIBNL3_LIBS=$(shell pkg-config --libs libnl-route-3.0)
52
74
 
53
75
# Do not change these two
54
 
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
 
76
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
55
77
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
56
78
        -DVERSION='"$(version)"'
57
 
LDFLAGS=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
 
79
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
58
80
 
59
81
# Commands to format a DocBook <refentry> document into a manual page
60
82
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
63
85
        --param make.single.year.ranges         1 \
64
86
        --param man.output.quietly              1 \
65
87
        --param man.authors.section.enabled     0 \
66
 
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
 
88
        /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
67
89
        $(notdir $<); \
68
 
        $(MANPOST) $(notdir $@);\
69
 
        LANG=en_US.UTF-8 MANWIDTH=80 man --warnings --encoding=UTF-8 \
70
 
        --local-file $(notdir $@) >/dev/null)
71
 
# DocBook-to-man post-processing to fix a '\n' escape bug
72
 
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
 
90
        if locale --all 2>/dev/null | grep --regexp='^en_US\.utf8$$' \
 
91
        && type man 2>/dev/null; then LANG=en_US.UTF-8 MANWIDTH=80 \
 
92
        man --warnings --encoding=UTF-8 --local-file $(notdir $@); \
 
93
        fi >/dev/null)
73
94
 
74
95
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
75
96
        --param make.year.ranges                1 \
87
108
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
88
109
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
89
110
        plugins.d/plymouth
90
 
CPROGS=plugin-runner $(PLUGINS)
 
111
PLUGIN_HELPERS=plugin-helpers/mandos-client-iprouteadddel
 
112
CPROGS=plugin-runner $(PLUGINS) $(PLUGIN_HELPERS)
91
113
PROGS=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
92
114
DOCS=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
93
115
        mandos.conf.5 mandos-clients.conf.5 plugin-runner.8mandos \
220
242
        $(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
221
243
                ) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
222
244
 
223
 
.PHONY : all doc html clean distclean run-client run-server install \
224
 
        install-server install-client uninstall uninstall-server \
225
 
        uninstall-client purge purge-server purge-client
 
245
plugin-helpers/mandos-client-iprouteadddel: plugin-helpers/mandos-client-iprouteadddel.c
 
246
        $(LINK.c) $(LIBNL3_CFLAGS) $^ $(LIBNL3_LIBS) $(strip\
 
247
                ) $(LOADLIBES) $(LDLIBS) -o $@
 
248
 
 
249
.PHONY : all doc html clean distclean mostlyclean maintainer-clean \
 
250
        check run-client run-server install install-html \
 
251
        install-server install-client-nokey install-client uninstall \
 
252
        uninstall-server uninstall-client purge purge-server \
 
253
        purge-client
226
254
 
227
255
clean:
228
256
        -rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
230
258
distclean: clean
231
259
mostlyclean: clean
232
260
maintainer-clean: clean
233
 
        -rm --force --recursive keydir confdir
 
261
        -rm --force --recursive keydir confdir statedir
234
262
 
235
263
check:  all
236
264
        ./mandos --check
 
265
        ./mandos-ctl --check
237
266
 
238
267
# Run the client with a local config and key
239
268
run-client: all keydir/seckey.txt keydir/pubkey.txt
242
271
        @echo "# ignored.  The messages are caused by not running as root, but   #"
243
272
        @echo "# you should NOT run \"make run-client\" as root unless you also    #"
244
273
        @echo "# unpacked and compiled Mandos as root, which is NOT recommended. #"
245
 
        @echo "# From plugin-runner: setuid: Operation not permitted             #"
 
274
        @echo "# From plugin-runner: setgid: Operation not permitted             #"
 
275
        @echo "#                     setuid: Operation not permitted             #"
246
276
        @echo "# From askpass-fifo:  mkfifo: Permission denied                   #"
247
 
        @echo "# From mandos-client: setuid: Operation not permitted             #"
248
 
        @echo "#                     seteuid: Operation not permitted            #"
249
 
        @echo "#                     klogctl: Operation not permitted            #"
 
277
        @echo "# From mandos-client:                                             #"
 
278
        @echo "#             Failed to raise privileges: Operation not permitted #"
 
279
        @echo "#             Warning: network hook \"*\" exited with status *      #"
250
280
        @echo "###################################################################"
 
281
# We set GNOME_KEYRING_CONTROL to block pam_gnome_keyring
251
282
        ./plugin-runner --plugin-dir=plugins.d \
 
283
                --plugin-helper-dir=plugin-helpers \
252
284
                --config-file=plugin-runner.conf \
253
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
 
285
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--network-hook-dir=network-hooks.d \
 
286
                --env-for=mandos-client:GNOME_KEYRING_CONTROL= \
254
287
                $(CLIENTARGS)
255
288
 
256
289
# Used by run-client
259
292
        ./mandos-keygen --dir keydir --force
260
293
 
261
294
# Run the server with a local config
262
 
run-server: confdir/mandos.conf confdir/clients.conf
263
 
        ./mandos --debug --no-dbus --configdir=confdir --no-restore \
264
 
        $(SERVERARGS)
 
295
run-server: confdir/mandos.conf confdir/clients.conf statedir
 
296
        ./mandos --debug --no-dbus --configdir=confdir \
 
297
                --statedir=statedir $(SERVERARGS)
265
298
 
266
299
# Used by run-server
267
300
confdir/mandos.conf: mandos.conf
271
304
        install --directory confdir
272
305
        install --mode=u=rw $< $@
273
306
# Add a client password
274
 
        ./mandos-keygen --dir keydir --password >> $@
 
307
        ./mandos-keygen --dir keydir --password --no-ssh >> $@
 
308
statedir:
 
309
        install --directory statedir
275
310
 
276
311
install: install-server install-client-nokey
277
312
 
282
317
 
283
318
install-server: doc
284
319
        install --directory $(CONFDIR)
 
320
        if install --directory --mode=u=rwx --owner=$(USER) \
 
321
                --group=$(GROUP) $(STATEDIR); then \
 
322
                :; \
 
323
        elif install --directory --mode=u=rwx $(STATEDIR); then \
 
324
                chown -- $(USER):$(GROUP) $(STATEDIR) || :; \
 
325
        fi
285
326
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
286
327
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
287
328
                mandos-ctl
295
336
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
296
337
        install --mode=u=rwx,go=rx init.d-mandos \
297
338
                $(DESTDIR)/etc/init.d/mandos
 
339
        if [ "$(SYSTEMD)" != "$(DESTDIR)" -a -d "$(SYSTEMD)" ]; then \
 
340
                install --mode=u=rw,go=r mandos.service $(SYSTEMD); \
 
341
        fi
298
342
        install --mode=u=rw,go=r default-mandos \
299
343
                $(DESTDIR)/etc/default/mandos
300
344
        if [ -z $(DESTDIR) ]; then \
310
354
                > $(MANDIR)/man5/mandos.conf.5.gz
311
355
        gzip --best --to-stdout mandos-clients.conf.5 \
312
356
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
 
357
        gzip --best --to-stdout intro.8mandos \
 
358
                > $(MANDIR)/man8/intro.8mandos.gz
313
359
 
314
360
install-client-nokey: all doc
315
 
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
 
361
        install --directory $(LIBDIR)/mandos $(CONFDIR)
316
362
        install --directory --mode=u=rwx $(KEYDIR) \
317
 
                $(PREFIX)/lib/mandos/plugins.d
318
 
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
 
363
                $(LIBDIR)/mandos/plugins.d \
 
364
                $(LIBDIR)/mandos/plugin-helpers
 
365
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
319
366
                install --mode=u=rwx \
320
367
                        --directory "$(CONFDIR)/plugins.d"; \
 
368
                install --directory "$(CONFDIR)/plugin-helpers"; \
321
369
        fi
 
370
        install --mode=u=rwx,go=rx --directory \
 
371
                "$(CONFDIR)/network-hooks.d"
322
372
        install --mode=u=rwx,go=rx \
323
 
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
 
373
                --target-directory=$(LIBDIR)/mandos plugin-runner
324
374
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
325
375
                mandos-keygen
326
376
        install --mode=u=rwx,go=rx \
327
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
377
                --target-directory=$(LIBDIR)/mandos/plugins.d \
328
378
                plugins.d/password-prompt
329
379
        install --mode=u=rwxs,go=rx \
330
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
380
                --target-directory=$(LIBDIR)/mandos/plugins.d \
331
381
                plugins.d/mandos-client
332
382
        install --mode=u=rwxs,go=rx \
333
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
383
                --target-directory=$(LIBDIR)/mandos/plugins.d \
334
384
                plugins.d/usplash
335
385
        install --mode=u=rwxs,go=rx \
336
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
386
                --target-directory=$(LIBDIR)/mandos/plugins.d \
337
387
                plugins.d/splashy
338
388
        install --mode=u=rwxs,go=rx \
339
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
389
                --target-directory=$(LIBDIR)/mandos/plugins.d \
340
390
                plugins.d/askpass-fifo
341
391
        install --mode=u=rwxs,go=rx \
342
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
392
                --target-directory=$(LIBDIR)/mandos/plugins.d \
343
393
                plugins.d/plymouth
 
394
        install --mode=u=rwxs,go=rx \
 
395
                --target-directory=$(LIBDIR)/mandos/plugin-helpers \
 
396
                plugin-helpers/mandos-client-iprouteadddel
344
397
        install initramfs-tools-hook \
345
398
                $(INITRAMFSTOOLS)/hooks/mandos
346
399
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
391
444
        ! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
392
445
                $(DESTDIR)/etc/crypttab
393
446
        -rm --force $(PREFIX)/sbin/mandos-keygen \
394
 
                $(PREFIX)/lib/mandos/plugin-runner \
395
 
                $(PREFIX)/lib/mandos/plugins.d/password-prompt \
396
 
                $(PREFIX)/lib/mandos/plugins.d/mandos-client \
397
 
                $(PREFIX)/lib/mandos/plugins.d/usplash \
398
 
                $(PREFIX)/lib/mandos/plugins.d/splashy \
399
 
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
400
 
                $(PREFIX)/lib/mandos/plugins.d/plymouth \
 
447
                $(LIBDIR)/mandos/plugin-runner \
 
448
                $(LIBDIR)/mandos/plugins.d/password-prompt \
 
449
                $(LIBDIR)/mandos/plugins.d/mandos-client \
 
450
                $(LIBDIR)/mandos/plugins.d/usplash \
 
451
                $(LIBDIR)/mandos/plugins.d/splashy \
 
452
                $(LIBDIR)/mandos/plugins.d/askpass-fifo \
 
453
                $(LIBDIR)/mandos/plugins.d/plymouth \
401
454
                $(INITRAMFSTOOLS)/hooks/mandos \
402
455
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
403
456
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
409
462
                $(MANDIR)/man8/splashy.8mandos.gz \
410
463
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
411
464
                $(MANDIR)/man8/plymouth.8mandos.gz \
412
 
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
413
 
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
 
465
        -rmdir $(LIBDIR)/mandos/plugins.d $(CONFDIR)/plugins.d \
 
466
                 $(LIBDIR)/mandos $(CONFDIR) $(KEYDIR)
414
467
        update-initramfs -k all -u
415
468
 
416
469
purge: purge-server purge-client
420
473
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
421
474
                $(DESTDIR)/etc/default/mandos \
422
475
                $(DESTDIR)/etc/init.d/mandos \
 
476
                $(SYSTEMD)/mandos.service \
 
477
                $(DESTDIR)/run/mandos.pid \
423
478
                $(DESTDIR)/var/run/mandos.pid
424
479
        -rmdir $(CONFDIR)
425
480