diff options
| author | Volker Lendecke <vl@samba.org> | 2018-10-09 11:40:17 +0200 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2018-10-09 22:32:12 +0200 |
| commit | dfa51233aa1dbfbfa2a2af21a0fa1750c8b8024c (patch) | |
| tree | ce47e845cb21c1a0931503b24e0438c983f02e37 /libcli | |
| parent | 9e26f6ded2938fef8f46df4b91bdd8554fcb6a64 (diff) | |
| download | samba-dfa51233aa1dbfbfa2a2af21a0fa1750c8b8024c.tar.gz | |
drsuapi: Use the zlib version of crc32
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'libcli')
| -rw-r--r-- | libcli/drsuapi/repl_decrypt.c | 12 | ||||
| -rw-r--r-- | libcli/drsuapi/wscript_build | 2 |
2 files changed, 10 insertions, 4 deletions
diff --git a/libcli/drsuapi/repl_decrypt.c b/libcli/drsuapi/repl_decrypt.c index c370f2e3bf5..1480791abcd 100644 --- a/libcli/drsuapi/repl_decrypt.c +++ b/libcli/drsuapi/repl_decrypt.c @@ -25,7 +25,9 @@ #include "librpc/gen_ndr/ndr_misc.h" #include "librpc/gen_ndr/ndr_drsuapi.h" #include "librpc/gen_ndr/ndr_drsblobs.h" -#include "../lib/crypto/crypto.h" +#include "../lib/crypto/md5.h" +#include "../lib/crypto/arcfour.h" +#include "zlib.h" #include "../libcli/drsuapi/drsuapi.h" #include "libcli/auth/libcli_auth.h" #include "dsdb/samdb/samdb.h" @@ -94,7 +96,10 @@ WERROR drsuapi_decrypt_attribute_value(TALLOC_CTX *mem_ctx, * of the remaining bytes */ crc32_given = IVAL(dec_buffer.data, 0); - crc32_calc = crc32_calc_buffer(dec_buffer.data + 4 , dec_buffer.length - 4); + crc32_calc = crc32(0, Z_NULL, 0); + crc32_calc = crc32(crc32_calc, + dec_buffer.data + 4 , + dec_buffer.length - 4); checked_buffer = data_blob_const(dec_buffer.data + 4, dec_buffer.length - 4); plain_buffer = data_blob_talloc(mem_ctx, checked_buffer.data, checked_buffer.length); @@ -278,7 +283,8 @@ static WERROR drsuapi_encrypt_attribute_value(TALLOC_CTX *mem_ctx, * the first 4 byte are the crc32 checksum * of the remaining bytes */ - crc32_calc = crc32_calc_buffer(in->data, in->length); + crc32_calc = crc32(0, Z_NULL, 0); + crc32_calc = crc32(crc32_calc, in->data, in->length); SIVAL(enc_buffer.data, 16, crc32_calc); /* diff --git a/libcli/drsuapi/wscript_build b/libcli/drsuapi/wscript_build index af57c639f3b..136a22f8ced 100644 --- a/libcli/drsuapi/wscript_build +++ b/libcli/drsuapi/wscript_build @@ -3,6 +3,6 @@ bld.SAMBA_SUBSYSTEM('LIBCLI_DRSUAPI', source='repl_decrypt.c', - public_deps='LIBCLI_AUTH samdb' + public_deps='LIBCLI_AUTH samdb z' ) |