s4-scripting/devel: Fix repl_cleartext_pwd to use built-in RC4

This allows the usage test to pass on our CI hosts without
python-crypto and not uxsuccess on hosts with it.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Reviewed-by: Joseph Sutton <josephsutton@catalyst.net.nz>

diff --git a/selftest/knownfail.d/usage b/selftest/knownfail.d/usage
index b8e0bbc356d17edfc4df82453a7983e602f7e567..e7d707f0e7db13d30339e0f39f0165adb2982a25 100644 (file)
--- a/selftest/knownfail.d/usage
+++ b/selftest/knownfail.d/usage
@@ -5,7 +5,6 @@ samba.tests.usage.samba.tests.usage.PythonScriptHelpTests.test_ctdb_etcd_lock.no
 samba.tests.usage.samba.tests.usage.PythonScriptHelpTests.test_depfilter_py.none.
 samba.tests.usage.samba.tests.usage.PythonScriptHelpTests.test_dns_hub_py.none.
 samba.tests.usage.samba.tests.usage.PythonScriptHelpTests.test_gen_hresult_py.none.
-samba.tests.usage.samba.tests.usage.PythonScriptHelpTests.test_repl_cleartext_pwd_py.none.
 samba.tests.usage.samba.tests.usage.PythonScriptHelpTests.test_run_py.none.
 samba.tests.usage.samba.tests.usage.PythonScriptHelpTests.test_run_py_.none.
 samba.tests.usage.samba.tests.usage.PythonScriptHelpTests.test_smbstatus.none.
@@ -17,7 +16,6 @@ samba.tests.usage.samba.tests.usage.PythonScriptUsageTests.test_findprovisionusn
 samba.tests.usage.samba.tests.usage.PythonScriptUsageTests.test_machineaccountpw.none.
 samba.tests.usage.samba.tests.usage.PythonScriptUsageTests.test_rebuildextendeddn.none.
 samba.tests.usage.samba.tests.usage.PythonScriptUsageTests.test_renamedc.none.
-samba.tests.usage.samba.tests.usage.PythonScriptUsageTests.test_repl_cleartext_pwd_py.none.
 samba.tests.usage.samba.tests.usage.PythonScriptUsageTests.test_rodcdns.none.
 samba.tests.usage.samba.tests.usage.PythonScriptUsageTests.test_samba_gpupdate.none.
 samba.tests.usage.samba.tests.usage.PythonScriptUsageTests.test_samba_gpupdate_.none.

diff --git a/source4/scripting/devel/repl_cleartext_pwd.py b/source4/scripting/devel/repl_cleartext_pwd.py
index 64392919f5b18f1371ac2107f6e60f3041a50503..e6b8ba615f1947877d6f69b801f133444c534159 100755 (executable)
--- a/source4/scripting/devel/repl_cleartext_pwd.py
+++ b/source4/scripting/devel/repl_cleartext_pwd.py
@@ -46,10 +46,10 @@ from optparse import OptionParser
 
 from samba.dcerpc import drsuapi, drsblobs, misc
 from samba.ndr import ndr_pack, ndr_unpack, ndr_print
+from samba import arcfour_encrypt
 
 import binascii
 import hashlib
-import Crypto.Cipher.ARC4
 import struct
 import os
 
@@ -300,8 +300,8 @@ if __name__ == "__main__":
             m5.update(confounder)
             enc_key = m5.digest()
 
-            rc4 = Crypto.Cipher.ARC4.new(enc_key)
-            plain_buffer = rc4.decrypt(enc_buffer)
+            # RC4 encryption is the same as decryption
+            plain_buffer = arcfour_encrypt(enc_key, enc_buffer)
 
             (crc32_v) = struct.unpack("<L", plain_buffer[0:4])
             attr_val = plain_buffer[4:]