03_dont_generate_salt.patch (1014B)
1 diff --git a/expat/lib/xmlparse.c b/expat/lib/xmlparse.c 2 --- a/expat/lib/xmlparse.c 3 +++ b/expat/lib/xmlparse.c 4 @@ -796,6 +796,8 @@ static const XML_Char implicitContext[] 5 ASCII_s, ASCII_p, ASCII_a, ASCII_c, ASCII_e, 6 '\0'}; 7 8 +/* BEGIN MOZILLA CHANGE (we already set a salt through XML_SetHashSalt) */ 9 +#if 0 10 /* To avoid warnings about unused functions: */ 11 #if ! defined(HAVE_ARC4RANDOM_BUF) && ! defined(HAVE_ARC4RANDOM) 12 13 @@ -957,9 +959,13 @@ ENTROPY_DEBUG(const char *label, unsigne 14 } 15 return entropy; 16 } 17 +#endif 18 +/* END MOZILLA CHANGE */ 19 20 static unsigned long 21 generate_hash_secret_salt(XML_Parser parser) { 22 +/* BEGIN MOZILLA CHANGE (we already set a salt through XML_SetHashSalt) */ 23 +#if 0 24 unsigned long entropy; 25 (void)parser; 26 27 @@ -999,6 +1005,10 @@ generate_hash_secret_salt(XML_Parser par 28 entropy * (unsigned long)2305843009213693951ULL); 29 } 30 #endif 31 +#else 32 + abort(); 33 +#endif 34 +/* END MOZILLA CHANGE */ 35 } 36 37 static unsigned long