IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

ipaserver/dcerpc.py: use arcfour_encrypt from samba

Browse Source 
Samba Python bindings provide samba.arcfour_encrypt(key, data). Instead
of implementing own wrapper, use Samba's.

In future Samba versions this wrapper will be FIPS 140-2 compatible.

Fixes https://pagure.io/freeipa/issue/6697

Reviewed-By: Martin Babinsky <mbabinsk@redhat.com>
This commit is contained in:
Alexander Bokovoy 2017-03-10 16:47:02 +02:00 committed by Martin Babinsky
parent 5d3a0e6758
commit 7657754e02
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ipaserver/dcerpc.py
View File

@ -44,11 +44,10 @@ from samba import credentials
from samba.dcerpc import security, lsa, drsblobs, nbt, netlogon from samba.dcerpc import security, lsa, drsblobs, nbt, netlogon
from samba.ndr import ndr_pack, ndr_print from samba.ndr import ndr_pack, ndr_print
from samba import net from samba import net
from samba import arcfour_encrypt
import samba import samba
# pylint: enable=import-error # pylint: enable=import-error
from cryptography.hazmat.primitives.ciphers import Cipher, algorithms
from cryptography.hazmat.backends import default_backend
import ldap as _ldap import ldap as _ldap
from ipapython import ipaldap from ipapython import ipaldap
from dns import resolver, rdatatype from dns import resolver, rdatatype
@ -168,13 +167,6 @@ def assess_dcerpc_exception(num=None, message=None):
return errors.RemoteRetrieveError(reason=reason) return errors.RemoteRetrieveError(reason=reason)
def arcfour_encrypt(key, data):
algorithm = algorithms.ARC4(key)
cipher = Cipher(algorithm, mode=None, backend=default_backend())
encryptor = cipher.encryptor()
return encryptor.update(data)
class ExtendedDNControl(LDAPControl): class ExtendedDNControl(LDAPControl):
# This class attempts to implement LDAP control that would work # This class attempts to implement LDAP control that would work
# with both python-ldap 2.4.x and 2.3.x, thus there is mix of properties # with both python-ldap 2.4.x and 2.3.x, thus there is mix of properties