/mandos/release

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/release

« back to all changes in this revision

Viewing changes to mandos-options.xml

  • Committer: Teddy Hogeborn
  • Date: 2014-07-24 01:35:55 UTC
  • mto: (237.7.272 trunk)
  • mto: This revision was merged to the branch mainline in revision 321.
  • Revision ID: teddy@recompile.se-20140724013555-zrgds2ft5cmwhugb
Fix two mutually cancelling bugs.

* mandos (rfc3339_duration_to_delta): Set "token_duration" to be a
                                      token (and not a tuple) by
                                      removing the final comma.
                                      Construct the needed tuple later
                                      when initializing the
                                      "followers" variable.
* mandos-ctl (rfc3339_duration_to_delta): - '' -

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos-options.xml
46
46
    <emphasis>not</emphasis> run in debug mode.
47
47
  </para>
48
48
  
49
 
  <para id="priority">
 
49
  <para id="priority_compat">
50
50
    GnuTLS priority string for the <acronym>TLS</acronym> handshake.
51
51
    The default is <quote><literal
52
 
    >SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA</literal>
53
 
    <literal>:+SIGN-DSA-SHA256</literal></quote>.
 
52
    >SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:+SIGN-RSA-SHA224:</literal>
 
53
    <literal>+SIGN-RSA-RMD160</literal></quote>.
54
54
    See <citerefentry><refentrytitle
55
55
    >gnutls_priority_init</refentrytitle>
56
56
    <manvolnum>3</manvolnum></citerefentry> for the syntax.
57
57
    <emphasis>Warning</emphasis>: changing this may make the
58
58
    <acronym>TLS</acronym> handshake fail, making server-client
59
 
    communication impossible.  Changing this option may also make the
60
 
    network traffic decryptable by an attacker.
 
59
    communication impossible.
 
60
  </para>
 
61
  
 
62
  <para id="priority">
 
63
    GnuTLS priority string for the <acronym>TLS</acronym> handshake.
 
64
    The default is <quote><literal
 
65
    >SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP</literal></quote>.  See
 
66
    <citerefentry><refentrytitle >gnutls_priority_init</refentrytitle>
 
67
    <manvolnum>3</manvolnum></citerefentry> for the syntax.
 
68
    <emphasis>Warning</emphasis>: changing this may make the
 
69
    <acronym>TLS</acronym> handshake fail, making server-client
 
70
    communication impossible.
61
71
  </para>
62
72
  
63
73
  <para id="servicename">