/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: 2016-02-28 10:59:18 UTC
  • Revision ID: teddy@recompile.se-20160228105918-tb8pt2p5j0tkcls3
Handle GnuTLS errors and partial sends in gnutls "module".

* mandos (GnuTLS.E_INTERRUPTED, GnuTLS.E_AGAIN): New.
  (GnuTLS.Error): Set error code as "code" attribute.
  (GnuTLS.ClientSession.send): Handle partial sends with a loop.
  (GnuTLS._retry_on_error): New function.
  (GnuTLS.record_send, GnuTLS.handshake, GnuTLS.bye): Set "errcheck"
                                                      attribute to
                                                    "_retry_on_error".
  (ClientHandler.handle): Remove loop for handling partial sends;
                          GnuTLS.ClientSession.send() will do that.

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)))
 
13
#DEBUG=-ggdb3
 
14
# For info about _FORTIFY_SOURCE, see feature_test_macros(7)
 
15
# and <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>.
 
16
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC
19
17
# <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
 
 
30
 
# 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:=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC
33
 
LINK_FORTIFY_LD:=-z relro -z now
34
 
LINK_FORTIFY:=
 
18
# The sanitizing options are available in GCC 4.9 and above.
 
19
ifeq ($(shell test $(shell $(CC) -dumpversion) \> 4.9-; echo $$?),0)
 
20
SANITIZE:=-fsanitize=address -fsanitize=undefined -fsanitize=shift \
 
21
        -fsanitize=integer-divide-by-zero -fsanitize=unreachable \
 
22
        -fsanitize=vla-bound -fsanitize=null -fsanitize=return \
 
23
        -fsanitize=signed-integer-overflow
 
24
# GCC 5.3 has some more sanitizing options
 
25
ifeq ($(shell test $(shell $(CC) -dumpversion) \> 5.3-; echo $$?),0)
 
26
SANITIZE+=-fsanitize=bounds -fsanitize=alignment \
 
27
        -fsanitize=object-size -fsanitize=float-divide-by-zero \
 
28
        -fsanitize=float-cast-overflow -fsanitize=nonnull-attribute \
 
29
        -fsanitize=returns-nonnull-attribute -fsanitize=bool \
 
30
        -fsanitize=enum
 
31
endif
 
32
else
 
33
SANITIZE:=
 
34
endif
 
35
LINK_FORTIFY_LD=-z relro -z now
 
36
LINK_FORTIFY=
35
37
 
36
38
# If BROKEN_PIE is set, do not build with -pie
37
39
ifndef BROKEN_PIE
39
41
LINK_FORTIFY += -pie
40
42
endif
41
43
#COVERAGE=--coverage
42
 
OPTIMIZE:=-Os -fno-strict-aliasing
43
 
LANGUAGE:=-std=gnu11
44
 
htmldir:=man
45
 
version:=1.8.4
46
 
SED:=sed
 
44
OPTIMIZE=-Os -fno-strict-aliasing
 
45
LANGUAGE=-std=gnu11
 
46
htmldir=man
 
47
version=1.7.1
 
48
SED=sed
47
49
 
48
 
USER:=$(firstword $(subst :, ,$(shell getent passwd _mandos \
49
 
        || getent passwd nobody || echo 65534)))
50
 
GROUP:=$(firstword $(subst :, ,$(shell getent group _mandos \
51
 
        || getent group nogroup || echo 65534)))
 
50
USER=$(firstword $(subst :, ,$(shell getent passwd _mandos || getent passwd nobody || echo 65534)))
 
51
GROUP=$(firstword $(subst :, ,$(shell getent group _mandos || getent group nobody || echo 65534)))
52
52
 
53
53
## Use these settings for a traditional /usr/local install
54
 
# PREFIX:=$(DESTDIR)/usr/local
55
 
# CONFDIR:=$(DESTDIR)/etc/mandos
56
 
# KEYDIR:=$(DESTDIR)/etc/mandos/keys
57
 
# MANDIR:=$(PREFIX)/man
58
 
# INITRAMFSTOOLS:=$(DESTDIR)/etc/initramfs-tools
59
 
# STATEDIR:=$(DESTDIR)/var/lib/mandos
60
 
# LIBDIR:=$(PREFIX)/lib
 
54
# PREFIX=$(DESTDIR)/usr/local
 
55
# CONFDIR=$(DESTDIR)/etc/mandos
 
56
# KEYDIR=$(DESTDIR)/etc/mandos/keys
 
57
# MANDIR=$(PREFIX)/man
 
58
# INITRAMFSTOOLS=$(DESTDIR)/etc/initramfs-tools
 
59
# STATEDIR=$(DESTDIR)/var/lib/mandos
 
60
# LIBDIR=$(PREFIX)/lib
61
61
##
62
62
 
63
63
## These settings are for a package-type install
64
 
PREFIX:=$(DESTDIR)/usr
65
 
CONFDIR:=$(DESTDIR)/etc/mandos
66
 
KEYDIR:=$(DESTDIR)/etc/keys/mandos
67
 
MANDIR:=$(PREFIX)/share/man
68
 
INITRAMFSTOOLS:=$(DESTDIR)/usr/share/initramfs-tools
69
 
STATEDIR:=$(DESTDIR)/var/lib/mandos
70
 
LIBDIR:=$(shell \
 
64
PREFIX=$(DESTDIR)/usr
 
65
CONFDIR=$(DESTDIR)/etc/mandos
 
66
KEYDIR=$(DESTDIR)/etc/keys/mandos
 
67
MANDIR=$(PREFIX)/share/man
 
68
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
 
69
STATEDIR=$(DESTDIR)/var/lib/mandos
 
70
LIBDIR=$(shell \
71
71
        for d in \
72
72
        "/usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null`" \
73
73
        "`rpm --eval='%{_libdir}' 2>/dev/null`" /usr/lib; do \
78
78
        done)
79
79
##
80
80
 
81
 
SYSTEMD:=$(DESTDIR)$(shell pkg-config systemd --variable=systemdsystemunitdir)
82
 
TMPFILES:=$(DESTDIR)$(shell pkg-config systemd --variable=tmpfilesdir)
 
81
SYSTEMD=$(DESTDIR)$(shell pkg-config systemd --variable=systemdsystemunitdir)
83
82
 
84
 
GNUTLS_CFLAGS:=$(shell pkg-config --cflags-only-I gnutls)
85
 
GNUTLS_LIBS:=$(shell pkg-config --libs gnutls)
86
 
AVAHI_CFLAGS:=$(shell pkg-config --cflags-only-I avahi-core)
87
 
AVAHI_LIBS:=$(shell pkg-config --libs avahi-core)
88
 
GPGME_CFLAGS:=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
89
 
GPGME_LIBS:=$(shell gpgme-config --libs; getconf LFS_LIBS; \
 
83
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
 
84
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
 
85
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
 
86
AVAHI_LIBS=$(shell pkg-config --libs avahi-core)
 
87
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
 
88
GPGME_LIBS=$(shell gpgme-config --libs; getconf LFS_LIBS; \
90
89
        getconf LFS_LDFLAGS)
91
 
LIBNL3_CFLAGS:=$(shell pkg-config --cflags-only-I libnl-route-3.0)
92
 
LIBNL3_LIBS:=$(shell pkg-config --libs libnl-route-3.0)
 
90
LIBNL3_CFLAGS=$(shell pkg-config --cflags-only-I libnl-route-3.0)
 
91
LIBNL3_LIBS=$(shell pkg-config --libs libnl-route-3.0)
93
92
 
94
93
# Do not change these two
95
 
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) \
96
 
        $(OPTIMIZE) $(LANGUAGE) -DVERSION='"$(version)"'
97
 
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(strip \
98
 
        ) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
 
94
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(SANITIZE) $(COVERAGE) \
 
95
        $(OPTIMIZE) $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) \
 
96
        $(GPGME_CFLAGS) -DVERSION='"$(version)"'
 
97
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
99
98
 
100
99
# Commands to format a DocBook <refentry> document into a manual page
101
100
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
107
106
        /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
108
107
        $(notdir $<); \
109
108
        if locale --all 2>/dev/null | grep --regexp='^en_US\.utf8$$' \
110
 
        && command -v man >/dev/null; then LANG=en_US.UTF-8 \
111
 
        MANWIDTH=80 man --warnings --encoding=UTF-8 --local-file \
112
 
        $(notdir $@); fi >/dev/null)
 
109
        && type man 2>/dev/null; then LANG=en_US.UTF-8 MANWIDTH=80 \
 
110
        man --warnings --encoding=UTF-8 --local-file $(notdir $@); \
 
111
        fi >/dev/null)
113
112
 
114
113
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
115
114
        --param make.year.ranges                1 \
121
120
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
122
121
        $<; $(HTMLPOST) $@)
123
122
# Fix citerefentry links
124
 
HTMLPOST:=$(SED) --in-place \
 
123
HTMLPOST=$(SED) --in-place \
125
124
        --expression='s/\(<a class="citerefentry" href="\)\("><span class="citerefentry"><span class="refentrytitle">\)\([^<]*\)\(<\/span>(\)\([^)]*\)\()<\/span><\/a>\)/\1\3.\5\2\3\4\5\6/g'
126
125
 
127
 
PLUGINS:=plugins.d/password-prompt plugins.d/mandos-client \
 
126
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
128
127
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
129
128
        plugins.d/plymouth
130
 
PLUGIN_HELPERS:=plugin-helpers/mandos-client-iprouteadddel
131
 
CPROGS:=plugin-runner $(PLUGINS) $(PLUGIN_HELPERS)
132
 
PROGS:=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
133
 
DOCS:=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
 
129
PLUGIN_HELPERS=plugin-helpers/mandos-client-iprouteadddel
 
130
CPROGS=plugin-runner $(PLUGINS) $(PLUGIN_HELPERS)
 
131
PROGS=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
 
132
DOCS=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
134
133
        mandos.conf.5 mandos-clients.conf.5 plugin-runner.8mandos \
135
134
        plugins.d/mandos-client.8mandos \
136
135
        plugins.d/password-prompt.8mandos plugins.d/usplash.8mandos \
137
136
        plugins.d/splashy.8mandos plugins.d/askpass-fifo.8mandos \
138
137
        plugins.d/plymouth.8mandos intro.8mandos
139
138
 
140
 
htmldocs:=$(addsuffix .xhtml,$(DOCS))
 
139
htmldocs=$(addsuffix .xhtml,$(DOCS))
141
140
 
142
 
objects:=$(addsuffix .o,$(CPROGS))
 
141
objects=$(addsuffix .o,$(CPROGS))
143
142
 
144
143
all: $(PROGS) mandos.lsm
145
144
 
257
256
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
258
257
                $@)
259
258
 
260
 
# Need to add the GnuTLS, Avahi and GPGME libraries
261
259
plugins.d/mandos-client: plugins.d/mandos-client.c
262
 
        $(LINK.c) $^ $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(strip\
263
 
                ) $(GPGME_CFLAGS) $(GNUTLS_LIBS) $(strip\
264
 
                ) $(AVAHI_LIBS) $(GPGME_LIBS) $(LOADLIBES) $(strip\
265
 
                ) $(LDLIBS) -o $@
 
260
        $(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
 
261
                ) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
266
262
 
267
 
# Need to add the libnl-route library
268
263
plugin-helpers/mandos-client-iprouteadddel: plugin-helpers/mandos-client-iprouteadddel.c
269
264
        $(LINK.c) $(LIBNL3_CFLAGS) $^ $(LIBNL3_LIBS) $(strip\
270
265
                ) $(LOADLIBES) $(LDLIBS) -o $@
283
278
maintainer-clean: clean
284
279
        -rm --force --recursive keydir confdir statedir
285
280
 
286
 
check: all
 
281
check:  all
287
282
        ./mandos --check
288
283
        ./mandos-ctl --check
289
 
        ./mandos-keygen --version
290
 
        ./plugin-runner --version
291
 
        ./plugin-helpers/mandos-client-iprouteadddel --version
292
284
 
293
285
# Run the client with a local config and key
294
 
run-client: all keydir/seckey.txt keydir/pubkey.txt keydir/tls-privkey.pem keydir/tls-pubkey.pem
 
286
run-client: all keydir/seckey.txt keydir/pubkey.txt
295
287
        @echo "###################################################################"
296
288
        @echo "# The following error messages are harmless and can be safely     #"
297
 
        @echo "# ignored:                                                        #"
 
289
        @echo "# ignored.  The messages are caused by not running as root, but   #"
 
290
        @echo "# you should NOT run \"make run-client\" as root unless you also    #"
 
291
        @echo "# unpacked and compiled Mandos as root, which is NOT recommended. #"
298
292
        @echo "# From plugin-runner: setgid: Operation not permitted             #"
299
293
        @echo "#                     setuid: Operation not permitted             #"
300
294
        @echo "# From askpass-fifo:  mkfifo: Permission denied                   #"
301
295
        @echo "# From mandos-client:                                             #"
302
296
        @echo "#             Failed to raise privileges: Operation not permitted #"
303
297
        @echo "#             Warning: network hook \"*\" exited with status *      #"
304
 
        @echo "#                                                                 #"
305
 
        @echo "# (The messages are caused by not running as root, but you should #"
306
 
        @echo "# NOT run \"make run-client\" as root unless you also unpacked and  #"
307
 
        @echo "# compiled Mandos as root, which is also NOT recommended.)        #"
308
298
        @echo "###################################################################"
309
299
# We set GNOME_KEYRING_CONTROL to block pam_gnome_keyring
310
300
        ./plugin-runner --plugin-dir=plugins.d \
311
301
                --plugin-helper-dir=plugin-helpers \
312
302
                --config-file=plugin-runner.conf \
313
 
                --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 \
 
303
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--network-hook-dir=network-hooks.d \
314
304
                --env-for=mandos-client:GNOME_KEYRING_CONTROL= \
315
305
                $(CLIENTARGS)
316
306
 
317
307
# Used by run-client
318
 
keydir/seckey.txt keydir/pubkey.txt keydir/tls-privkey.pem keydir/tls-pubkey.pem: mandos-keygen
 
308
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
319
309
        install --directory keydir
320
310
        ./mandos-keygen --dir keydir --force
321
311
 
328
318
confdir/mandos.conf: mandos.conf
329
319
        install --directory confdir
330
320
        install --mode=u=rw,go=r $^ $@
331
 
confdir/clients.conf: clients.conf keydir/seckey.txt keydir/tls-pubkey.pem
 
321
confdir/clients.conf: clients.conf keydir/seckey.txt
332
322
        install --directory confdir
333
323
        install --mode=u=rw $< $@
334
324
# Add a client password
351
341
        elif install --directory --mode=u=rwx $(STATEDIR); then \
352
342
                chown -- $(USER):$(GROUP) $(STATEDIR) || :; \
353
343
        fi
354
 
        if [ "$(TMPFILES)" != "$(DESTDIR)" -a -d "$(TMPFILES)" ]; then \
355
 
                install --mode=u=rw,go=r tmpfiles.d-mandos.conf \
356
 
                        $(TMPFILES)/mandos.conf; \
357
 
        fi
358
344
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
359
345
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
360
346
                mandos-ctl
396
382
                $(LIBDIR)/mandos/plugin-helpers
397
383
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
398
384
                install --mode=u=rwx \
399
 
                        --directory "$(CONFDIR)/plugins.d" \
400
 
                        "$(CONFDIR)/plugin-helpers"; \
 
385
                        --directory "$(CONFDIR)/plugins.d"; \
 
386
                install --directory "$(CONFDIR)/plugin-helpers"; \
401
387
        fi
402
388
        install --mode=u=rwx,go=rx --directory \
403
389
                "$(CONFDIR)/network-hooks.d"
404
390
        install --mode=u=rwx,go=rx \
405
391
                --target-directory=$(LIBDIR)/mandos plugin-runner
406
 
        install --mode=u=rwx,go=rx \
407
 
                --target-directory=$(LIBDIR)/mandos mandos-to-cryptroot-unlock
408
392
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
409
393
                mandos-keygen
410
394
        install --mode=u=rwx,go=rx \
425
409
        install --mode=u=rwxs,go=rx \
426
410
                --target-directory=$(LIBDIR)/mandos/plugins.d \
427
411
                plugins.d/plymouth
428
 
        install --mode=u=rwx,go=rx \
 
412
        install --mode=u=rwxs,go=rx \
429
413
                --target-directory=$(LIBDIR)/mandos/plugin-helpers \
430
414
                plugin-helpers/mandos-client-iprouteadddel
431
415
        install initramfs-tools-hook \
432
416
                $(INITRAMFSTOOLS)/hooks/mandos
433
 
        install --mode=u=rw,go=r initramfs-tools-conf \
434
 
                $(INITRAMFSTOOLS)/conf.d/mandos-conf
435
 
        install --mode=u=rw,go=r initramfs-tools-conf-hook \
436
 
                $(INITRAMFSTOOLS)/conf-hooks.d/zz-mandos
 
417
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
 
418
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
437
419
        install initramfs-tools-script \
438
420
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
439
 
        install initramfs-tools-script-stop \
440
 
                $(INITRAMFSTOOLS)/scripts/local-premount/mandos
441
421
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
442
422
        gzip --best --to-stdout mandos-keygen.8 \
443
423
                > $(MANDIR)/man8/mandos-keygen.8.gz
517
497
        -rmdir $(CONFDIR)
518
498
 
519
499
purge-client: uninstall-client
520
 
        -shred --remove $(KEYDIR)/seckey.txt $(KEYDIR)/tls-privkey.pem
 
500
        -shred --remove $(KEYDIR)/seckey.txt
521
501
        -rm --force $(CONFDIR)/plugin-runner.conf \
522
 
                $(KEYDIR)/pubkey.txt $(KEYDIR)/seckey.txt \
523
 
                $(KEYDIR)/tls-pubkey.txt $(KEYDIR)/tls-privkey.txt
 
502
                $(KEYDIR)/pubkey.txt $(KEYDIR)/seckey.txt
524
503
        -rmdir $(KEYDIR) $(CONFDIR)/plugins.d $(CONFDIR)