/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 at recompile
  • Date: 2011-12-31 13:25:58 UTC
  • mto: This revision was merged to the branch mainline in revision 541.
  • Revision ID: teddy@recompile.se-20111231132558-z0dh7qgofgctmgri
* network-hooks.s/bridge: Don't use interface names directly; search
                          for interface names using their address.
  (addrtoif): New function.
* network-hooks.s/bridge.conf (PORTS): Removed.
  (PORT_ADDRESSES): New.
* network-hooks.s/wireless: Don't use interface names directly; search
                            for interface names using their address.
  (addrtoif): New function.
* network-hooks.s/wireless.conf: Specify address.

Show diffs side-by-side

added added

removed removed

Lines of Context:
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 "2013-08-27">
 
5
<!ENTITY TIMESTAMP "2011-10-03">
6
6
<!ENTITY % common SYSTEM "common.ent">
7
7
%common;
8
8
]>
34
34
      <year>2008</year>
35
35
      <year>2009</year>
36
36
      <year>2011</year>
37
 
      <year>2012</year>
38
37
      <holder>Teddy Hogeborn</holder>
39
38
      <holder>Björn Påhlsson</holder>
40
39
    </copyright>
227
226
        <replaceable>TYPE</replaceable></option></term>
228
227
        <listitem>
229
228
          <para>
230
 
            Key type.  Default is <quote>RSA</quote>.
 
229
            Key type.  Default is <quote>DSA</quote>.
231
230
          </para>
232
231
        </listitem>
233
232
      </varlistentry>
239
238
        <replaceable>BITS</replaceable></option></term>
240
239
        <listitem>
241
240
          <para>
242
 
            Key length in bits.  Default is 4096.
 
241
            Key length in bits.  Default is 2048.
243
242
          </para>
244
243
        </listitem>
245
244
      </varlistentry>
251
250
        <replaceable>KEYTYPE</replaceable></option></term>
252
251
        <listitem>
253
252
          <para>
254
 
            Subkey type.  Default is <quote>RSA</quote> (Elgamal
 
253
            Subkey type.  Default is <quote>ELG-E</quote> (Elgamal
255
254
            encryption-only).
256
255
          </para>
257
256
        </listitem>
264
263
        <replaceable>BITS</replaceable></option></term>
265
264
        <listitem>
266
265
          <para>
267
 
            Subkey length in bits.  Default is 4096.
 
266
            Subkey length in bits.  Default is 2048.
268
267
          </para>
269
268
        </listitem>
270
269
      </varlistentry>