Signed-off-by: Rémi Bernon rbernon@codeweavers.com ---
Updating only this patch with the SHA1 code adaptation to WIDL style. I also added a WORDS_BIGENDIAN check for DWORD2BE portability.
tools/widl/hash.c | 133 ++++++++++++++++++++++++++++++++++++++++++ tools/widl/hash.h | 13 +++++ tools/widl/parser.y | 6 +- tools/widl/typetree.c | 40 +++++++++++++ tools/widl/typetree.h | 2 + 5 files changed, 190 insertions(+), 4 deletions(-)
diff --git a/tools/widl/hash.c b/tools/widl/hash.c index 15ec88001d6..70ef11545c8 100644 --- a/tools/widl/hash.c +++ b/tools/widl/hash.c @@ -639,3 +639,136 @@ 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 + * Copied and adapted from ntdll.sha1_init / ntdll.A_SHAUpdate / ntdll.A_SHAFinal + */ + +#ifdef WORDS_BIGENDIAN +#define DWORD2BE(x) (x) +#else +#define DWORD2BE(x) ((((x) >> 24) & 0xff) | (((x) >> 8) & 0xff00) | (((x) << 8) & 0xff0000) | (((x) << 24) & 0xff000000)) +#endif + +#define rol(value, bits) (((value) << (bits)) | ((value) >> (32 - (bits)))) +#define blk0(i) (block[i] = DWORD2BE(block[i])) +#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 sha1_transform(struct sha1_context *ctx) +{ + DWORD a, b, c, d, e, *block = (DWORD *)ctx->buffer; + + /* Copy ctx->state[] to working variables */ + a = ctx->state[0]; + b = ctx->state[1]; + c = ctx->state[2]; + d = ctx->state[3]; + e = ctx->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 ctx->state[] */ + ctx->state[0] += a; + ctx->state[1] += b; + ctx->state[2] += c; + ctx->state[3] += d; + ctx->state[4] += e; + + /* Wipe variables */ + a = b = c = d = e = 0; +} + +void sha1_init(struct sha1_context *ctx) +{ + /* SHA1 initialization constants */ + ctx->state[0] = 0x67452301; + ctx->state[1] = 0xEFCDAB89; + ctx->state[2] = 0x98BADCFE; + ctx->state[3] = 0x10325476; + ctx->state[4] = 0xC3D2E1F0; + ctx->count[0] = 0; + ctx->count[1] = 0; +} + +void sha1_update(struct sha1_context *ctx, const char *data, size_t data_size) +{ + size_t buffer_size; + + buffer_size = ctx->count[1] & 63; + ctx->count[1] += data_size; + if (ctx->count[1] < data_size) ctx->count[0]++; + ctx->count[0] += (data_size >> 29); + + if (buffer_size + data_size < 64) + memcpy(&ctx->buffer[buffer_size], data, data_size); + else + { + while (buffer_size + data_size >= 64) + { + memcpy(ctx->buffer + buffer_size, data, 64 - buffer_size); + data += 64 - buffer_size; + data_size -= 64 - buffer_size; + sha1_transform(ctx); + buffer_size = 0; + } + memcpy(ctx->buffer + buffer_size, data, data_size); + } +} + +void sha1_finalize(struct sha1_context *ctx, DWORD result[5]) +{ + unsigned int *count, length_hi, length_lo, i; + size_t pad_size, buffer_size; + char pad[72]; + + buffer_size = ctx->count[1] & 63; + if (buffer_size >= 56) pad_size = 56 + 64 - buffer_size; + else pad_size = 56 - buffer_size; + + length_hi = (ctx->count[0] << 3) | (ctx->count[1] >> (32 - 3)); + length_lo = (ctx->count[1] << 3); + + memset(pad + 1, 0, pad_size - 1); + pad[0] = 0x80; + count = (unsigned int*)(pad + pad_size); + count[0] = DWORD2BE(length_hi); + count[1] = DWORD2BE(length_lo); + sha1_update(ctx, pad, pad_size + 8); + + for (i = 0; i < 5; i++) result[i] = DWORD2BE(ctx->state[i]); + + sha1_init(ctx); +} diff --git a/tools/widl/hash.h b/tools/widl/hash.h index 3c2fd2914bf..f62fe5e25b5 100644 --- a/tools/widl/hash.h +++ b/tools/widl/hash.h @@ -22,6 +22,19 @@ #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);
+struct sha1_context +{ + DWORD state[5]; + DWORD count[2]; + char buffer[64]; +}; + +void sha1_init(struct sha1_context *ctx); +void sha1_update(struct sha1_context *ctx, const char *data, size_t data_size); +void sha1_finalize(struct sha1_context *ctx, DWORD hash[5]); + #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..9d0b5576d45 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 const char winrt_pinterface_namespace[] = {0x11,0xf4,0x7a,0xd5,0x7b,0x73,0x42,0xc0,0xab,0xae,0x87,0x8b,0x1e,0x16,0xad,0xee}; + static const int version = 5; + struct sha1_context ctx; + unsigned char hash[20]; + 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)); + } + + sha1_init(&ctx); + sha1_update(&ctx, winrt_pinterface_namespace, sizeof(winrt_pinterface_namespace)); + sha1_update(&ctx, iface->signature, strlen(iface->signature)); + sha1_finalize(&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);