/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-options.xml

  • Committer: Teddy Hogeborn
  • Date: 2019-09-01 04:27:59 UTC
  • Revision ID: teddy@recompile.se-20190901042759-dgadz8cg7x9y83ci
Fix minor Python 3 bytes/str mixups

* mandos (PGPEngine.__init__): Use byte string literals, not strings,
                               when working with byte strings.
  (main): When restoring persistent state from a file created by
          Python 2, also convert the "checker_command" setting from a
          byte string to a string, the same as "name" and "host".

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_compat">
50
 
    GnuTLS priority string for the <acronym>TLS</acronym> handshake.
51
 
    The default is <quote><literal
52
 
    >SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA</literal>
53
 
    <literal>:+SIGN-RSA-SHA224:+SIGN-RSA-RMD160</literal></quote>.
54
 
    See <citerefentry><refentrytitle
55
 
    >gnutls_priority_init</refentrytitle>
56
 
    <manvolnum>3</manvolnum></citerefentry> for the syntax.
57
 
    <emphasis>Warning</emphasis>: changing this may make the
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.
61
 
  </para>
62
 
  
63
49
  <para id="priority">
64
50
    GnuTLS priority string for the <acronym>TLS</acronym> handshake.
65
 
    The default is <quote><literal
66
 
    >SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA</literal></quote>.
67
 
    See <citerefentry><refentrytitle
 
51
    The default is
 
52
    <!-- &#x200b; is Unicode ZERO WIDTH SPACE; allows line breaks -->
 
53
    <quote><literal>SECURE128&#x200b;:!CTYPE-X.509&#x200b;:+CTYPE-RAWPK&#x200b;:!RSA&#x200b;:!VERS-ALL&#x200b;:+VERS-TLS1.3&#x200b;:%PROFILE_ULTRA</literal></quote>
 
54
    when using raw public keys in TLS, and
 
55
    <quote><literal>SECURE256&#x200b;:!CTYPE-X.509&#x200b;:+CTYPE-OPENPGP&#x200b;:!RSA&#x200b;:+SIGN-DSA-SHA256</literal></quote>
 
56
    when using OpenPGP keys in TLS,.  See <citerefentry><refentrytitle
68
57
    >gnutls_priority_init</refentrytitle>
69
58
    <manvolnum>3</manvolnum></citerefentry> for the syntax.
70
59
    <emphasis>Warning</emphasis>: changing this may make the