Signed-off-by: Rémi Bernon rbernon@codeweavers.com --- tools/widl/hash.c | 178 ++++++++++++++++++++++++++++++++++++++++++ tools/widl/hash.h | 14 ++++ tools/widl/parser.y | 6 +- tools/widl/typetree.c | 40 ++++++++++ tools/widl/typetree.h | 2 + 5 files changed, 236 insertions(+), 4 deletions(-)
diff --git a/tools/widl/hash.c b/tools/widl/hash.c index 15ec88001d6..df6133866e0 100644 --- a/tools/widl/hash.c +++ b/tools/widl/hash.c @@ -639,3 +639,181 @@ unsigned int lhash_val_of_name_sys( syskind_t skind, LCID lcid, LPCSTR lpStr)
return nHiWord | nLoWord; } + +/* SHA1 algorithm + * + * Based on public domain SHA code by Steve Reid steve@edmweb.com + */ + +#define rol(value, bits) (((value) << (bits)) | ((value) >> (32 - (bits)))) +/* FIXME: This definition of DWORD2BE is little endian specific! */ +#define DWORD2BE(x) (((x) >> 24) & 0xff) | (((x) >> 8) & 0xff00) | (((x) << 8) & 0xff0000) | (((x) << 24) & 0xff000000); +/* FIXME: This definition of blk0 is little endian specific! */ +#define blk0(i) (Block[i] = (rol(Block[i],24)&0xFF00FF00)|(rol(Block[i],8)&0x00FF00FF)) +#define blk1(i) (Block[i&15] = rol(Block[(i+13)&15]^Block[(i+8)&15]^Block[(i+2)&15]^Block[i&15],1)) +#define f1(x,y,z) (z^(x&(y^z))) +#define f2(x,y,z) (x^y^z) +#define f3(x,y,z) ((x&y)|(z&(x|y))) +#define f4(x,y,z) (x^y^z) +/* (R0+R1), R2, R3, R4 are the different operations used in SHA1 */ +#define R0(v,w,x,y,z,i) z+=f1(w,x,y)+blk0(i)+0x5A827999+rol(v,5);w=rol(w,30); +#define R1(v,w,x,y,z,i) z+=f1(w,x,y)+blk1(i)+0x5A827999+rol(v,5);w=rol(w,30); +#define R2(v,w,x,y,z,i) z+=f2(w,x,y)+blk1(i)+0x6ED9EBA1+rol(v,5);w=rol(w,30); +#define R3(v,w,x,y,z,i) z+=f3(w,x,y)+blk1(i)+0x8F1BBCDC+rol(v,5);w=rol(w,30); +#define R4(v,w,x,y,z,i) z+=f4(w,x,y)+blk1(i)+0xCA62C1D6+rol(v,5);w=rol(w,30); + +/* Hash a single 512-bit block. This is the core of the algorithm. */ +static void SHA1Transform(ULONG State[5], UCHAR Buffer[64]) +{ + ULONG a, b, c, d, e; + ULONG *Block; + + Block = (ULONG*)Buffer; + + /* Copy Context->State[] to working variables */ + a = State[0]; + b = State[1]; + c = State[2]; + d = State[3]; + e = State[4]; + + /* 4 rounds of 20 operations each. Loop unrolled. */ + R0(a,b,c,d,e, 0); R0(e,a,b,c,d, 1); R0(d,e,a,b,c, 2); R0(c,d,e,a,b, 3); + R0(b,c,d,e,a, 4); R0(a,b,c,d,e, 5); R0(e,a,b,c,d, 6); R0(d,e,a,b,c, 7); + R0(c,d,e,a,b, 8); R0(b,c,d,e,a, 9); R0(a,b,c,d,e,10); R0(e,a,b,c,d,11); + R0(d,e,a,b,c,12); R0(c,d,e,a,b,13); R0(b,c,d,e,a,14); R0(a,b,c,d,e,15); + R1(e,a,b,c,d,16); R1(d,e,a,b,c,17); R1(c,d,e,a,b,18); R1(b,c,d,e,a,19); + R2(a,b,c,d,e,20); R2(e,a,b,c,d,21); R2(d,e,a,b,c,22); R2(c,d,e,a,b,23); + R2(b,c,d,e,a,24); R2(a,b,c,d,e,25); R2(e,a,b,c,d,26); R2(d,e,a,b,c,27); + R2(c,d,e,a,b,28); R2(b,c,d,e,a,29); R2(a,b,c,d,e,30); R2(e,a,b,c,d,31); + R2(d,e,a,b,c,32); R2(c,d,e,a,b,33); R2(b,c,d,e,a,34); R2(a,b,c,d,e,35); + R2(e,a,b,c,d,36); R2(d,e,a,b,c,37); R2(c,d,e,a,b,38); R2(b,c,d,e,a,39); + R3(a,b,c,d,e,40); R3(e,a,b,c,d,41); R3(d,e,a,b,c,42); R3(c,d,e,a,b,43); + R3(b,c,d,e,a,44); R3(a,b,c,d,e,45); R3(e,a,b,c,d,46); R3(d,e,a,b,c,47); + R3(c,d,e,a,b,48); R3(b,c,d,e,a,49); R3(a,b,c,d,e,50); R3(e,a,b,c,d,51); + R3(d,e,a,b,c,52); R3(c,d,e,a,b,53); R3(b,c,d,e,a,54); R3(a,b,c,d,e,55); + R3(e,a,b,c,d,56); R3(d,e,a,b,c,57); R3(c,d,e,a,b,58); R3(b,c,d,e,a,59); + R4(a,b,c,d,e,60); R4(e,a,b,c,d,61); R4(d,e,a,b,c,62); R4(c,d,e,a,b,63); + R4(b,c,d,e,a,64); R4(a,b,c,d,e,65); R4(e,a,b,c,d,66); R4(d,e,a,b,c,67); + R4(c,d,e,a,b,68); R4(b,c,d,e,a,69); R4(a,b,c,d,e,70); R4(e,a,b,c,d,71); + R4(d,e,a,b,c,72); R4(c,d,e,a,b,73); R4(b,c,d,e,a,74); R4(a,b,c,d,e,75); + R4(e,a,b,c,d,76); R4(d,e,a,b,c,77); R4(c,d,e,a,b,78); R4(b,c,d,e,a,79); + + /* Add the working variables back into Context->State[] */ + State[0] += a; + State[1] += b; + State[2] += c; + State[3] += d; + State[4] += e; + + /* Wipe variables */ + a = b = c = d = e = 0; +} + + +/****************************************************************************** + * A_SHAInit (ntdll.@) + * + * Initialize a SHA context structure. + * + * PARAMS + * Context [O] SHA context + * + * RETURNS + * Nothing + */ +void A_SHAInit(SHA_CTX *Context) +{ + /* SHA1 initialization constants */ + Context->State[0] = 0x67452301; + Context->State[1] = 0xEFCDAB89; + Context->State[2] = 0x98BADCFE; + Context->State[3] = 0x10325476; + Context->State[4] = 0xC3D2E1F0; + Context->Count[0] = + Context->Count[1] = 0; +} + +/****************************************************************************** + * A_SHAUpdate (ntdll.@) + * + * Update a SHA context with a hashed data from supplied buffer. + * + * PARAMS + * Context [O] SHA context + * Buffer [I] hashed data + * BufferSize [I] hashed data size + * + * RETURNS + * Nothing + */ +void A_SHAUpdate(SHA_CTX *Context, const unsigned char *Buffer, UINT BufferSize) +{ + ULONG BufferContentSize; + + BufferContentSize = Context->Count[1] & 63; + Context->Count[1] += BufferSize; + if (Context->Count[1] < BufferSize) + Context->Count[0]++; + Context->Count[0] += (BufferSize >> 29); + + if (BufferContentSize + BufferSize < 64) + { + RtlCopyMemory(&Context->Buffer[BufferContentSize], Buffer, + BufferSize); + } + else + { + while (BufferContentSize + BufferSize >= 64) + { + RtlCopyMemory(Context->Buffer + BufferContentSize, Buffer, + 64 - BufferContentSize); + Buffer += 64 - BufferContentSize; + BufferSize -= 64 - BufferContentSize; + SHA1Transform(Context->State, Context->Buffer); + BufferContentSize = 0; + } + RtlCopyMemory(Context->Buffer + BufferContentSize, Buffer, BufferSize); + } +} + +/****************************************************************************** + * A_SHAFinal (ntdll.@) + * + * Finalize SHA context and return the resulting hash. + * + * PARAMS + * Context [I/O] SHA context + * Result [O] resulting hash + * + * RETURNS + * Nothing + */ +void A_SHAFinal(SHA_CTX *Context, PULONG Result) +{ + INT Pad, Index; + UCHAR Buffer[72]; + ULONG *Count; + ULONG BufferContentSize, LengthHi, LengthLo; + + BufferContentSize = Context->Count[1] & 63; + if (BufferContentSize >= 56) + Pad = 56 + 64 - BufferContentSize; + else + Pad = 56 - BufferContentSize; + + LengthHi = (Context->Count[0] << 3) | (Context->Count[1] >> (32 - 3)); + LengthLo = (Context->Count[1] << 3); + + RtlZeroMemory(Buffer + 1, Pad - 1); + Buffer[0] = 0x80; + Count = (ULONG*)(Buffer + Pad); + Count[0] = DWORD2BE(LengthHi); + Count[1] = DWORD2BE(LengthLo); + A_SHAUpdate(Context, Buffer, Pad + 8); + + for (Index = 0; Index < 5; Index++) + Result[Index] = DWORD2BE(Context->State[Index]); + + A_SHAInit(Context); +} diff --git a/tools/widl/hash.h b/tools/widl/hash.h index 3c2fd2914bf..208b193ac87 100644 --- a/tools/widl/hash.h +++ b/tools/widl/hash.h @@ -22,6 +22,20 @@ #ifndef __WIDL_HASH_H #define __WIDL_HASH_H
+#include "windef.h" + extern unsigned int lhash_val_of_name_sys( syskind_t skind, LCID lcid, LPCSTR lpStr);
+typedef struct +{ + ULONG Unknown[6]; + ULONG State[5]; + ULONG Count[2]; + UCHAR Buffer[64]; +} SHA_CTX; + +VOID A_SHAInit(SHA_CTX *ctx); +VOID A_SHAUpdate(SHA_CTX *ctx, const UCHAR *buffer, UINT size); +VOID A_SHAFinal(SHA_CTX *ctx, PULONG result); + #endif diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 57e7809fc1a..4c115adf4ab 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -45,13 +45,11 @@ struct _import_t };
static str_list_t *append_str(str_list_t *list, char *str); -static attr_list_t *append_attr(attr_list_t *list, attr_t *attr); static attr_list_t *append_attr_list(attr_list_t *new_list, attr_list_t *old_list); static decl_spec_t *make_decl_spec(type_t *type, decl_spec_t *left, decl_spec_t *right, enum storage_class stgclass, enum type_qualifier qual, enum function_specifier func_specifier); static attr_t *make_attr(enum attr_type type); static attr_t *make_attrv(enum attr_type type, unsigned int val); -static attr_t *make_attrp(enum attr_type type, void *val); static attr_t *make_custom_attr(UUID *id, expr_t *pval); static expr_list_t *append_expr(expr_list_t *list, expr_t *expr); static var_t *declare_var(attr_list_t *attrs, decl_spec_t *decl_spec, declarator_t *decl, int top); @@ -1507,7 +1505,7 @@ static attr_t *make_attrv(enum attr_type type, unsigned int val) return a; }
-static attr_t *make_attrp(enum attr_type type, void *val) +attr_t *make_attrp(enum attr_type type, void *val) { attr_t *a = xmalloc(sizeof(attr_t)); a->type = type; @@ -2407,7 +2405,7 @@ struct allowed_attr allowed_attr[] = /* ATTR_WIREMARSHAL */ { 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "wire_marshal" }, };
-static attr_list_t *append_attr(attr_list_t *list, attr_t *attr) +attr_list_t *append_attr(attr_list_t *list, attr_t *attr) { attr_t *attr_existing; if (!attr) return list; diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index 3db88945058..9a2d3f3c053 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -29,6 +29,7 @@ #include "parser.h" #include "typetree.h" #include "header.h" +#include "hash.h"
type_t *duptype(type_t *t, int dupname) { @@ -1144,6 +1145,44 @@ type_t *type_parameterized_type_specialize_declare(type_t *type, typeref_list_t return new_type; }
+static void compute_interface_signature_uuid(type_t *iface) +{ + static unsigned char const wrt_pinterface_namespace[] = {0x11,0xf4,0x7a,0xd5,0x7b,0x73,0x42,0xc0,0xab,0xae,0x87,0x8b,0x1e,0x16,0xad,0xee}; + static const int version = 5; + unsigned char hash[20]; + SHA_CTX sha_ctx; + GUID *uuid; + + if (!(uuid = get_attrp(iface->attrs, ATTR_UUID))) + { + uuid = xmalloc(sizeof(GUID)); + iface->attrs = append_attr(iface->attrs, make_attrp(ATTR_UUID, uuid)); + } + + A_SHAInit(&sha_ctx); + A_SHAUpdate(&sha_ctx, wrt_pinterface_namespace, sizeof(wrt_pinterface_namespace)); + A_SHAUpdate(&sha_ctx, (const UCHAR *)iface->signature, strlen(iface->signature)); + A_SHAFinal(&sha_ctx, (ULONG *)hash); + + /* https://tools.ietf.org/html/rfc4122: + + * Set the four most significant bits (bits 12 through 15) of the + time_hi_and_version field to the appropriate 4-bit version number + from Section 4.1.3. + + * Set the two most significant bits (bits 6 and 7) of the + clock_seq_hi_and_reserved to zero and one, respectively. + */ + + hash[6] = ((hash[6] & 0x0f) | (version << 4)); + hash[8] = ((hash[8] & 0x3f) | 0x80); + + uuid->Data1 = ((DWORD)hash[0] << 24)|((DWORD)hash[1] << 16)|((DWORD)hash[2] << 8)|(DWORD)hash[3]; + uuid->Data2 = ((WORD)hash[4] << 8)|(WORD)hash[5]; + uuid->Data3 = ((WORD)hash[6] << 8)|(WORD)hash[7]; + memcpy(&uuid->Data4, hash + 8, sizeof(*uuid) - offsetof(GUID, Data4)); +} + type_t *type_parameterized_type_specialize_define(type_t *type) { type_t *tmpl = type->details.parameterized.type; @@ -1174,6 +1213,7 @@ type_t *type_parameterized_type_specialize_define(type_t *type) iface->signature = format_parameterized_type_signature(type, repl); iface->defined = TRUE; } + compute_interface_signature_uuid(iface); compute_method_indexes(iface); return iface; } diff --git a/tools/widl/typetree.h b/tools/widl/typetree.h index 8130174fe2a..c8bccc2fec9 100644 --- a/tools/widl/typetree.h +++ b/tools/widl/typetree.h @@ -80,6 +80,8 @@ extern int is_attr(const attr_list_t *list, enum attr_type t);
typeref_t *make_typeref(type_t *type); typeref_list_t *append_typeref(typeref_list_t *list, typeref_t *ref); +attr_t *make_attrp(enum attr_type type, void *val); +attr_list_t *append_attr(attr_list_t *list, attr_t *attr);
/* FIXME: shouldn't need to export this */ type_t *duptype(type_t *t, int dupname);