/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 -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
 
17
# <https://developerblog.redhat.com/2014/10/16/gcc-undefined-behavior-sanitizer-ubsan/>
 
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
14
35
LINK_FORTIFY_LD=-z relro -z now
15
36
LINK_FORTIFY=
16
37
 
20
41
LINK_FORTIFY += -pie
21
42
endif
22
43
#COVERAGE=--coverage
23
 
OPTIMIZE=-Os
24
 
LANGUAGE=-std=gnu99
 
44
OPTIMIZE=-Os -fno-strict-aliasing
 
45
LANGUAGE=-std=gnu11
25
46
htmldir=man
26
 
version=1.6.2
 
47
version=1.7.1
27
48
SED=sed
28
49
 
29
50
USER=$(firstword $(subst :, ,$(shell getent passwd _mandos || getent passwd nobody || echo 65534)))
36
57
# MANDIR=$(PREFIX)/man
37
58
# INITRAMFSTOOLS=$(DESTDIR)/etc/initramfs-tools
38
59
# STATEDIR=$(DESTDIR)/var/lib/mandos
 
60
# LIBDIR=$(PREFIX)/lib
39
61
##
40
62
 
41
63
## These settings are for a package-type install
45
67
MANDIR=$(PREFIX)/share/man
46
68
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
47
69
STATEDIR=$(DESTDIR)/var/lib/mandos
 
70
LIBDIR=$(shell \
 
71
        for d in \
 
72
        "/usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null`" \
 
73
        "`rpm --eval='%{_libdir}' 2>/dev/null`" /usr/lib; do \
 
74
                if [ -d "$$d" -a "$$d" = "$${d%/}" ]; then \
 
75
                        echo "$(DESTDIR)$$d"; \
 
76
                        break; \
 
77
                fi; \
 
78
        done)
48
79
##
49
80
 
 
81
SYSTEMD=$(DESTDIR)$(shell pkg-config systemd --variable=systemdsystemunitdir)
 
82
 
50
83
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
51
84
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
52
85
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
54
87
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
55
88
GPGME_LIBS=$(shell gpgme-config --libs; getconf LFS_LIBS; \
56
89
        getconf LFS_LDFLAGS)
 
90
LIBNL3_CFLAGS=$(shell pkg-config --cflags-only-I libnl-route-3.0)
 
91
LIBNL3_LIBS=$(shell pkg-config --libs libnl-route-3.0)
57
92
 
58
93
# Do not change these two
59
 
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
60
 
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
61
 
        -DVERSION='"$(version)"'
 
94
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(SANITIZE) $(COVERAGE) \
 
95
        $(OPTIMIZE) $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) \
 
96
        $(GPGME_CFLAGS) -DVERSION='"$(version)"'
62
97
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
63
98
 
64
99
# Commands to format a DocBook <refentry> document into a manual page
70
105
        --param man.authors.section.enabled     0 \
71
106
        /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
72
107
        $(notdir $<); \
73
 
        $(MANPOST) $(notdir $@);\
74
108
        if locale --all 2>/dev/null | grep --regexp='^en_US\.utf8$$' \
75
109
        && type man 2>/dev/null; then LANG=en_US.UTF-8 MANWIDTH=80 \
76
110
        man --warnings --encoding=UTF-8 --local-file $(notdir $@); \
77
111
        fi >/dev/null)
78
 
# DocBook-to-man post-processing to fix a '\n' escape bug
79
 
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
80
112
 
81
113
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
82
114
        --param make.year.ranges                1 \
94
126
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
95
127
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
96
128
        plugins.d/plymouth
97
 
CPROGS=plugin-runner $(PLUGINS)
 
129
PLUGIN_HELPERS=plugin-helpers/mandos-client-iprouteadddel
 
130
CPROGS=plugin-runner $(PLUGINS) $(PLUGIN_HELPERS)
98
131
PROGS=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
99
132
DOCS=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
100
133
        mandos.conf.5 mandos-clients.conf.5 plugin-runner.8mandos \
227
260
        $(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
228
261
                ) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
229
262
 
230
 
.PHONY : all doc html clean distclean run-client run-server install \
231
 
        install-server install-client uninstall uninstall-server \
232
 
        uninstall-client purge purge-server purge-client
 
263
plugin-helpers/mandos-client-iprouteadddel: plugin-helpers/mandos-client-iprouteadddel.c
 
264
        $(LINK.c) $(LIBNL3_CFLAGS) $^ $(LIBNL3_LIBS) $(strip\
 
265
                ) $(LOADLIBES) $(LDLIBS) -o $@
 
266
 
 
267
.PHONY : all doc html clean distclean mostlyclean maintainer-clean \
 
268
        check run-client run-server install install-html \
 
269
        install-server install-client-nokey install-client uninstall \
 
270
        uninstall-server uninstall-client purge purge-server \
 
271
        purge-client
233
272
 
234
273
clean:
235
274
        -rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
250
289
        @echo "# ignored.  The messages are caused by not running as root, but   #"
251
290
        @echo "# you should NOT run \"make run-client\" as root unless you also    #"
252
291
        @echo "# unpacked and compiled Mandos as root, which is NOT recommended. #"
253
 
        @echo "# From plugin-runner: setuid: Operation not permitted             #"
 
292
        @echo "# From plugin-runner: setgid: Operation not permitted             #"
 
293
        @echo "#                     setuid: Operation not permitted             #"
254
294
        @echo "# From askpass-fifo:  mkfifo: Permission denied                   #"
255
 
        @echo "# From mandos-client: setuid: Operation not permitted             #"
256
 
        @echo "#                     seteuid: Operation not permitted            #"
257
 
        @echo "#                     klogctl: Operation not permitted            #"
 
295
        @echo "# From mandos-client:                                             #"
 
296
        @echo "#             Failed to raise privileges: Operation not permitted #"
 
297
        @echo "#             Warning: network hook \"*\" exited with status *      #"
258
298
        @echo "###################################################################"
 
299
# We set GNOME_KEYRING_CONTROL to block pam_gnome_keyring
259
300
        ./plugin-runner --plugin-dir=plugins.d \
 
301
                --plugin-helper-dir=plugin-helpers \
260
302
                --config-file=plugin-runner.conf \
261
303
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--network-hook-dir=network-hooks.d \
 
304
                --env-for=mandos-client:GNOME_KEYRING_CONTROL= \
262
305
                $(CLIENTARGS)
263
306
 
264
307
# Used by run-client
279
322
        install --directory confdir
280
323
        install --mode=u=rw $< $@
281
324
# Add a client password
282
 
        ./mandos-keygen --dir keydir --password >> $@
 
325
        ./mandos-keygen --dir keydir --password --no-ssh >> $@
283
326
statedir:
284
327
        install --directory statedir
285
328
 
292
335
 
293
336
install-server: doc
294
337
        install --directory $(CONFDIR)
295
 
        install --directory --mode=u=rwx --owner=$(USER) \
296
 
                --group=$(GROUP) $(STATEDIR)
 
338
        if install --directory --mode=u=rwx --owner=$(USER) \
 
339
                --group=$(GROUP) $(STATEDIR); then \
 
340
                :; \
 
341
        elif install --directory --mode=u=rwx $(STATEDIR); then \
 
342
                chown -- $(USER):$(GROUP) $(STATEDIR) || :; \
 
343
        fi
297
344
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
298
345
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
299
346
                mandos-ctl
307
354
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
308
355
        install --mode=u=rwx,go=rx init.d-mandos \
309
356
                $(DESTDIR)/etc/init.d/mandos
 
357
        if [ "$(SYSTEMD)" != "$(DESTDIR)" -a -d "$(SYSTEMD)" ]; then \
 
358
                install --mode=u=rw,go=r mandos.service $(SYSTEMD); \
 
359
        fi
310
360
        install --mode=u=rw,go=r default-mandos \
311
361
                $(DESTDIR)/etc/default/mandos
312
362
        if [ -z $(DESTDIR) ]; then \
326
376
                > $(MANDIR)/man8/intro.8mandos.gz
327
377
 
328
378
install-client-nokey: all doc
329
 
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
 
379
        install --directory $(LIBDIR)/mandos $(CONFDIR)
330
380
        install --directory --mode=u=rwx $(KEYDIR) \
331
 
                $(PREFIX)/lib/mandos/plugins.d
332
 
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
 
381
                $(LIBDIR)/mandos/plugins.d \
 
382
                $(LIBDIR)/mandos/plugin-helpers
 
383
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
333
384
                install --mode=u=rwx \
334
385
                        --directory "$(CONFDIR)/plugins.d"; \
 
386
                install --directory "$(CONFDIR)/plugin-helpers"; \
335
387
        fi
336
388
        install --mode=u=rwx,go=rx --directory \
337
389
                "$(CONFDIR)/network-hooks.d"
338
390
        install --mode=u=rwx,go=rx \
339
 
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
 
391
                --target-directory=$(LIBDIR)/mandos plugin-runner
340
392
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
341
393
                mandos-keygen
342
394
        install --mode=u=rwx,go=rx \
343
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
395
                --target-directory=$(LIBDIR)/mandos/plugins.d \
344
396
                plugins.d/password-prompt
345
397
        install --mode=u=rwxs,go=rx \
346
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
398
                --target-directory=$(LIBDIR)/mandos/plugins.d \
347
399
                plugins.d/mandos-client
348
400
        install --mode=u=rwxs,go=rx \
349
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
401
                --target-directory=$(LIBDIR)/mandos/plugins.d \
350
402
                plugins.d/usplash
351
403
        install --mode=u=rwxs,go=rx \
352
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
404
                --target-directory=$(LIBDIR)/mandos/plugins.d \
353
405
                plugins.d/splashy
354
406
        install --mode=u=rwxs,go=rx \
355
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
407
                --target-directory=$(LIBDIR)/mandos/plugins.d \
356
408
                plugins.d/askpass-fifo
357
409
        install --mode=u=rwxs,go=rx \
358
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
410
                --target-directory=$(LIBDIR)/mandos/plugins.d \
359
411
                plugins.d/plymouth
 
412
        install --mode=u=rwxs,go=rx \
 
413
                --target-directory=$(LIBDIR)/mandos/plugin-helpers \
 
414
                plugin-helpers/mandos-client-iprouteadddel
360
415
        install initramfs-tools-hook \
361
416
                $(INITRAMFSTOOLS)/hooks/mandos
362
417
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
407
462
        ! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
408
463
                $(DESTDIR)/etc/crypttab
409
464
        -rm --force $(PREFIX)/sbin/mandos-keygen \
410
 
                $(PREFIX)/lib/mandos/plugin-runner \
411
 
                $(PREFIX)/lib/mandos/plugins.d/password-prompt \
412
 
                $(PREFIX)/lib/mandos/plugins.d/mandos-client \
413
 
                $(PREFIX)/lib/mandos/plugins.d/usplash \
414
 
                $(PREFIX)/lib/mandos/plugins.d/splashy \
415
 
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
416
 
                $(PREFIX)/lib/mandos/plugins.d/plymouth \
 
465
                $(LIBDIR)/mandos/plugin-runner \
 
466
                $(LIBDIR)/mandos/plugins.d/password-prompt \
 
467
                $(LIBDIR)/mandos/plugins.d/mandos-client \
 
468
                $(LIBDIR)/mandos/plugins.d/usplash \
 
469
                $(LIBDIR)/mandos/plugins.d/splashy \
 
470
                $(LIBDIR)/mandos/plugins.d/askpass-fifo \
 
471
                $(LIBDIR)/mandos/plugins.d/plymouth \
417
472
                $(INITRAMFSTOOLS)/hooks/mandos \
418
473
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
419
474
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
425
480
                $(MANDIR)/man8/splashy.8mandos.gz \
426
481
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
427
482
                $(MANDIR)/man8/plymouth.8mandos.gz \
428
 
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
429
 
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
 
483
        -rmdir $(LIBDIR)/mandos/plugins.d $(CONFDIR)/plugins.d \
 
484
                 $(LIBDIR)/mandos $(CONFDIR) $(KEYDIR)
430
485
        update-initramfs -k all -u
431
486
 
432
487
purge: purge-server purge-client
436
491
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
437
492
                $(DESTDIR)/etc/default/mandos \
438
493
                $(DESTDIR)/etc/init.d/mandos \
439
 
                $(DESTDIR)/run/mandos.pid
 
494
                $(SYSTEMD)/mandos.service \
 
495
                $(DESTDIR)/run/mandos.pid \
 
496
                $(DESTDIR)/var/run/mandos.pid
440
497
        -rmdir $(CONFDIR)
441
498
 
442
499
purge-client: uninstall-client