summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2007-02-10 09:46:28 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:44:56 -0500
commite2821c42385d67ea3d57e442000d008e66e96dd7 (patch)
treedcd7522e77fde6254588c008ed0dd0db307a5814 /source4
parentc58ab36d081be6dafe0ae5d1c92075857ab90b2d (diff)
downloadsamba-e2821c42385d67ea3d57e442000d008e66e96dd7.tar.gz
samba-e2821c42385d67ea3d57e442000d008e66e96dd7.tar.bz2
samba-e2821c42385d67ea3d57e442000d008e66e96dd7.zip
r21267: the first 4 bytes in each encrypted attribute is the crc32
checksum over the remaining bytes metze (This used to be commit c9fe6a867c7e23a60e0f9200b04c31e48ccc11a2)
Diffstat (limited to 'source4')
-rw-r--r--source4/torture/rpc/dssync.c39
1 files changed, 30 insertions, 9 deletions
diff --git a/source4/torture/rpc/dssync.c b/source4/torture/rpc/dssync.c
index 063b37c617..0f07c51516 100644
--- a/source4/torture/rpc/dssync.c
+++ b/source4/torture/rpc/dssync.c
@@ -345,6 +345,11 @@ static DATA_BLOB decrypt_blob(TALLOC_CTX *mem_ctx,
DATA_BLOB enc_key;
DATA_BLOB dec_buffer;
+
+ uint32_t crc32_given;
+ uint32_t crc32_calc;
+ DATA_BLOB checked_buffer;
+
DATA_BLOB plain_buffer;
/*
@@ -382,6 +387,26 @@ static DATA_BLOB decrypt_blob(TALLOC_CTX *mem_ctx,
}
arcfour_crypt_blob(dec_buffer.data, dec_buffer.length, &enc_key);
+ /*
+ * the first 4 byte are the crc32 checksum
+ * of the remaining bytes
+ */
+ if (dec_buffer.length < 4) {
+ return data_blob_const(NULL, 0);
+ }
+
+ crc32_given = IVAL(dec_buffer.data, 0);
+ crc32_calc = crc32_calc_buffer(dec_buffer.data + 4 , dec_buffer.length - 4);
+ if (crc32_given != crc32_calc) {
+ DEBUG(0,("CRC32: given[0x%08X] calc[0x%08X]\n",
+ crc32_given, crc32_calc));
+ return data_blob_const(NULL, 0);
+ }
+ checked_buffer = data_blob_talloc(mem_ctx, dec_buffer.data + 4, dec_buffer.length - 4);
+ if (!checked_buffer.data) {
+ return data_blob_const(NULL, 0);
+ }
+
/*
* some attributes seem to be in a usable form after this decryption
* (supplementalCredentials, priorValue, currentValue, trustAuthOutgoing,
@@ -393,18 +418,14 @@ static DATA_BLOB decrypt_blob(TALLOC_CTX *mem_ctx,
* dBCSPwd, unicodePwd, ntPwdHistory, lmPwdHistory
*
* it's the sam_rid_crypt() function, as the value is constant,
- * so it doesn't depend on sessionkeys. But for the unicodePwd attribute
- * which contains the nthash has 20 bytes at this point.
- *
- * the first 4 byte are unknown yet, but the last 16 byte are the
- * rid crypted hash.
+ * so it doesn't depend on sessionkeys.
*/
if (rcrypt) {
- plain_buffer = data_blob_talloc(mem_ctx, dec_buffer.data, dec_buffer.length);
+ plain_buffer = data_blob_talloc(mem_ctx, checked_buffer.data, checked_buffer.length);
if (!plain_buffer.data) {
return data_blob_const(NULL, 0);
}
- if (plain_buffer.length < 20) {
+ if (plain_buffer.length < 16) {
return data_blob_const(NULL, 0);
}
/*
@@ -414,9 +435,9 @@ static DATA_BLOB decrypt_blob(TALLOC_CTX *mem_ctx,
* for each hash, but here we assume the rid des key is shifted
* by one for each 8 byte block.
*/
- sam_rid_crypt_len(rid, dec_buffer.length - 4, dec_buffer.data + 4, plain_buffer.data + 4, 0);
+ sam_rid_crypt_len(rid, checked_buffer.length, checked_buffer.data, plain_buffer.data, 0);
} else {
- plain_buffer = dec_buffer;
+ plain_buffer = checked_buffer;
}
return plain_buffer;