/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: 2018-04-02 10:24:15 UTC
  • Revision ID: teddy@recompile.se-20180402102415-xrsu0wxhnmlaq29a
Minor code cleanup

* plugins.d/mandos-client.c (pgp_packet_decrypt): Use a "for"
  statement instead of a "while" statement to move initialization and
  stepping into the for statement, and reduce loop variable name
  length.

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-10">
 
6
<!ENTITY TIMESTAMP "2018-02-08">
7
7
<!ENTITY % common SYSTEM "common.ent">
8
8
%common;
9
9
]>
43
43
      <year>2016</year>
44
44
      <year>2017</year>
45
45
      <year>2018</year>
46
 
      <year>2019</year>
47
46
      <holder>Teddy Hogeborn</holder>
48
47
      <holder>Björn Påhlsson</holder>
49
48
    </copyright>
187
186
            >--</option> %%(host)s</literal></quote>.  Note that
188
187
            <command>mandos-keygen</command>, when generating output
189
188
            to be inserted into this file, normally looks for an SSH
190
 
            server on the Mandos client, and, if it finds one, outputs
 
189
            server on the Mandos client, and, if it find one, outputs
191
190
            a <option>checker</option> option to check for the
192
 
            client’s SSH key fingerprint – this is more secure against
 
191
            client’s key fingerprint – this is more secure against
193
192
            spoofing.
194
193
          </para>
195
194
          <para>
240
239
      </varlistentry>
241
240
      
242
241
      <varlistentry>
243
 
        <term><option>key_id<literal> = </literal
244
 
        ><replaceable>HEXSTRING</replaceable></option></term>
245
 
        <listitem>
246
 
          <para>
247
 
            This option is <emphasis>optional</emphasis>.
248
 
          </para>
249
 
          <para>
250
 
            This option sets the certificate key ID that identifies
251
 
            the public key that clients authenticate themselves with
252
 
            through TLS.  The string needs to be in hexadecimal form,
253
 
            but spaces or upper/lower case are not significant.
254
 
          </para>
255
 
        </listitem>
256
 
      </varlistentry>
257
 
      
258
 
      <varlistentry>
259
242
        <term><option><literal>host = </literal><replaceable
260
243
        >STRING</replaceable></option></term>
261
244
        <listitem>
331
314
          <para>
332
315
            If present, this option must be set to a string of
333
316
            base64-encoded binary data.  It will be decoded and sent
334
 
            to the client matching the above <option>key_id</option>
335
 
            or <option>fingerprint</option>.  This should, of course,
336
 
            be OpenPGP encrypted data, decryptable only by the client.
 
317
            to the client matching the above
 
318
            <option>fingerprint</option>.  This should, of course, be
 
319
            OpenPGP encrypted data, decryptable only by the client.
337
320
            The program <citerefentry><refentrytitle><command
338
321
            >mandos-keygen</command></refentrytitle><manvolnum
339
322
            >8</manvolnum></citerefentry> can, using its
434
417
        <quote><literal>created</literal></quote>,
435
418
        <quote><literal>enabled</literal></quote>,
436
419
        <quote><literal>expires</literal></quote>,
437
 
        <quote><literal>key_id</literal></quote>,
438
420
        <quote><literal>fingerprint</literal></quote>,
439
421
        <quote><literal>host</literal></quote>,
440
422
        <quote><literal>interval</literal></quote>,
497
479
 
498
480
# Client "foo"
499
481
[foo]
500
 
key_id = 788cd77115cd0bb7b2d5e0ae8496f6b48149d5e712c652076b1fd2d957ef7c1f
501
482
fingerprint =  7788 2722 5BA7 DE53 9C5A  7CFA 59CF F7CD BD9A 5920
502
483
secret =
503
484
        hQIOA6QdEjBs2L/HEAf/TCyrDe5Xnm9esa+Pb/vWF9CUqfn4srzVgSu234
520
501
 
521
502
# Client "bar"
522
503
[bar]
523
 
key_id = F90C7A81D72D1EA69A51031A91FF8885F36C8B46D155C8C58709A4C99AE9E361
524
504
fingerprint = 3e393aeaefb84c7e89e2f547b3a107558fca3a27
525
505
secfile = /etc/mandos/bar-secret
526
506
timeout = PT15M