Merge commit 'b2f0f37d242f1194fe1f886557cf6cefdf98caf6'

* commit 'b2f0f37d242f1194fe1f886557cf6cefdf98caf6':
  rtmpdh: Generate the whole private exponent using av_get_random_seed() with nettle/gmp

Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavformat/rtmpdh.c

@@ -81,13 +81,15 @@
             ret = 1;                                \
     } while (0)
 #define bn_modexp(bn, y, q, p)      mpz_powm(bn, y, q, p)
-#define bn_random(bn, num_bits)                     \
+#define bn_random(bn, num_bits)                       \
-    do {                                            \
+    do {                                              \
-        gmp_randstate_t rs;                         \
+        int bits = num_bits;                          \
-        gmp_randinit_mt(rs);                        \
+        mpz_set_ui(bn, 0);                            \
-        gmp_randseed_ui(rs, av_get_random_seed());  \
+        for (bits = num_bits; bits > 0; bits -= 32) { \
-        mpz_urandomb(bn, rs, num_bits);             \
+            mpz_mul_2exp(bn, bn, 32);                 \
-        gmp_randclear(rs);                          \
+            mpz_add_ui(bn, bn, av_get_random_seed()); \
+        }                                             \
+        mpz_fdiv_r_2exp(bn, bn, num_bits);            \
     } while (0)
 #elif CONFIG_GCRYPT
 #define bn_new(bn)                  bn = gcry_mpi_new(1)