Merge branch 'standalone-master' into standalone-renamencr-standalone-rename

Conflicts:
	crypto/userspace/libtomcrypt/misc/qsort.c
	crypto/userspace/libtommath/bn_mp_and.c
	crypto/userspace/libtommath/bn_mp_exteuclid.c
	crypto/userspace/libtommath/bn_mp_jacobi.c
	crypto/userspace/libtommath/bn_mp_or.c
	crypto/userspace/libtommath/bn_mp_prime_fermat.c
	crypto/userspace/libtommath/bn_mp_radix_size.c
	crypto/userspace/libtommath/bn_mp_radix_smap.c
	crypto/userspace/libtommath/bn_mp_read_radix.c
	crypto/userspace/libtommath/bn_mp_sqrt.c
	crypto/userspace/libtommath/bn_mp_toradix.c
	crypto/userspace/libtommath/bn_mp_toradix_n.c
	crypto/userspace/libtommath/bn_mp_xor.c
	examples/Makefile
	examples/ncr.c
	examples/pk.c

1 files changed, 1 insertions, 1 deletions

diff --git a/crypto/userspace/libtommath/bn_mp_div.c b/crypto/userspace/libtommath/bn_mp_div.c
index aee9c94324d..723c8b503dd 100644
--- a/crypto/userspace/libtommath/bn_mp_div.c
+++ b/crypto/userspace/libtommath/bn_mp_div.c
@@ -195,7 +195,7 @@ int mp_div (mp_int * a, mp_int * b, mp_int * c, mp_int * d)
       mp_word tmp;
       tmp = ((mp_word) x.dp[i]) << ((mp_word) DIGIT_BIT);
       tmp |= ((mp_word) x.dp[i - 1]);
-      tmp /= ((mp_word) y.dp[t]);
+      tmp = word_div_int(tmp, (int)y.dp[t]);
       if (tmp > (mp_word) MP_MASK)
         tmp = MP_MASK;
       q.dp[i - t - 1] = (mp_digit) (tmp & (mp_word) (MP_MASK));