/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 plugins.d/mandos-client.xml

  • Committer: Teddy Hogeborn
  • Date: 2016-03-09 21:23:21 UTC
  • Revision ID: teddy@recompile.se-20160309212321-2qlkzj9tecepc8xq
Server: Add Python 3 compatibility

Add Python 3 compatibility by not using the python-avahi module.  Also
fix miscellaneous things which differs in Python 3.  Especially hard
to fix is loading and saving clients data between Python 3 and 2,
since pickle formats have problems with strings.

* INSTALL: Remove python-avahi (and change python-gobject to
  python-gi, which is preferred now).
* debian/control (Source: mandos/Build-Depends-Indep): Remove
  "python-avahi".
* mandos: Wrap future_builtins import in try-except clause.  Do not
  import avahi module.  Use codecs.decode(..., "base64) instead of
  .decode("base64).  Use .keys(), .values(), and .items() instead of
  .iterkeys(), .itervalues(), and .iteritems().
  (alternate_dbus_interfaces/wrapper): Python 3 still requires the
  "black magic", but luckily it still works.  The Python 3 type()
  constructor requires first argument to be a string, not a byte
  string.
  (copy_function): New.  Use throughout.
  (Avahi, avahi): New class and global variable.
  (GnuTLS._need_version): Changed to be a byte string.
  (main): Decode byte strings loaded from pickle file.
  (main/cleanup): Dump using pickle prototoc 2 which Python 2 can
  read.

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-client">
5
 
<!ENTITY TIMESTAMP "2018-02-08">
 
5
<!ENTITY TIMESTAMP "2016-03-05">
6
6
<!ENTITY % common SYSTEM "../common.ent">
7
7
%common;
8
8
]>
40
40
      <year>2014</year>
41
41
      <year>2015</year>
42
42
      <year>2016</year>
43
 
      <year>2017</year>
44
 
      <year>2018</year>
45
43
      <holder>Teddy Hogeborn</holder>
46
44
      <holder>Björn Påhlsson</holder>
47
45
    </copyright>
844
842
      </varlistentry>
845
843
      <varlistentry>
846
844
        <term>
847
 
          <ulink url="https://www.gnutls.org/">GnuTLS</ulink>
 
845
          <ulink url="http://www.gnu.org/software/gnutls/"
 
846
          >GnuTLS</ulink>
848
847
        </term>
849
848
      <listitem>
850
849
        <para>
856
855
      </varlistentry>
857
856
      <varlistentry>
858
857
        <term>
859
 
          <ulink url="https://www.gnupg.org/related_software/gpgme/"
 
858
          <ulink url="http://www.gnupg.org/related_software/gpgme/"
860
859
                 >GPGME</ulink>
861
860
        </term>
862
861
        <listitem>
900
899
      </varlistentry>
901
900
      <varlistentry>
902
901
        <term>
903
 
          RFC 5246: <citetitle>The Transport Layer Security (TLS)
904
 
          Protocol Version 1.2</citetitle>
 
902
          RFC 4346: <citetitle>The Transport Layer Security (TLS)
 
903
          Protocol Version 1.1</citetitle>
905
904
        </term>
906
905
      <listitem>
907
906
        <para>
908
 
          TLS 1.2 is the protocol implemented by GnuTLS.
 
907
          TLS 1.1 is the protocol implemented by GnuTLS.
909
908
        </para>
910
909
      </listitem>
911
910
      </varlistentry>
922
921
      </varlistentry>
923
922
      <varlistentry>
924
923
        <term>
925
 
          RFC 6091: <citetitle>Using OpenPGP Keys for Transport Layer
 
924
          RFC 5081: <citetitle>Using OpenPGP Keys for Transport Layer
926
925
          Security</citetitle>
927
926
        </term>
928
927
      <listitem>