/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-clients.conf.xml

  • Committer: Teddy Hogeborn
  • Date: 2015-07-20 00:59:17 UTC
  • Revision ID: teddy@recompile.se-20150720005917-ud7fxa6wcv9y4ta6
mandos-client: Bug fix: don't crash if --dh-params was not used.

* plugins.d/mandos-client.c (main): Bug fix: Check if dh_params_file
                                    is NULL before using it in the
                                    workaround for Debian bug #633582.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos-clients.conf.xml
3
3
        "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
4
4
<!ENTITY CONFNAME "mandos-clients.conf">
5
5
<!ENTITY CONFPATH "<filename>/etc/mandos/clients.conf</filename>">
6
 
<!ENTITY TIMESTAMP "2019-02-09">
 
6
<!ENTITY TIMESTAMP "2014-06-22">
7
7
<!ENTITY % common SYSTEM "common.ent">
8
8
%common;
9
9
]>
37
37
      <year>2010</year>
38
38
      <year>2011</year>
39
39
      <year>2012</year>
40
 
      <year>2013</year>
41
 
      <year>2014</year>
42
 
      <year>2015</year>
43
 
      <year>2016</year>
44
 
      <year>2017</year>
45
 
      <year>2018</year>
46
40
      <holder>Teddy Hogeborn</holder>
47
41
      <holder>Björn Påhlsson</holder>
48
42
    </copyright>
232
226
          <para>
233
227
            This option sets the OpenPGP fingerprint that identifies
234
228
            the public key that clients authenticate themselves with
235
 
            through TLS.  The string needs to be in hexadecimal form,
236
 
            but spaces or upper/lower case are not significant.
237
 
          </para>
238
 
        </listitem>
239
 
      </varlistentry>
240
 
      
241
 
      <varlistentry>
242
 
        <term><option>key_id<literal> = </literal
243
 
        ><replaceable>HEXSTRING</replaceable></option></term>
244
 
        <listitem>
245
 
          <para>
246
 
            This option is <emphasis>optional</emphasis>.
247
 
          </para>
248
 
          <para>
249
 
            This option sets the certificate key ID that identifies
250
 
            the public key that clients authenticate themselves with
251
 
            through TLS.  The string needs to be in hexadecimal form,
 
229
            through TLS.  The string needs to be in hexidecimal form,
252
230
            but spaces or upper/lower case are not significant.
253
231
          </para>
254
232
        </listitem>
330
308
          <para>
331
309
            If present, this option must be set to a string of
332
310
            base64-encoded binary data.  It will be decoded and sent
333
 
            to the client matching the above <option>key_id</option>
334
 
            or <option>fingerprint</option>.  This should, of course,
335
 
            be OpenPGP encrypted data, decryptable only by the client.
 
311
            to the client matching the above
 
312
            <option>fingerprint</option>.  This should, of course, be
 
313
            OpenPGP encrypted data, decryptable only by the client.
336
314
            The program <citerefentry><refentrytitle><command
337
315
            >mandos-keygen</command></refentrytitle><manvolnum
338
316
            >8</manvolnum></citerefentry> can, using its
433
411
        <quote><literal>created</literal></quote>,
434
412
        <quote><literal>enabled</literal></quote>,
435
413
        <quote><literal>expires</literal></quote>,
436
 
        <quote><literal>key_id</literal></quote>,
437
414
        <quote><literal>fingerprint</literal></quote>,
438
415
        <quote><literal>host</literal></quote>,
439
416
        <quote><literal>interval</literal></quote>,
482
459
      <literal>%(<replaceable>foo</replaceable>)s</literal> is
483
460
      obscure.
484
461
    </para>
485
 
    <xi:include href="bugs.xml"/>
486
462
  </refsect1>
487
463
  
488
464
  <refsect1 id="example">
496
472
 
497
473
# Client "foo"
498
474
[foo]
499
 
key_id = 788cd77115cd0bb7b2d5e0ae8496f6b48149d5e712c652076b1fd2d957ef7c1f
500
475
fingerprint =  7788 2722 5BA7 DE53 9C5A  7CFA 59CF F7CD BD9A 5920
501
476
secret =
502
477
        hQIOA6QdEjBs2L/HEAf/TCyrDe5Xnm9esa+Pb/vWF9CUqfn4srzVgSu234
519
494
 
520
495
# Client "bar"
521
496
[bar]
522
 
key_id = F90C7A81D72D1EA69A51031A91FF8885F36C8B46D155C8C58709A4C99AE9E361
523
497
fingerprint = 3e393aeaefb84c7e89e2f547b3a107558fca3a27
524
498
secfile = /etc/mandos/bar-secret
525
499
timeout = PT15M