/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: 2019-03-23 14:59:54 UTC
  • Revision ID: teddy@recompile.se-20190323145954-latqk2bg6xt989d5
mandos: Refactor; use classes, not instances, as namespaces

* mandos (Avahi): Rename to "avahi".
  (avahi.string_array_to_txt_array): Make static method.
  (GnuTLS): Rename to "gnutls".
  (gnutls.__init__): Remove; move version check up to class body.
  (gnutls.Error): Don't use class name anymore.

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 "2014-06-22">
 
5
<!ENTITY TIMESTAMP "2019-02-10">
6
6
<!ENTITY % common SYSTEM "common.ent">
7
7
%common;
8
8
]>
33
33
    <copyright>
34
34
      <year>2008</year>
35
35
      <year>2009</year>
 
36
      <year>2010</year>
36
37
      <year>2011</year>
37
38
      <year>2012</year>
 
39
      <year>2013</year>
 
40
      <year>2014</year>
 
41
      <year>2015</year>
 
42
      <year>2016</year>
 
43
      <year>2017</year>
 
44
      <year>2018</year>
 
45
      <year>2019</year>
38
46
      <holder>Teddy Hogeborn</holder>
39
47
      <holder>Björn Påhlsson</holder>
40
48
    </copyright>
120
128
      </group>
121
129
      <sbr/>
122
130
      <group>
 
131
        <arg choice="plain"><option>--tls-keytype
 
132
        <replaceable>KEYTYPE</replaceable></option></arg>
 
133
        <arg choice="plain"><option>-T
 
134
        <replaceable>KEYTYPE</replaceable></option></arg>
 
135
      </group>
 
136
      <sbr/>
 
137
      <group>
123
138
        <arg choice="plain"><option>--force</option></arg>
124
139
        <arg choice="plain"><option>-f</option></arg>
125
140
      </group>
173
188
    <title>DESCRIPTION</title>
174
189
    <para>
175
190
      <command>&COMMANDNAME;</command> is a program to generate the
176
 
      OpenPGP key used by
 
191
      TLS and OpenPGP keys used by
177
192
      <citerefentry><refentrytitle>mandos-client</refentrytitle>
178
 
      <manvolnum>8mandos</manvolnum></citerefentry>.  The key is
179
 
      normally written to /etc/mandos for later installation into the
180
 
      initrd image, but this, and most other things, can be changed
181
 
      with command line options.
 
193
      <manvolnum>8mandos</manvolnum></citerefentry>.  The keys are
 
194
      normally written to /etc/keys/mandos for later installation into
 
195
      the initrd image, but this, and most other things, can be
 
196
      changed with command line options.
182
197
    </para>
183
198
    <para>
184
199
      This program can also be used with the
221
236
        <replaceable>DIRECTORY</replaceable></option></term>
222
237
        <listitem>
223
238
          <para>
224
 
            Target directory for key files.  Default is
225
 
            <filename class="directory">/etc/mandos</filename>.
 
239
            Target directory for key files.  Default is <filename
 
240
            class="directory">/etc/keys/mandos</filename>.
226
241
          </para>
227
242
        </listitem>
228
243
      </varlistentry>
234
249
        <replaceable>TYPE</replaceable></option></term>
235
250
        <listitem>
236
251
          <para>
237
 
            Key type.  Default is <quote>RSA</quote>.
 
252
            OpenPGP key type.  Default is <quote>RSA</quote>.
238
253
          </para>
239
254
        </listitem>
240
255
      </varlistentry>
246
261
        <replaceable>BITS</replaceable></option></term>
247
262
        <listitem>
248
263
          <para>
249
 
            Key length in bits.  Default is 4096.
 
264
            OpenPGP key length in bits.  Default is 4096.
250
265
          </para>
251
266
        </listitem>
252
267
      </varlistentry>
258
273
        <replaceable>KEYTYPE</replaceable></option></term>
259
274
        <listitem>
260
275
          <para>
261
 
            Subkey type.  Default is <quote>RSA</quote> (Elgamal
262
 
            encryption-only).
 
276
            OpenPGP subkey type.  Default is <quote>RSA</quote>
263
277
          </para>
264
278
        </listitem>
265
279
      </varlistentry>
271
285
        <replaceable>BITS</replaceable></option></term>
272
286
        <listitem>
273
287
          <para>
274
 
            Subkey length in bits.  Default is 4096.
 
288
            OpenPGP subkey length in bits.  Default is 4096.
275
289
          </para>
276
290
        </listitem>
277
291
      </varlistentry>
315
329
      </varlistentry>
316
330
      
317
331
      <varlistentry>
 
332
        <term><option>--tls-keytype
 
333
        <replaceable>KEYTYPE</replaceable></option></term>
 
334
        <term><option>-T
 
335
        <replaceable>KEYTYPE</replaceable></option></term>
 
336
        <listitem>
 
337
          <para>
 
338
            TLS key type.  Default is <quote>ed25519</quote>
 
339
          </para>
 
340
        </listitem>
 
341
      </varlistentry>
 
342
      
 
343
      <varlistentry>
318
344
        <term><option>--force</option></term>
319
345
        <term><option>-f</option></term>
320
346
        <listitem>
329
355
        <listitem>
330
356
          <para>
331
357
            Prompt for a password and encrypt it with the key already
332
 
            present in either <filename>/etc/mandos</filename> or the
333
 
            directory specified with the <option>--dir</option>
 
358
            present in either <filename>/etc/keys/mandos</filename> or
 
359
            the directory specified with the <option>--dir</option>
334
360
            option.  Outputs, on standard output, a section suitable
335
361
            for inclusion in <citerefentry><refentrytitle
336
362
            >mandos-clients.conf</refentrytitle><manvolnum
376
402
    <title>OVERVIEW</title>
377
403
    <xi:include href="overview.xml"/>
378
404
    <para>
379
 
      This program is a small utility to generate new OpenPGP keys for
380
 
      new Mandos clients, and to generate sections for inclusion in
381
 
      <filename>clients.conf</filename> on the server.
 
405
      This program is a small utility to generate new TLS and OpenPGP
 
406
      keys for new Mandos clients, and to generate sections for
 
407
      inclusion in <filename>clients.conf</filename> on the server.
382
408
    </para>
383
409
  </refsect1>
384
410
  
416
442
    </para>
417
443
    <variablelist>
418
444
      <varlistentry>
419
 
        <term><filename>/etc/mandos/seckey.txt</filename></term>
 
445
        <term><filename>/etc/keys/mandos/seckey.txt</filename></term>
420
446
        <listitem>
421
447
          <para>
422
448
            OpenPGP secret key file which will be created or
425
451
        </listitem>
426
452
      </varlistentry>
427
453
      <varlistentry>
428
 
        <term><filename>/etc/mandos/pubkey.txt</filename></term>
 
454
        <term><filename>/etc/keys/mandos/pubkey.txt</filename></term>
429
455
        <listitem>
430
456
          <para>
431
457
            OpenPGP public key file which will be created or
434
460
        </listitem>
435
461
      </varlistentry>
436
462
      <varlistentry>
 
463
        <term><filename>/etc/keys/mandos/tls-privkey.pem</filename></term>
 
464
        <listitem>
 
465
          <para>
 
466
            Private key file which will be created or overwritten.
 
467
          </para>
 
468
        </listitem>
 
469
      </varlistentry>
 
470
      <varlistentry>
 
471
        <term><filename>/etc/keys/mandos/tls-pubkey.pem</filename></term>
 
472
        <listitem>
 
473
          <para>
 
474
            Public key file which will be created or overwritten.
 
475
          </para>
 
476
        </listitem>
 
477
      </varlistentry>
 
478
      <varlistentry>
437
479
        <term><filename class="directory">/tmp</filename></term>
438
480
        <listitem>
439
481
          <para>
445
487
    </variablelist>
446
488
  </refsect1>
447
489
  
448
 
<!--   <refsect1 id="bugs"> -->
449
 
<!--     <title>BUGS</title> -->
450
 
<!--     <para> -->
451
 
<!--     </para> -->
452
 
<!--   </refsect1> -->
 
490
  <refsect1 id="bugs">
 
491
    <title>BUGS</title>
 
492
    <xi:include href="bugs.xml"/>
 
493
  </refsect1>
453
494
  
454
495
  <refsect1 id="example">
455
496
    <title>EXAMPLE</title>
475
516
    </informalexample>
476
517
    <informalexample>
477
518
      <para>
478
 
        Prompt for a password, encrypt it with the key in <filename
479
 
        class="directory">/etc/mandos</filename> and output a section
480
 
        suitable for <filename>clients.conf</filename>.
 
519
        Prompt for a password, encrypt it with the keys in <filename
 
520
        class="directory">/etc/keys/mandos</filename> and output a
 
521
        section suitable for <filename>clients.conf</filename>.
481
522
      </para>
482
523
      <para>
483
524
        <userinput>&COMMANDNAME; --password</userinput>
485
526
    </informalexample>
486
527
    <informalexample>
487
528
      <para>
488
 
        Prompt for a password, encrypt it with the key in the
 
529
        Prompt for a password, encrypt it with the keys in the
489
530
        <filename>client-key</filename> directory and output a section
490
531
        suitable for <filename>clients.conf</filename>.
491
532
      </para>