Index: setup.py
===================================================================
--- setup.py	(revision 5430)
+++ setup.py	(working copy)
@@ -90,7 +90,7 @@
 	print("failed to update build_info: %s" % e)
 
 packages=['winswitch', 'winswitch.fs', 'winswitch.objects', 'winswitch.util', 'winswitch.net', 'winswitch.ui', 'winswitch.server', 'winswitch.client', 'winswitch.virt', 'winswitch.sound', 'winswitch.twisted']
-install_requires=['pycrypto', 'twisted', 'netifaces', 'pam', 'pyasn1']
+install_requires=['pycryptodome', 'twisted', 'netifaces', 'pam', 'pyasn1']
 
 
 #not included by default in python 2.4:
Index: winswitch/net/conch_util.py
===================================================================
--- winswitch/net/conch_util.py	(revision 5430)
+++ winswitch/net/conch_util.py	(working copy)
@@ -20,8 +20,6 @@
 # import those here so we can find out if that is causing the crash:
 debug_import("Crypto")
 from Crypto import Util
-from Crypto.Cipher import XOR
-assert Util is not None and XOR is not None
 
 debug_import("twisted.conch.ssh")
 from twisted.conch.ssh import transport, userauth, connection, keys, forwarding, common