/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: 2018-08-15 09:26:02 UTC
  • Revision ID: teddy@recompile.se-20180815092602-xoyb5s6gf8376i7u
http://bugs.debian.org/894495
mandos-client: Set system clock if necessary

* plugins.d/mandos-client.c (init_gpgme/import_key): If the system
  clock is not set, or set to january 1970, set the system clock to
  the more plausible value that is the mtime of the key file.  This is
  required by GnuPG to be able to import the keys.  (We can't pass the
  --ignore-time-conflict or the --ignore-valid-from options though
  GPGME.)

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 "2012-01-01">
 
5
<!ENTITY TIMESTAMP "2018-02-08">
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>
38
45
      <holder>Teddy Hogeborn</holder>
39
46
      <holder>Björn Påhlsson</holder>
40
47
    </copyright>
119
126
        <replaceable>TIME</replaceable></option></arg>
120
127
      </group>
121
128
      <sbr/>
122
 
      <arg><option>--force</option></arg>
 
129
      <group>
 
130
        <arg choice="plain"><option>--force</option></arg>
 
131
        <arg choice="plain"><option>-f</option></arg>
 
132
      </group>
123
133
    </cmdsynopsis>
124
134
    <cmdsynopsis>
125
135
      <command>&COMMANDNAME;</command>
145
155
        <arg choice="plain"><option>-n
146
156
        <replaceable>NAME</replaceable></option></arg>
147
157
      </group>
 
158
      <group>
 
159
        <arg choice="plain"><option>--no-ssh</option></arg>
 
160
        <arg choice="plain"><option>-S</option></arg>
 
161
      </group>
148
162
    </cmdsynopsis>
149
163
    <cmdsynopsis>
150
164
      <command>&COMMANDNAME;</command>
227
241
        <replaceable>TYPE</replaceable></option></term>
228
242
        <listitem>
229
243
          <para>
230
 
            Key type.  Default is <quote>DSA</quote>.
 
244
            Key type.  Default is <quote>RSA</quote>.
231
245
          </para>
232
246
        </listitem>
233
247
      </varlistentry>
239
253
        <replaceable>BITS</replaceable></option></term>
240
254
        <listitem>
241
255
          <para>
242
 
            Key length in bits.  Default is 2048.
 
256
            Key length in bits.  Default is 4096.
243
257
          </para>
244
258
        </listitem>
245
259
      </varlistentry>
251
265
        <replaceable>KEYTYPE</replaceable></option></term>
252
266
        <listitem>
253
267
          <para>
254
 
            Subkey type.  Default is <quote>ELG-E</quote> (Elgamal
 
268
            Subkey type.  Default is <quote>RSA</quote> (Elgamal
255
269
            encryption-only).
256
270
          </para>
257
271
        </listitem>
264
278
        <replaceable>BITS</replaceable></option></term>
265
279
        <listitem>
266
280
          <para>
267
 
            Subkey length in bits.  Default is 2048.
 
281
            Subkey length in bits.  Default is 4096.
268
282
          </para>
269
283
        </listitem>
270
284
      </varlistentry>
288
302
        <replaceable>TEXT</replaceable></option></term>
289
303
        <listitem>
290
304
          <para>
291
 
            Comment field for key.  The default value is
292
 
            <quote><literal>Mandos client key</literal></quote>.
 
305
            Comment field for key.  Default is empty.
293
306
          </para>
294
307
        </listitem>
295
308
      </varlistentry>
347
360
          </para>
348
361
        </listitem>
349
362
      </varlistentry>
 
363
      <varlistentry>
 
364
        <term><option>--no-ssh</option></term>
 
365
        <term><option>-S</option></term>
 
366
        <listitem>
 
367
          <para>
 
368
            When <option>--password</option> or
 
369
            <option>--passfile</option> is given, this option will
 
370
            prevent <command>&COMMANDNAME;</command> from calling
 
371
            <command>ssh-keyscan</command> to get an SSH fingerprint
 
372
            for this host and, if successful, output suitable config
 
373
            options to use this fingerprint as a
 
374
            <option>checker</option> option in the output.  This is
 
375
            otherwise the default behavior.
 
376
          </para>
 
377
        </listitem>
 
378
      </varlistentry>
350
379
    </variablelist>
351
380
  </refsect1>
352
381
  
423
452
    </variablelist>
424
453
  </refsect1>
425
454
  
426
 
<!--   <refsect1 id="bugs"> -->
427
 
<!--     <title>BUGS</title> -->
428
 
<!--     <para> -->
429
 
<!--     </para> -->
430
 
<!--   </refsect1> -->
 
455
  <refsect1 id="bugs">
 
456
    <title>BUGS</title>
 
457
    <xi:include href="bugs.xml"/>
 
458
  </refsect1>
431
459
  
432
460
  <refsect1 id="example">
433
461
    <title>EXAMPLE</title>
503
531
      <citerefentry><refentrytitle>mandos</refentrytitle>
504
532
      <manvolnum>8</manvolnum></citerefentry>,
505
533
      <citerefentry><refentrytitle>mandos-client</refentrytitle>
506
 
      <manvolnum>8mandos</manvolnum></citerefentry>
 
534
      <manvolnum>8mandos</manvolnum></citerefentry>,
 
535
      <citerefentry><refentrytitle>ssh-keyscan</refentrytitle>
 
536
      <manvolnum>1</manvolnum></citerefentry>
507
537
    </para>
508
538
  </refsect1>
509
539