/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

removed keyring pre-requirement for starting password-request.
        Keys will now be imported in run-time to a run-time created keyring

Changed seckey and pubkey to be paths to private and public keys of the pgp encrypted password and gnutls authentication credentials.

Show diffs side-by-side

added added

removed removed

Lines of Context:
58
58
 
59
59
doc: $(DOCS)
60
60
 
61
 
%.5: %.xml
62
 
        $(DOCBOOKTOMAN)
63
 
 
64
 
%.8: %.xml
65
 
        $(DOCBOOKTOMAN)
66
 
 
67
 
%.8mandos: %.xml
 
61
%.5: %.xml legalnotice.xml
 
62
        $(DOCBOOKTOMAN)
 
63
 
 
64
%.8: %.xml legalnotice.xml
 
65
        $(DOCBOOKTOMAN)
 
66
 
 
67
%.8mandos: %.xml legalnotice.xml
68
68
        $(DOCBOOKTOMAN)
69
69
 
70
70
mandos.8: mandos.xml mandos-options.xml
96
96
run-client: all keydir/seckey.txt keydir/pubkey.txt \
97
97
        keydir/secring.gpg keydir/pubring.gpg
98
98
        ./plugin-runner --plugin-dir=plugins.d \
99
 
                --options-for=password-request:--keydir=keydir
 
99
                --options-for=password-request:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt
100
100
 
101
101
# Used by run-client
102
102
keydir/secring.gpg: keydir/seckey.txt