/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: 2011-11-26 20:59:56 UTC
  • mto: (518.1.8 mandos-persistent)
  • mto: This revision was merged to the branch mainline in revision 524.
  • Revision ID: teddy@recompile.se-20111126205956-vft6g0z2i6my0165
Use GPG to encrypt instead of AES.

* Makefile (run-server): Use "--no-restore" option.
* debian/control (mandos/Depends): Added "python-gnupginterface".
* mandos: (CryptoError, Crypto): New; uses GPG.
  (Client.encrypt_secret, Client.decrypt_secret): Removed.
  (ClientHandler.fingerprint): Use binascii.hexlify().
  (main): Use Crypto class to decrypt.
  (main/cleanup): Use Crypto class to encrypt.  Handle EACCES.

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
 
6
        -Wconversion -Wstrict-prototypes -Wold-style-definition \
 
7
        -Wpacked -Wnested-externs -Winline -Wvolatile-register-var
 
8
#       -Wunreachable-code
13
9
#DEBUG=-ggdb3
14
 
# For info about _FORTIFY_SOURCE, see feature_test_macros(7)
 
10
# For info about _FORTIFY_SOURCE, see
 
11
# <http://www.kernel.org/doc/man-pages/online/pages/man7/feature_test_macros.7.html>
15
12
# and <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>.
16
13
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC
17
14
LINK_FORTIFY_LD=-z relro -z now
23
20
LINK_FORTIFY += -pie
24
21
endif
25
22
#COVERAGE=--coverage
26
 
OPTIMIZE=-Os -fno-strict-aliasing
 
23
OPTIMIZE=-Os
27
24
LANGUAGE=-std=gnu99
28
25
htmldir=man
29
 
version=1.6.4
 
26
version=1.4.1
30
27
SED=sed
31
28
 
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
 
 
35
29
## Use these settings for a traditional /usr/local install
36
30
# PREFIX=$(DESTDIR)/usr/local
37
31
# CONFDIR=$(DESTDIR)/etc/mandos
38
32
# KEYDIR=$(DESTDIR)/etc/mandos/keys
39
33
# MANDIR=$(PREFIX)/man
40
34
# INITRAMFSTOOLS=$(DESTDIR)/etc/initramfs-tools
41
 
# STATEDIR=$(DESTDIR)/var/lib/mandos
42
 
# LIBDIR=$(PREFIX)/lib
43
35
##
44
36
 
45
37
## These settings are for a package-type install
48
40
KEYDIR=$(DESTDIR)/etc/keys/mandos
49
41
MANDIR=$(PREFIX)/share/man
50
42
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)
61
43
##
62
44
 
63
 
SYSTEMD=$(DESTDIR)$(shell pkg-config systemd --variable=systemdsystemunitdir)
64
 
 
65
45
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
66
46
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
67
47
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
71
51
        getconf LFS_LDFLAGS)
72
52
 
73
53
# Do not change these two
74
 
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
 
54
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
75
55
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
76
56
        -DVERSION='"$(version)"'
77
 
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
 
57
LDFLAGS=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
78
58
 
79
59
# Commands to format a DocBook <refentry> document into a manual page
80
60
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
83
63
        --param make.single.year.ranges         1 \
84
64
        --param man.output.quietly              1 \
85
65
        --param man.authors.section.enabled     0 \
86
 
        /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
 
66
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
87
67
        $(notdir $<); \
88
 
        if locale --all 2>/dev/null | grep --regexp='^en_US\.utf8$$' \
89
 
        && type man 2>/dev/null; then LANG=en_US.UTF-8 MANWIDTH=80 \
90
 
        man --warnings --encoding=UTF-8 --local-file $(notdir $@); \
91
 
        fi >/dev/null)
 
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'
92
73
 
93
74
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
94
75
        --param make.year.ranges                1 \
239
220
        $(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
240
221
                ) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
241
222
 
242
 
.PHONY : all doc html clean distclean mostlyclean maintainer-clean \
243
 
        check run-client run-server install install-html \
244
 
        install-server install-client-nokey install-client uninstall \
245
 
        uninstall-server uninstall-client purge purge-server \
246
 
        purge-client
 
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
247
226
 
248
227
clean:
249
228
        -rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
251
230
distclean: clean
252
231
mostlyclean: clean
253
232
maintainer-clean: clean
254
 
        -rm --force --recursive keydir confdir statedir
 
233
        -rm --force --recursive keydir confdir
255
234
 
256
235
check:  all
257
236
        ./mandos --check
258
 
        ./mandos-ctl --check
259
237
 
260
238
# Run the client with a local config and key
261
239
run-client: all keydir/seckey.txt keydir/pubkey.txt
272
250
        @echo "###################################################################"
273
251
        ./plugin-runner --plugin-dir=plugins.d \
274
252
                --config-file=plugin-runner.conf \
275
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--network-hook-dir=network-hooks.d \
 
253
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
276
254
                $(CLIENTARGS)
277
255
 
278
256
# Used by run-client
281
259
        ./mandos-keygen --dir keydir --force
282
260
 
283
261
# Run the server with a local config
284
 
run-server: confdir/mandos.conf confdir/clients.conf statedir
285
 
        ./mandos --debug --no-dbus --configdir=confdir \
286
 
                --statedir=statedir $(SERVERARGS)
 
262
run-server: confdir/mandos.conf confdir/clients.conf
 
263
        ./mandos --debug --no-dbus --configdir=confdir --no-restore \
 
264
        $(SERVERARGS)
287
265
 
288
266
# Used by run-server
289
267
confdir/mandos.conf: mandos.conf
294
272
        install --mode=u=rw $< $@
295
273
# Add a client password
296
274
        ./mandos-keygen --dir keydir --password >> $@
297
 
statedir:
298
 
        install --directory statedir
299
275
 
300
276
install: install-server install-client-nokey
301
277
 
306
282
 
307
283
install-server: doc
308
284
        install --directory $(CONFDIR)
309
 
        if install --directory --mode=u=rwx --owner=$(USER) \
310
 
                --group=$(GROUP) $(STATEDIR); then \
311
 
                :; \
312
 
        elif install --directory --mode=u=rwx $(STATEDIR); then \
313
 
                chown -- $(USER):$(GROUP) $(STATEDIR) || :; \
314
 
        fi
315
285
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
316
286
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
317
287
                mandos-ctl
325
295
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
326
296
        install --mode=u=rwx,go=rx init.d-mandos \
327
297
                $(DESTDIR)/etc/init.d/mandos
328
 
        if [ "$(SYSTEMD)" != "$(DESTDIR)" -a -d "$(SYSTEMD)" ]; then \
329
 
                install --mode=u=rw,go=r mandos.service $(SYSTEMD); \
330
 
        fi
331
298
        install --mode=u=rw,go=r default-mandos \
332
299
                $(DESTDIR)/etc/default/mandos
333
300
        if [ -z $(DESTDIR) ]; then \
343
310
                > $(MANDIR)/man5/mandos.conf.5.gz
344
311
        gzip --best --to-stdout mandos-clients.conf.5 \
345
312
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
346
 
        gzip --best --to-stdout intro.8mandos \
347
 
                > $(MANDIR)/man8/intro.8mandos.gz
348
313
 
349
314
install-client-nokey: all doc
350
 
        install --directory $(LIBDIR)/mandos $(CONFDIR)
 
315
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
351
316
        install --directory --mode=u=rwx $(KEYDIR) \
352
 
                $(LIBDIR)/mandos/plugins.d
353
 
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
 
317
                $(PREFIX)/lib/mandos/plugins.d
 
318
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
354
319
                install --mode=u=rwx \
355
320
                        --directory "$(CONFDIR)/plugins.d"; \
356
321
        fi
357
 
        install --mode=u=rwx,go=rx --directory \
358
 
                "$(CONFDIR)/network-hooks.d"
359
322
        install --mode=u=rwx,go=rx \
360
 
                --target-directory=$(LIBDIR)/mandos plugin-runner
 
323
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
361
324
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
362
325
                mandos-keygen
363
326
        install --mode=u=rwx,go=rx \
364
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
327
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
365
328
                plugins.d/password-prompt
366
329
        install --mode=u=rwxs,go=rx \
367
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
330
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
368
331
                plugins.d/mandos-client
369
332
        install --mode=u=rwxs,go=rx \
370
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
333
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
371
334
                plugins.d/usplash
372
335
        install --mode=u=rwxs,go=rx \
373
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
336
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
374
337
                plugins.d/splashy
375
338
        install --mode=u=rwxs,go=rx \
376
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
339
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
377
340
                plugins.d/askpass-fifo
378
341
        install --mode=u=rwxs,go=rx \
379
 
                --target-directory=$(LIBDIR)/mandos/plugins.d \
 
342
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
380
343
                plugins.d/plymouth
381
344
        install initramfs-tools-hook \
382
345
                $(INITRAMFSTOOLS)/hooks/mandos
428
391
        ! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
429
392
                $(DESTDIR)/etc/crypttab
430
393
        -rm --force $(PREFIX)/sbin/mandos-keygen \
431
 
                $(LIBDIR)/mandos/plugin-runner \
432
 
                $(LIBDIR)/mandos/plugins.d/password-prompt \
433
 
                $(LIBDIR)/mandos/plugins.d/mandos-client \
434
 
                $(LIBDIR)/mandos/plugins.d/usplash \
435
 
                $(LIBDIR)/mandos/plugins.d/splashy \
436
 
                $(LIBDIR)/mandos/plugins.d/askpass-fifo \
437
 
                $(LIBDIR)/mandos/plugins.d/plymouth \
 
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 \
438
401
                $(INITRAMFSTOOLS)/hooks/mandos \
439
402
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
440
403
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
446
409
                $(MANDIR)/man8/splashy.8mandos.gz \
447
410
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
448
411
                $(MANDIR)/man8/plymouth.8mandos.gz \
449
 
        -rmdir $(LIBDIR)/mandos/plugins.d $(CONFDIR)/plugins.d \
450
 
                 $(LIBDIR)/mandos $(CONFDIR) $(KEYDIR)
 
412
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
 
413
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
451
414
        update-initramfs -k all -u
452
415
 
453
416
purge: purge-server purge-client
457
420
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
458
421
                $(DESTDIR)/etc/default/mandos \
459
422
                $(DESTDIR)/etc/init.d/mandos \
460
 
                $(SYSTEMD)/mandos.service \
461
 
                $(DESTDIR)/run/mandos.pid \
462
423
                $(DESTDIR)/var/run/mandos.pid
463
424
        -rmdir $(CONFDIR)
464
425