diff options
author | Alexander Bokovoy <abokovoy@redhat.com> | 2012-11-21 18:33:49 +0200 |
---|---|---|
committer | Rob Crittenden <rcritten@redhat.com> | 2012-11-21 11:57:15 -0500 |
commit | 7960b5c67f0577e305d9fd86564b19957872d0e3 (patch) | |
tree | 687c966d255966341b6198fbfded7cd5d6e7c51b /ipaserver | |
parent | f1f1b4e7f2e9c1838ad7ec76002b78ca0c2a3c46 (diff) | |
download | freeipa-7960b5c67f0577e305d9fd86564b19957872d0e3.tar.gz freeipa-7960b5c67f0577e305d9fd86564b19957872d0e3.tar.xz freeipa-7960b5c67f0577e305d9fd86564b19957872d0e3.zip |
trusts: replace use of python-crypto by m2crypto
python-crypto package is not available everywhere, use m2crypto instead.
Originally we thought to extend python-krbV to provide krb5_c_encrypt()
wrapper but m2crypto is readily available.
https://fedorahosted.org/freeipa/ticket/3271
Diffstat (limited to 'ipaserver')
-rw-r--r-- | ipaserver/dcerpc.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ipaserver/dcerpc.py b/ipaserver/dcerpc.py index 4eddbcdc3..68b5ad528 100644 --- a/ipaserver/dcerpc.py +++ b/ipaserver/dcerpc.py @@ -41,7 +41,7 @@ from samba.ndr import ndr_pack from samba import net import samba import random -from Crypto.Cipher import ARC4 +from M2Crypto import RC4 try: from ldap.controls import RequestControl as LDAPControl #pylint: disable=F0401 except ImportError: @@ -526,8 +526,8 @@ class TrustDomainInstance(object): def generate_auth(self, trustdom_secret): def arcfour_encrypt(key, data): - c = ARC4.new(key) - return c.encrypt(data) + c = RC4.RC4(key) + return c.update(data) def string_to_array(what): blob = [0] * len(what) |