/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 mandos-keygen.xml

  • Committer: Teddy Hogeborn
  • Date: 2016-02-28 13:09:43 UTC
  • Revision ID: teddy@recompile.se-20160228130943-6ofi0xgek1xd7qmy
Use GnuPG 2 if available

* debian/control (Package: mandos/Depends): Change "gnupg (<< 2)" to
                                            "gnupg".
  (Package: mandos-client/Depends): Remove "gnupg (<< 2)"; it will be
                                    depended on by libgpgme11, which
                                    will be added automatically by
                                    ${shlibs:Depends}.
* mandos (PGPEngine.__init__): Try to run "gpgconf" and set 'self.gpg'
                               to any binary found.  Also change
                               "--home" to "--homedir".
  (PGPEngine.encrypt, PGPEngine.decrypt): Use the 'self.gpg' attribute
                                          instead of "gpg".

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos-keygen.xml
2
2
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
3
3
        "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
4
4
<!ENTITY COMMANDNAME "mandos-keygen">
5
 
<!ENTITY TIMESTAMP "2009-01-04">
 
5
<!ENTITY TIMESTAMP "2015-07-20">
6
6
<!ENTITY % common SYSTEM "common.ent">
7
7
%common;
8
8
]>
19
19
        <firstname>Björn</firstname>
20
20
        <surname>Påhlsson</surname>
21
21
        <address>
22
 
          <email>belorn@fukt.bsnet.se</email>
 
22
          <email>belorn@recompile.se</email>
23
23
        </address>
24
24
      </author>
25
25
      <author>
26
26
        <firstname>Teddy</firstname>
27
27
        <surname>Hogeborn</surname>
28
28
        <address>
29
 
          <email>teddy@fukt.bsnet.se</email>
 
29
          <email>teddy@recompile.se</email>
30
30
        </address>
31
31
      </author>
32
32
    </authorgroup>
33
33
    <copyright>
34
34
      <year>2008</year>
35
35
      <year>2009</year>
 
36
      <year>2010</year>
 
37
      <year>2011</year>
 
38
      <year>2012</year>
 
39
      <year>2013</year>
 
40
      <year>2014</year>
 
41
      <year>2015</year>
36
42
      <holder>Teddy Hogeborn</holder>
37
43
      <holder>Björn Påhlsson</holder>
38
44
    </copyright>
117
123
        <replaceable>TIME</replaceable></option></arg>
118
124
      </group>
119
125
      <sbr/>
120
 
      <arg><option>--force</option></arg>
 
126
      <group>
 
127
        <arg choice="plain"><option>--force</option></arg>
 
128
        <arg choice="plain"><option>-f</option></arg>
 
129
      </group>
121
130
    </cmdsynopsis>
122
131
    <cmdsynopsis>
123
132
      <command>&COMMANDNAME;</command>
143
152
        <arg choice="plain"><option>-n
144
153
        <replaceable>NAME</replaceable></option></arg>
145
154
      </group>
 
155
      <group>
 
156
        <arg choice="plain"><option>--no-ssh</option></arg>
 
157
        <arg choice="plain"><option>-S</option></arg>
 
158
      </group>
146
159
    </cmdsynopsis>
147
160
    <cmdsynopsis>
148
161
      <command>&COMMANDNAME;</command>
213
226
        <listitem>
214
227
          <para>
215
228
            Target directory for key files.  Default is
216
 
            <filename>/etc/mandos</filename>.
 
229
            <filename class="directory">/etc/mandos</filename>.
217
230
          </para>
218
231
        </listitem>
219
232
      </varlistentry>
225
238
        <replaceable>TYPE</replaceable></option></term>
226
239
        <listitem>
227
240
          <para>
228
 
            Key type.  Default is <quote>DSA</quote>.
 
241
            Key type.  Default is <quote>RSA</quote>.
229
242
          </para>
230
243
        </listitem>
231
244
      </varlistentry>
237
250
        <replaceable>BITS</replaceable></option></term>
238
251
        <listitem>
239
252
          <para>
240
 
            Key length in bits.  Default is 2048.
 
253
            Key length in bits.  Default is 4096.
241
254
          </para>
242
255
        </listitem>
243
256
      </varlistentry>
249
262
        <replaceable>KEYTYPE</replaceable></option></term>
250
263
        <listitem>
251
264
          <para>
252
 
            Subkey type.  Default is <quote>ELG-E</quote> (Elgamal
 
265
            Subkey type.  Default is <quote>RSA</quote> (Elgamal
253
266
            encryption-only).
254
267
          </para>
255
268
        </listitem>
262
275
        <replaceable>BITS</replaceable></option></term>
263
276
        <listitem>
264
277
          <para>
265
 
            Subkey length in bits.  Default is 2048.
 
278
            Subkey length in bits.  Default is 4096.
266
279
          </para>
267
280
        </listitem>
268
281
      </varlistentry>
286
299
        <replaceable>TEXT</replaceable></option></term>
287
300
        <listitem>
288
301
          <para>
289
 
            Comment field for key.  The default value is
290
 
            <quote><literal>Mandos client key</literal></quote>.
 
302
            Comment field for key.  Default is empty.
291
303
          </para>
292
304
        </listitem>
293
305
      </varlistentry>
345
357
          </para>
346
358
        </listitem>
347
359
      </varlistentry>
 
360
      <varlistentry>
 
361
        <term><option>--no-ssh</option></term>
 
362
        <term><option>-S</option></term>
 
363
        <listitem>
 
364
          <para>
 
365
            When <option>--password</option> or
 
366
            <option>--passfile</option> is given, this option will
 
367
            prevent <command>&COMMANDNAME;</command> from calling
 
368
            <command>ssh-keyscan</command> to get an SSH fingerprint
 
369
            for this host and, if successful, output suitable config
 
370
            options to use this fingerprint as a
 
371
            <option>checker</option> option in the output.  This is
 
372
            otherwise the default behavior.
 
373
          </para>
 
374
        </listitem>
 
375
      </varlistentry>
348
376
    </variablelist>
349
377
  </refsect1>
350
378
  
410
438
        </listitem>
411
439
      </varlistentry>
412
440
      <varlistentry>
413
 
        <term><filename>/tmp</filename></term>
 
441
        <term><filename class="directory">/tmp</filename></term>
414
442
        <listitem>
415
443
          <para>
416
444
            Temporary files will be written here if
451
479
    </informalexample>
452
480
    <informalexample>
453
481
      <para>
454
 
        Prompt for a password, encrypt it with the key in
455
 
        <filename>/etc/mandos</filename> and output a section suitable
456
 
        for <filename>clients.conf</filename>.
 
482
        Prompt for a password, encrypt it with the key in <filename
 
483
        class="directory">/etc/mandos</filename> and output a section
 
484
        suitable for <filename>clients.conf</filename>.
457
485
      </para>
458
486
      <para>
459
487
        <userinput>&COMMANDNAME; --password</userinput>
492
520
  <refsect1 id="see_also">
493
521
    <title>SEE ALSO</title>
494
522
    <para>
 
523
      <citerefentry><refentrytitle>intro</refentrytitle>
 
524
      <manvolnum>8mandos</manvolnum></citerefentry>,
495
525
      <citerefentry><refentrytitle>gpg</refentrytitle>
496
526
      <manvolnum>1</manvolnum></citerefentry>,
497
527
      <citerefentry><refentrytitle>mandos-clients.conf</refentrytitle>
499
529
      <citerefentry><refentrytitle>mandos</refentrytitle>
500
530
      <manvolnum>8</manvolnum></citerefentry>,
501
531
      <citerefentry><refentrytitle>mandos-client</refentrytitle>
502
 
      <manvolnum>8mandos</manvolnum></citerefentry>
 
532
      <manvolnum>8mandos</manvolnum></citerefentry>,
 
533
      <citerefentry><refentrytitle>ssh-keyscan</refentrytitle>
 
534
      <manvolnum>1</manvolnum></citerefentry>
503
535
    </para>
504
536
  </refsect1>
505
537