/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
14
14
# For info about _FORTIFY_SOURCE, see feature_test_macros(7)
15
15
# and <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>.
16
16
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC
17
 
# <https://developerblog.redhat.com/2014/10/16/gcc-undefined-behavior-sanitizer-ubsan/>
18
 
ALL_SANITIZE_OPTIONS:=-fsanitize=address -fsanitize=undefined \
19
 
        -fsanitize=shift -fsanitize=integer-divide-by-zero \
20
 
        -fsanitize=unreachable -fsanitize=vla-bound -fsanitize=null \
21
 
        -fsanitize=return -fsanitize=signed-integer-overflow \
22
 
        -fsanitize=bounds -fsanitize=alignment \
23
 
        -fsanitize=object-size -fsanitize=float-divide-by-zero \
24
 
        -fsanitize=float-cast-overflow -fsanitize=nonnull-attribute \
25
 
        -fsanitize=returns-nonnull-attribute -fsanitize=bool \
26
 
        -fsanitize=enum
27
 
# Check which sanitizing options can be used
28
 
SANITIZE:=$(foreach option,$(ALL_SANITIZE_OPTIONS),$(shell \
29
 
        echo 'int main(){}' | $(CC) --language=c $(option) /dev/stdin \
30
 
        -o /dev/null >/dev/null 2>&1 && echo $(option)))
31
17
LINK_FORTIFY_LD=-z relro -z now
32
18
LINK_FORTIFY=
33
19
 
40
26
OPTIMIZE=-Os -fno-strict-aliasing
41
27
LANGUAGE=-std=gnu11
42
28
htmldir=man
43
 
version=1.7.7
 
29
version=1.6.9
44
30
SED=sed
45
31
 
46
32
USER=$(firstword $(subst :, ,$(shell getent passwd _mandos || getent passwd nobody || echo 65534)))
47
 
GROUP=$(firstword $(subst :, ,$(shell getent group _mandos || getent group nogroup || echo 65534)))
 
33
GROUP=$(firstword $(subst :, ,$(shell getent group _mandos || getent group nobody || echo 65534)))
48
34
 
49
35
## Use these settings for a traditional /usr/local install
50
36
# PREFIX=$(DESTDIR)/usr/local
75
61
##
76
62
 
77
63
SYSTEMD=$(DESTDIR)$(shell pkg-config systemd --variable=systemdsystemunitdir)
78
 
TMPFILES=$(DESTDIR)$(shell pkg-config systemd --variable=tmpfilesdir)
79
64
 
80
65
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
81
66
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
88
73
LIBNL3_LIBS=$(shell pkg-config --libs libnl-route-3.0)
89
74
 
90
75
# Do not change these two
91
 
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(SANITIZE) $(COVERAGE) \
92
 
        $(OPTIMIZE) $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) \
93
 
        $(GPGME_CFLAGS) -DVERSION='"$(version)"'
 
76
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
 
77
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
 
78
        -DVERSION='"$(version)"'
94
79
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
95
80
 
96
81
# Commands to format a DocBook <refentry> document into a manual page
338
323
        elif install --directory --mode=u=rwx $(STATEDIR); then \
339
324
                chown -- $(USER):$(GROUP) $(STATEDIR) || :; \
340
325
        fi
341
 
        if [ "$(TMPFILES)" != "$(DESTDIR)" -a -d "$(TMPFILES)" ]; then \
342
 
                install --mode=u=rw,go=r tmpfiles.d-mandos.conf \
343
 
                        $(TMPFILES)/mandos.conf; \
344
 
        fi
345
326
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
346
327
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
347
328
                mandos-ctl
383
364
                $(LIBDIR)/mandos/plugin-helpers
384
365
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
385
366
                install --mode=u=rwx \
386
 
                        --directory "$(CONFDIR)/plugins.d" \
387
 
                        "$(CONFDIR)/plugin-helpers"; \
 
367
                        --directory "$(CONFDIR)/plugins.d"; \
 
368
                install --directory "$(CONFDIR)/plugin-helpers"; \
388
369
        fi
389
370
        install --mode=u=rwx,go=rx --directory \
390
371
                "$(CONFDIR)/network-hooks.d"
410
391
        install --mode=u=rwxs,go=rx \
411
392
                --target-directory=$(LIBDIR)/mandos/plugins.d \
412
393
                plugins.d/plymouth
413
 
        install --mode=u=rwx,go=rx \
 
394
        install --mode=u=rwxs,go=rx \
414
395
                --target-directory=$(LIBDIR)/mandos/plugin-helpers \
415
396
                plugin-helpers/mandos-client-iprouteadddel
416
397
        install initramfs-tools-hook \
436
417
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
437
418
        gzip --best --to-stdout plugins.d/plymouth.8mandos \
438
419
                > $(MANDIR)/man8/plymouth.8mandos.gz
439
 
        gzip --best --to-stdout intro.8mandos \
440
 
                > $(MANDIR)/man8/intro.8mandos.gz
441
420
 
442
421
install-client: install-client-nokey
443
422
# Post-installation stuff