Attachment #511518 for bug #611650

View | Details | Raw Unified | Return to bug 611650
Collapse All | Expand All

Lines 90-96 Link Here

(-)setup.py (-1 / +1 lines)
90	print("failed to update build_info: %s" % e)	90	print("failed to update build_info: %s" % e)
91		91
92	packages=['winswitch', 'winswitch.fs', 'winswitch.objects', 'winswitch.util', 'winswitch.net', 'winswitch.ui', 'winswitch.server', 'winswitch.client', 'winswitch.virt', 'winswitch.sound', 'winswitch.twisted']	92	packages=['winswitch', 'winswitch.fs', 'winswitch.objects', 'winswitch.util', 'winswitch.net', 'winswitch.ui', 'winswitch.server', 'winswitch.client', 'winswitch.virt', 'winswitch.sound', 'winswitch.twisted']
93	install_requires=['pycrypto', 'twisted', 'netifaces', 'pam', 'pyasn1']	93	install_requires=['pycryptodome', 'twisted', 'netifaces', 'pam', 'pyasn1']
94		94
95		95
96	#not included by default in python 2.4:	96	#not included by default in python 2.4:

Lines 20-27 Link Here

(-)winswitch/net/conch_util.py (-2 lines)
20	# import those here so we can find out if that is causing the crash:	20	# import those here so we can find out if that is causing the crash:
21	debug_import("Crypto")	21	debug_import("Crypto")
22	from Crypto import Util	22	from Crypto import Util
23	from Crypto.Cipher import XOR
24	assert Util is not None and XOR is not None
25		23
26	debug_import("twisted.conch.ssh")	24	debug_import("twisted.conch.ssh")
27	from twisted.conch.ssh import transport, userauth, connection, keys, forwarding, common	25	from twisted.conch.ssh import transport, userauth, connection, keys, forwarding, common

Return to bug 611650