/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-ctl

  • Committer: teddy at recompile
  • Date: 2020-02-09 03:54:46 UTC
  • Revision ID: teddy@recompile.se-20200209035446-kud6h0l6u30lo10h
Makefile: fix targets run-server & run-client with GnuTLS 3.5.9

* Makefile (keydir/tls-privkey.pem keydir/tls-pubkey.pem): If the TLS
  session keys were not generated by mandos-keygen (which will happen
  with GnuTLS version 3.5.9 or older), create dummy empty unused files
  to avoid confusing make(1), which would otherwise re-run this target
  and create new OpenPGP key files which would not match the key
  fingerprint in the confdir/clients.conf file.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1632
1632
        finally:
1633
1633
            dbus_logger.removeFilter(counting_handler)
1634
1634
 
1635
 
        self.assertNotIsInstance(e, dbus.ConnectFailed)
 
1635
        self.assertNotIsInstance(e.exception, dbus.ConnectFailed)
1636
1636
 
1637
1637
        # Make sure the dbus logger was suppressed
1638
1638
        self.assertEqual(0, counting_handler.count)
1775
1775
            self.call_method(bus, "methodname", "busname",
1776
1776
                             "objectpath", "interface")
1777
1777
 
1778
 
        self.assertNotIsInstance(e, dbus.ConnectFailed)
 
1778
        self.assertNotIsInstance(e.exception, dbus.ConnectFailed)
1779
1779
 
1780
1780
    def test_get_converts_to_correct_exception(self):
1781
1781
        bus = pydbus_adapter.SystemBus(