/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: 2014-03-10 06:55:54 UTC
  • Revision ID: teddy@recompile.se-20140310065554-of3kz8jdhlll42l3
Use "struct sockaddr_storage" instead of a union in mandos-client.

Apparently using struct sockaddr_storage the way POSIX intended is
incompatible with strict aliasing, so turn that off in the Makefile.

* plugins.d/mandos-client.c (start_mandos_communication): Change "to"
                                                          from a union
                                                          to a struct
                                                          sockaddr_storage.
* Makefile (OPTIMIZE): Add "-fno-strict-aliasing".

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
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 \
 
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 \
6
4
        -Wunsafe-loop-optimizations -Wpointer-arith \
7
5
        -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings \
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
13
 
#DEBUG:=-ggdb3 -fsanitize=address 
 
6
        -Wconversion -Wstrict-prototypes -Wold-style-definition \
 
7
        -Wpacked -Wnested-externs -Winline -Wvolatile-register-var \
 
8
        -Wunreachable-code
 
9
#DEBUG=-ggdb3
14
10
# For info about _FORTIFY_SOURCE, see feature_test_macros(7)
15
 
# and <https://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>.
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=leak -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
 
LINK_FORTIFY_LD:=-z relro -z now
32
 
LINK_FORTIFY:=
 
11
# and <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>.
 
12
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC
 
13
LINK_FORTIFY_LD=-z relro -z now
 
14
LINK_FORTIFY=
33
15
 
34
16
# If BROKEN_PIE is set, do not build with -pie
35
17
ifndef BROKEN_PIE
37
19
LINK_FORTIFY += -pie
38
20
endif
39
21
#COVERAGE=--coverage
40
 
OPTIMIZE:=-Os -fno-strict-aliasing
41
 
LANGUAGE:=-std=gnu11
42
 
htmldir:=man
43
 
version:=1.8.4
44
 
SED:=sed
 
22
OPTIMIZE=-Os -fno-strict-aliasing
 
23
LANGUAGE=-std=gnu99
 
24
htmldir=man
 
25
version=1.6.4
 
26
SED=sed
45
27
 
46
 
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)))
 
28
USER=$(firstword $(subst :, ,$(shell getent passwd _mandos || getent passwd nobody || echo 65534)))
 
29
GROUP=$(firstword $(subst :, ,$(shell getent group _mandos || getent group nobody || echo 65534)))
48
30
 
49
31
## Use these settings for a traditional /usr/local install
50
 
# PREFIX:=$(DESTDIR)/usr/local
51
 
# CONFDIR:=$(DESTDIR)/etc/mandos
52
 
# KEYDIR:=$(DESTDIR)/etc/mandos/keys
53
 
# MANDIR:=$(PREFIX)/man
54
 
# INITRAMFSTOOLS:=$(DESTDIR)/etc/initramfs-tools
55
 
# STATEDIR:=$(DESTDIR)/var/lib/mandos
56
 
# LIBDIR:=$(PREFIX)/lib
 
32
# PREFIX=$(DESTDIR)/usr/local
 
33
# CONFDIR=$(DESTDIR)/etc/mandos
 
34
# KEYDIR=$(DESTDIR)/etc/mandos/keys
 
35
# MANDIR=$(PREFIX)/man
 
36
# INITRAMFSTOOLS=$(DESTDIR)/etc/initramfs-tools
 
37
# STATEDIR=$(DESTDIR)/var/lib/mandos
 
38
# LIBDIR=$(PREFIX)/lib
57
39
##
58
40
 
59
41
## These settings are for a package-type install
60
 
PREFIX:=$(DESTDIR)/usr
61
 
CONFDIR:=$(DESTDIR)/etc/mandos
62
 
KEYDIR:=$(DESTDIR)/etc/keys/mandos
63
 
MANDIR:=$(PREFIX)/share/man
64
 
INITRAMFSTOOLS:=$(DESTDIR)/usr/share/initramfs-tools
65
 
STATEDIR:=$(DESTDIR)/var/lib/mandos
66
 
LIBDIR:=$(shell \
 
42
PREFIX=$(DESTDIR)/usr
 
43
CONFDIR=$(DESTDIR)/etc/mandos
 
44
KEYDIR=$(DESTDIR)/etc/keys/mandos
 
45
MANDIR=$(PREFIX)/share/man
 
46
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
 
47
STATEDIR=$(DESTDIR)/var/lib/mandos
 
48
LIBDIR=$(shell \
67
49
        for d in \
68
50
        "/usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null`" \
69
51
        "`rpm --eval='%{_libdir}' 2>/dev/null`" /usr/lib; do \
74
56
        done)
75
57
##
76
58
 
77
 
SYSTEMD:=$(DESTDIR)$(shell pkg-config systemd --variable=systemdsystemunitdir)
78
 
TMPFILES:=$(DESTDIR)$(shell pkg-config systemd --variable=tmpfilesdir)
 
59
SYSTEMD=$(DESTDIR)$(shell pkg-config systemd --variable=systemdsystemunitdir)
79
60
 
80
 
GNUTLS_CFLAGS:=$(shell pkg-config --cflags-only-I gnutls)
81
 
GNUTLS_LIBS:=$(shell pkg-config --libs gnutls)
82
 
AVAHI_CFLAGS:=$(shell pkg-config --cflags-only-I avahi-core)
83
 
AVAHI_LIBS:=$(shell pkg-config --libs avahi-core)
84
 
GPGME_CFLAGS:=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
85
 
GPGME_LIBS:=$(shell gpgme-config --libs; getconf LFS_LIBS; \
 
61
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
 
62
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
 
63
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
 
64
AVAHI_LIBS=$(shell pkg-config --libs avahi-core)
 
65
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
 
66
GPGME_LIBS=$(shell gpgme-config --libs; getconf LFS_LIBS; \
86
67
        getconf LFS_LDFLAGS)
87
 
LIBNL3_CFLAGS:=$(shell pkg-config --cflags-only-I libnl-route-3.0)
88
 
LIBNL3_LIBS:=$(shell pkg-config --libs libnl-route-3.0)
89
68
 
90
69
# Do not change these two
91
 
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(SANITIZE) $(COVERAGE) \
92
 
        $(OPTIMIZE) $(LANGUAGE) -DVERSION='"$(version)"'
 
70
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
 
71
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
 
72
        -DVERSION='"$(version)"'
93
73
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
94
74
 
95
75
# Commands to format a DocBook <refentry> document into a manual page
101
81
        --param man.authors.section.enabled     0 \
102
82
        /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
103
83
        $(notdir $<); \
 
84
        $(MANPOST) $(notdir $@);\
104
85
        if locale --all 2>/dev/null | grep --regexp='^en_US\.utf8$$' \
105
86
        && type man 2>/dev/null; then LANG=en_US.UTF-8 MANWIDTH=80 \
106
87
        man --warnings --encoding=UTF-8 --local-file $(notdir $@); \
107
88
        fi >/dev/null)
 
89
# DocBook-to-man post-processing to fix a '\n' escape bug
 
90
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
108
91
 
109
92
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
110
93
        --param make.year.ranges                1 \
116
99
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
117
100
        $<; $(HTMLPOST) $@)
118
101
# Fix citerefentry links
119
 
HTMLPOST:=$(SED) --in-place \
 
102
HTMLPOST=$(SED) --in-place \
120
103
        --expression='s/\(<a class="citerefentry" href="\)\("><span class="citerefentry"><span class="refentrytitle">\)\([^<]*\)\(<\/span>(\)\([^)]*\)\()<\/span><\/a>\)/\1\3.\5\2\3\4\5\6/g'
121
104
 
122
 
PLUGINS:=plugins.d/password-prompt plugins.d/mandos-client \
 
105
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
123
106
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
124
107
        plugins.d/plymouth
125
 
PLUGIN_HELPERS:=plugin-helpers/mandos-client-iprouteadddel
126
 
CPROGS:=plugin-runner $(PLUGINS) $(PLUGIN_HELPERS)
127
 
PROGS:=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
128
 
DOCS:=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
 
108
CPROGS=plugin-runner $(PLUGINS)
 
109
PROGS=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
 
110
DOCS=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
129
111
        mandos.conf.5 mandos-clients.conf.5 plugin-runner.8mandos \
130
112
        plugins.d/mandos-client.8mandos \
131
113
        plugins.d/password-prompt.8mandos plugins.d/usplash.8mandos \
132
114
        plugins.d/splashy.8mandos plugins.d/askpass-fifo.8mandos \
133
115
        plugins.d/plymouth.8mandos intro.8mandos
134
116
 
135
 
htmldocs:=$(addsuffix .xhtml,$(DOCS))
 
117
htmldocs=$(addsuffix .xhtml,$(DOCS))
136
118
 
137
 
objects:=$(addsuffix .o,$(CPROGS))
 
119
objects=$(addsuffix .o,$(CPROGS))
138
120
 
139
121
all: $(PROGS) mandos.lsm
140
122
 
252
234
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
253
235
                $@)
254
236
 
255
 
# Need to add the GnuTLS, Avahi and GPGME libraries, and can't use
256
 
# -fsanitize=leak because GnuTLS and GPGME both leak memory.
257
237
plugins.d/mandos-client: plugins.d/mandos-client.c
258
 
        $(CC) $(filter-out -fsanitize=leak,$(CFLAGS)) $(strip\
259
 
        ) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) $(strip\
260
 
                ) $(CPPFLAGS) $(LDFLAGS) $(TARGET_ARCH) $^ $(strip\
261
 
                ) -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
 
238
        $(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
262
239
                ) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
263
240
 
264
 
plugin-helpers/mandos-client-iprouteadddel: plugin-helpers/mandos-client-iprouteadddel.c
265
 
        $(LINK.c) $(LIBNL3_CFLAGS) $^ $(LIBNL3_LIBS) $(strip\
266
 
                ) $(LOADLIBES) $(LDLIBS) -o $@
267
 
 
268
241
.PHONY : all doc html clean distclean mostlyclean maintainer-clean \
269
242
        check run-client run-server install install-html \
270
243
        install-server install-client-nokey install-client uninstall \
284
257
        ./mandos-ctl --check
285
258
 
286
259
# Run the client with a local config and key
287
 
run-client: all keydir/seckey.txt keydir/pubkey.txt keydir/tls-privkey.pem keydir/tls-pubkey.pem
 
260
run-client: all keydir/seckey.txt keydir/pubkey.txt
288
261
        @echo "###################################################################"
289
262
        @echo "# The following error messages are harmless and can be safely     #"
290
 
        @echo "# ignored:                                                        #"
291
 
        @echo "# From plugin-runner: setgid: Operation not permitted             #"
292
 
        @echo "#                     setuid: Operation not permitted             #"
 
263
        @echo "# ignored.  The messages are caused by not running as root, but   #"
 
264
        @echo "# you should NOT run \"make run-client\" as root unless you also    #"
 
265
        @echo "# unpacked and compiled Mandos as root, which is NOT recommended. #"
 
266
        @echo "# From plugin-runner: setuid: Operation not permitted             #"
293
267
        @echo "# From askpass-fifo:  mkfifo: Permission denied                   #"
294
 
        @echo "# From mandos-client:                                             #"
295
 
        @echo "#             Failed to raise privileges: Operation not permitted #"
296
 
        @echo "#             Warning: network hook \"*\" exited with status *      #"
297
 
        @echo "#                                                                 #"
298
 
        @echo "# (The messages are caused by not running as root, but you should #"
299
 
        @echo "# NOT run \"make run-client\" as root unless you also unpacked and  #"
300
 
        @echo "# compiled Mandos as root, which is also NOT recommended.)        #"
 
268
        @echo "# From mandos-client: setuid: Operation not permitted             #"
 
269
        @echo "#                     seteuid: Operation not permitted            #"
 
270
        @echo "#                     klogctl: Operation not permitted            #"
301
271
        @echo "###################################################################"
302
 
# We set GNOME_KEYRING_CONTROL to block pam_gnome_keyring
303
272
        ./plugin-runner --plugin-dir=plugins.d \
304
 
                --plugin-helper-dir=plugin-helpers \
305
273
                --config-file=plugin-runner.conf \
306
 
                --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 \
307
 
                --env-for=mandos-client:GNOME_KEYRING_CONTROL= \
 
274
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--network-hook-dir=network-hooks.d \
308
275
                $(CLIENTARGS)
309
276
 
310
277
# Used by run-client
311
 
keydir/seckey.txt keydir/pubkey.txt keydir/tls-privkey.pem keydir/tls-pubkey.pem: mandos-keygen
 
278
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
312
279
        install --directory keydir
313
280
        ./mandos-keygen --dir keydir --force
314
281
 
321
288
confdir/mandos.conf: mandos.conf
322
289
        install --directory confdir
323
290
        install --mode=u=rw,go=r $^ $@
324
 
confdir/clients.conf: clients.conf keydir/seckey.txt keydir/tls-pubkey.pem
 
291
confdir/clients.conf: clients.conf keydir/seckey.txt
325
292
        install --directory confdir
326
293
        install --mode=u=rw $< $@
327
294
# Add a client password
328
 
        ./mandos-keygen --dir keydir --password --no-ssh >> $@
 
295
        ./mandos-keygen --dir keydir --password >> $@
329
296
statedir:
330
297
        install --directory statedir
331
298
 
344
311
        elif install --directory --mode=u=rwx $(STATEDIR); then \
345
312
                chown -- $(USER):$(GROUP) $(STATEDIR) || :; \
346
313
        fi
347
 
        if [ "$(TMPFILES)" != "$(DESTDIR)" -a -d "$(TMPFILES)" ]; then \
348
 
                install --mode=u=rw,go=r tmpfiles.d-mandos.conf \
349
 
                        $(TMPFILES)/mandos.conf; \
350
 
        fi
351
314
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
352
315
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
353
316
                mandos-ctl
385
348
install-client-nokey: all doc
386
349
        install --directory $(LIBDIR)/mandos $(CONFDIR)
387
350
        install --directory --mode=u=rwx $(KEYDIR) \
388
 
                $(LIBDIR)/mandos/plugins.d \
389
 
                $(LIBDIR)/mandos/plugin-helpers
 
351
                $(LIBDIR)/mandos/plugins.d
390
352
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
391
353
                install --mode=u=rwx \
392
 
                        --directory "$(CONFDIR)/plugins.d" \
393
 
                        "$(CONFDIR)/plugin-helpers"; \
 
354
                        --directory "$(CONFDIR)/plugins.d"; \
394
355
        fi
395
356
        install --mode=u=rwx,go=rx --directory \
396
357
                "$(CONFDIR)/network-hooks.d"
397
358
        install --mode=u=rwx,go=rx \
398
359
                --target-directory=$(LIBDIR)/mandos plugin-runner
399
 
        install --mode=u=rwx,go=rx \
400
 
                --target-directory=$(LIBDIR)/mandos mandos-to-cryptroot-unlock
401
360
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
402
361
                mandos-keygen
403
362
        install --mode=u=rwx,go=rx \
418
377
        install --mode=u=rwxs,go=rx \
419
378
                --target-directory=$(LIBDIR)/mandos/plugins.d \
420
379
                plugins.d/plymouth
421
 
        install --mode=u=rwx,go=rx \
422
 
                --target-directory=$(LIBDIR)/mandos/plugin-helpers \
423
 
                plugin-helpers/mandos-client-iprouteadddel
424
380
        install initramfs-tools-hook \
425
381
                $(INITRAMFSTOOLS)/hooks/mandos
426
 
        install --mode=u=rw,go=r initramfs-tools-conf \
427
 
                $(INITRAMFSTOOLS)/conf.d/mandos-conf
428
 
        install --mode=u=rw,go=r initramfs-tools-conf-hook \
429
 
                $(INITRAMFSTOOLS)/conf-hooks.d/zz-mandos
 
382
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
 
383
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
430
384
        install initramfs-tools-script \
431
385
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
432
 
        install initramfs-tools-script-stop \
433
 
                $(INITRAMFSTOOLS)/scripts/local-premount/mandos
434
386
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
435
387
        gzip --best --to-stdout mandos-keygen.8 \
436
388
                > $(MANDIR)/man8/mandos-keygen.8.gz
510
462
        -rmdir $(CONFDIR)
511
463
 
512
464
purge-client: uninstall-client
513
 
        -shred --remove $(KEYDIR)/seckey.txt $(KEYDIR)/tls-privkey.pem
 
465
        -shred --remove $(KEYDIR)/seckey.txt
514
466
        -rm --force $(CONFDIR)/plugin-runner.conf \
515
 
                $(KEYDIR)/pubkey.txt $(KEYDIR)/seckey.txt \
516
 
                $(KEYDIR)/tls-pubkey.txt $(KEYDIR)/tls-privkey.txt
 
467
                $(KEYDIR)/pubkey.txt $(KEYDIR)/seckey.txt
517
468
        -rmdir $(KEYDIR) $(CONFDIR)/plugins.d $(CONFDIR)