/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
1
WARN=-O -Wall -Wformat=2 -Winit-self -Wmissing-include-dirs \
2
2
        -Wswitch-default -Wswitch-enum -Wunused-parameter \
3
 
        -Wstrict-aliasing=2 -Wextra -Wfloat-equal -Wundef -Wshadow \
 
3
        -Wstrict-aliasing=1 -Wextra -Wfloat-equal -Wundef -Wshadow \
4
4
        -Wunsafe-loop-optimizations -Wpointer-arith \
5
5
        -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings \
6
6
        -Wconversion -Wstrict-prototypes -Wold-style-definition \
7
7
        -Wpacked -Wnested-externs -Winline -Wvolatile-register-var
8
 
#       -Wunreachable-code 
 
8
#       -Wunreachable-code
9
9
#DEBUG=-ggdb3
10
10
# For info about _FORTIFY_SOURCE, see
11
 
# <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>
12
 
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIE -pie
13
 
LINK_FORTIFY=-z relro -pie
 
11
# <http://www.kernel.org/doc/man-pages/online/pages/man7/feature_test_macros.7.html>
 
12
# and <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>.
 
13
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC
 
14
LINK_FORTIFY_LD=-z relro -z now
 
15
LINK_FORTIFY=
 
16
 
 
17
# If BROKEN_PIE is set, do not build with -pie
 
18
ifndef BROKEN_PIE
 
19
FORTIFY += -fPIE
 
20
LINK_FORTIFY += -pie
 
21
endif
14
22
#COVERAGE=--coverage
15
23
OPTIMIZE=-Os
16
24
LANGUAGE=-std=gnu99
17
25
htmldir=man
18
 
version=1.0.2
 
26
version=1.4.1
19
27
SED=sed
20
28
 
21
29
## Use these settings for a traditional /usr/local install
34
42
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
35
43
##
36
44
 
37
 
GNUTLS_CFLAGS=$(shell libgnutls-config --cflags)
38
 
GNUTLS_LIBS=$(shell libgnutls-config --libs)
 
45
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
 
46
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
39
47
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
40
48
AVAHI_LIBS=$(shell pkg-config --libs avahi-core)
41
 
GPGME_CFLAGS=$(shell gpgme-config --cflags)
42
 
GPGME_LIBS=$(shell gpgme-config --libs)
 
49
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
 
50
GPGME_LIBS=$(shell gpgme-config --libs; getconf LFS_LIBS; \
 
51
        getconf LFS_LDFLAGS)
43
52
 
44
53
# Do not change these two
45
54
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
46
55
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
47
56
        -DVERSION='"$(version)"'
48
 
LDFLAGS=$(COVERAGE) $(foreach flag,$(LINK_FORTIFY),-Xlinker $(flag))
 
57
LDFLAGS=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
49
58
 
50
59
# Commands to format a DocBook <refentry> document into a manual page
51
 
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
 
60
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
52
61
        --param man.charmap.use.subset          0 \
53
62
        --param make.year.ranges                1 \
54
63
        --param make.single.year.ranges         1 \
56
65
        --param man.authors.section.enabled     0 \
57
66
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
58
67
        $(notdir $<); \
59
 
        $(MANPOST) $(notdir $@)
 
68
        $(MANPOST) $(notdir $@);\
 
69
        LANG=en_US.UTF-8 MANWIDTH=80 man --warnings --encoding=UTF-8 \
 
70
        --local-file $(notdir $@) >/dev/null)
60
71
# DocBook-to-man post-processing to fix a '\n' escape bug
61
72
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
62
73
 
63
 
DOCBOOKTOHTML=xsltproc --nonet --xinclude \
 
74
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
64
75
        --param make.year.ranges                1 \
65
76
        --param make.single.year.ranges         1 \
66
77
        --param man.output.quietly              1 \
68
79
        --param citerefentry.link               1 \
69
80
        --output $@ \
70
81
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
71
 
        $<; $(HTMLPOST) $@
 
82
        $<; $(HTMLPOST) $@)
72
83
# Fix citerefentry links
73
84
HTMLPOST=$(SED) --in-place \
74
85
        --expression='s/\(<a class="citerefentry" href="\)\("><span class="citerefentry"><span class="refentrytitle">\)\([^<]*\)\(<\/span>(\)\([^)]*\)\()<\/span><\/a>\)/\1\3.\5\2\3\4\5\6/g'
75
86
 
76
87
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
77
 
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
 
88
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
 
89
        plugins.d/plymouth
78
90
CPROGS=plugin-runner $(PLUGINS)
79
 
PROGS=mandos mandos-keygen mandos-list $(CPROGS)
80
 
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
 
91
PROGS=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
 
92
DOCS=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
 
93
        mandos.conf.5 mandos-clients.conf.5 plugin-runner.8mandos \
81
94
        plugins.d/mandos-client.8mandos \
82
 
        plugins.d/password-prompt.8mandos mandos.conf.5 \
83
 
        plugins.d/usplash.8mandos plugins.d/splashy.8mandos \
84
 
        plugins.d/askpass-fifo.8mandos mandos-clients.conf.5
 
95
        plugins.d/password-prompt.8mandos plugins.d/usplash.8mandos \
 
96
        plugins.d/splashy.8mandos plugins.d/askpass-fifo.8mandos \
 
97
        plugins.d/plymouth.8mandos intro.8mandos
85
98
 
86
99
htmldocs=$(addsuffix .xhtml,$(DOCS))
87
100
 
108
121
%.8mandos.xhtml: %.xml common.ent legalnotice.xml
109
122
        $(DOCBOOKTOHTML)
110
123
 
 
124
intro.8mandos: intro.xml common.ent legalnotice.xml
 
125
        $(DOCBOOKTOMAN)
 
126
intro.8mandos.xhtml: intro.xml common.ent legalnotice.xml
 
127
        $(DOCBOOKTOHTML)
 
128
 
111
129
mandos.8: mandos.xml common.ent mandos-options.xml overview.xml \
112
130
                legalnotice.xml
113
131
        $(DOCBOOKTOMAN)
122
140
                 legalnotice.xml
123
141
        $(DOCBOOKTOHTML)
124
142
 
 
143
mandos-monitor.8: mandos-monitor.xml common.ent overview.xml \
 
144
                legalnotice.xml
 
145
        $(DOCBOOKTOMAN)
 
146
mandos-monitor.8.xhtml: mandos-monitor.xml common.ent overview.xml \
 
147
                 legalnotice.xml
 
148
        $(DOCBOOKTOHTML)
 
149
 
 
150
mandos-ctl.8: mandos-ctl.xml common.ent overview.xml \
 
151
                legalnotice.xml
 
152
        $(DOCBOOKTOMAN)
 
153
mandos-ctl.8.xhtml: mandos-ctl.xml common.ent overview.xml \
 
154
                 legalnotice.xml
 
155
        $(DOCBOOKTOHTML)
 
156
 
125
157
mandos.conf.5: mandos.conf.xml common.ent mandos-options.xml \
126
158
                legalnotice.xml
127
159
        $(DOCBOOKTOMAN)
149
181
 
150
182
# Update all these files with version number $(version)
151
183
common.ent: Makefile
152
 
        $(SED) --in-place \
153
 
                --expression='s/^\(<ENTITY VERSION "\)[^"]*">$$/\1$(version)"/' \
154
 
                $@
 
184
        $(strip $(SED) --in-place \
 
185
                --expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
 
186
                $@)
155
187
 
156
188
mandos: Makefile
157
 
        $(SED) --in-place \
 
189
        $(strip $(SED) --in-place \
158
190
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
159
 
                $@
 
191
                $@)
160
192
 
161
193
mandos-keygen: Makefile
162
 
        $(SED) --in-place \
 
194
        $(strip $(SED) --in-place \
163
195
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
164
 
                $@
165
 
 
166
 
mandos-list: Makefile
167
 
        $(SED) --in-place \
168
 
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
169
 
                $@
 
196
                $@)
 
197
 
 
198
mandos-ctl: Makefile
 
199
        $(strip $(SED) --in-place \
 
200
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
 
201
                $@)
 
202
 
 
203
mandos-monitor: Makefile
 
204
        $(strip $(SED) --in-place \
 
205
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
 
206
                $@)
170
207
 
171
208
mandos.lsm: Makefile
172
 
        $(SED) --in-place \
 
209
        $(strip $(SED) --in-place \
173
210
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
174
 
                $@
175
 
        $(SED) --in-place \
 
211
                $@)
 
212
        $(strip $(SED) --in-place \
176
213
                --expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \
177
 
                $@
 
214
                $@)
 
215
        $(strip $(SED) --in-place \
 
216
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
 
217
                $@)
178
218
 
179
 
plugins.d/mandos-client: plugins.d/mandos-client.o
180
 
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
181
 
                $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
 
219
plugins.d/mandos-client: plugins.d/mandos-client.c
 
220
        $(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
 
221
                ) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
182
222
 
183
223
.PHONY : all doc html clean distclean run-client run-server install \
184
224
        install-server install-client uninstall uninstall-server \
197
237
 
198
238
# Run the client with a local config and key
199
239
run-client: all keydir/seckey.txt keydir/pubkey.txt
 
240
        @echo "###################################################################"
 
241
        @echo "# The following error messages are harmless and can be safely     #"
 
242
        @echo "# ignored.  The messages are caused by not running as root, but   #"
 
243
        @echo "# you should NOT run \"make run-client\" as root unless you also    #"
 
244
        @echo "# unpacked and compiled Mandos as root, which is NOT recommended. #"
 
245
        @echo "# From plugin-runner: setuid: Operation not permitted             #"
 
246
        @echo "# From askpass-fifo:  mkfifo: Permission denied                   #"
 
247
        @echo "# From mandos-client: setuid: Operation not permitted             #"
 
248
        @echo "#                     seteuid: Operation not permitted            #"
 
249
        @echo "#                     klogctl: Operation not permitted            #"
 
250
        @echo "###################################################################"
200
251
        ./plugin-runner --plugin-dir=plugins.d \
201
252
                --config-file=plugin-runner.conf \
202
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt
 
253
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
 
254
                $(CLIENTARGS)
203
255
 
204
256
# Used by run-client
205
257
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
208
260
 
209
261
# Run the server with a local config
210
262
run-server: confdir/mandos.conf confdir/clients.conf
211
 
        ./mandos --debug --configdir=confdir
 
263
        ./mandos --debug --no-dbus --configdir=confdir --no-restore \
 
264
        $(SERVERARGS)
212
265
 
213
266
# Used by run-server
214
267
confdir/mandos.conf: mandos.conf
230
283
install-server: doc
231
284
        install --directory $(CONFDIR)
232
285
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
 
286
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
 
287
                mandos-ctl
 
288
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
 
289
                mandos-monitor
233
290
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
234
291
                mandos.conf
235
292
        install --mode=u=rw --target-directory=$(CONFDIR) \
236
293
                clients.conf
 
294
        install --mode=u=rw,go=r dbus-mandos.conf \
 
295
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
237
296
        install --mode=u=rwx,go=rx init.d-mandos \
238
297
                $(DESTDIR)/etc/init.d/mandos
239
298
        install --mode=u=rw,go=r default-mandos \
243
302
        fi
244
303
        gzip --best --to-stdout mandos.8 \
245
304
                > $(MANDIR)/man8/mandos.8.gz
 
305
        gzip --best --to-stdout mandos-monitor.8 \
 
306
                > $(MANDIR)/man8/mandos-monitor.8.gz
 
307
        gzip --best --to-stdout mandos-ctl.8 \
 
308
                > $(MANDIR)/man8/mandos-ctl.8.gz
246
309
        gzip --best --to-stdout mandos.conf.5 \
247
310
                > $(MANDIR)/man5/mandos.conf.5.gz
248
311
        gzip --best --to-stdout mandos-clients.conf.5 \
275
338
        install --mode=u=rwxs,go=rx \
276
339
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
277
340
                plugins.d/askpass-fifo
 
341
        install --mode=u=rwxs,go=rx \
 
342
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
343
                plugins.d/plymouth
278
344
        install initramfs-tools-hook \
279
345
                $(INITRAMFSTOOLS)/hooks/mandos
280
346
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
281
347
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
282
348
        install initramfs-tools-script \
283
 
                $(INITRAMFSTOOLS)/scripts/local-top/mandos
 
349
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
284
350
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
285
351
        gzip --best --to-stdout mandos-keygen.8 \
286
352
                > $(MANDIR)/man8/mandos-keygen.8.gz
287
353
        gzip --best --to-stdout plugin-runner.8mandos \
288
354
                > $(MANDIR)/man8/plugin-runner.8mandos.gz
 
355
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
 
356
                > $(MANDIR)/man8/mandos-client.8mandos.gz
289
357
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
290
358
                > $(MANDIR)/man8/password-prompt.8mandos.gz
291
 
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
292
 
                > $(MANDIR)/man8/mandos-client.8mandos.gz
293
359
        gzip --best --to-stdout plugins.d/usplash.8mandos \
294
360
                > $(MANDIR)/man8/usplash.8mandos.gz
295
361
        gzip --best --to-stdout plugins.d/splashy.8mandos \
296
362
                > $(MANDIR)/man8/splashy.8mandos.gz
297
363
        gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \
298
364
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
 
365
        gzip --best --to-stdout plugins.d/plymouth.8mandos \
 
366
                > $(MANDIR)/man8/plymouth.8mandos.gz
299
367
 
300
368
install-client: install-client-nokey
301
369
# Post-installation stuff
307
375
 
308
376
uninstall-server:
309
377
        -rm --force $(PREFIX)/sbin/mandos \
 
378
                $(PREFIX)/sbin/mandos-ctl \
 
379
                $(PREFIX)/sbin/mandos-monitor \
310
380
                $(MANDIR)/man8/mandos.8.gz \
 
381
                $(MANDIR)/man8/mandos-monitor.8.gz \
 
382
                $(MANDIR)/man8/mandos-ctl.8.gz \
311
383
                $(MANDIR)/man5/mandos.conf.5.gz \
312
384
                $(MANDIR)/man5/mandos-clients.conf.5.gz
313
385
        update-rc.d -f mandos remove
325
397
                $(PREFIX)/lib/mandos/plugins.d/usplash \
326
398
                $(PREFIX)/lib/mandos/plugins.d/splashy \
327
399
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
 
400
                $(PREFIX)/lib/mandos/plugins.d/plymouth \
328
401
                $(INITRAMFSTOOLS)/hooks/mandos \
329
402
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
330
 
                $(INITRAMFSTOOLS)/scripts/local-top/mandos \
 
403
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
 
404
                $(MANDIR)/man8/mandos-keygen.8.gz \
331
405
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
332
 
                $(MANDIR)/man8/mandos-keygen.8.gz \
 
406
                $(MANDIR)/man8/mandos-client.8mandos.gz
333
407
                $(MANDIR)/man8/password-prompt.8mandos.gz \
334
408
                $(MANDIR)/man8/usplash.8mandos.gz \
335
409
                $(MANDIR)/man8/splashy.8mandos.gz \
336
410
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
337
 
                $(MANDIR)/man8/mandos-client.8mandos.gz
 
411
                $(MANDIR)/man8/plymouth.8mandos.gz \
338
412
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
339
413
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
340
414
        update-initramfs -k all -u
343
417
 
344
418
purge-server: uninstall-server
345
419
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
 
420
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
346
421
                $(DESTDIR)/etc/default/mandos \
347
422
                $(DESTDIR)/etc/init.d/mandos \
348
423
                $(DESTDIR)/var/run/mandos.pid