diff options
Diffstat (limited to 'libavformat')
-rw-r--r-- | libavformat/rtmpdh.c | 13 | ||||
-rw-r--r-- | libavformat/rtmpdh.h | 5 |
2 files changed, 11 insertions, 7 deletions
diff --git a/libavformat/rtmpdh.c b/libavformat/rtmpdh.c index 12a64bcdd9..df06bece2f 100644 --- a/libavformat/rtmpdh.c +++ b/libavformat/rtmpdh.c @@ -46,8 +46,8 @@ "F71C35FDAD44CFD2D74F9208BE258FF324943328F67329C0" \ "FFFFFFFFFFFFFFFF" -#if CONFIG_NETTLE || CONFIG_GCRYPT -#if CONFIG_NETTLE +#if CONFIG_GMP || CONFIG_GCRYPT +#if CONFIG_GMP #define bn_new(bn) \ do { \ bn = av_malloc(sizeof(*bn)); \ @@ -65,12 +65,17 @@ #define bn_sub_word(bn, w) mpz_sub_ui(bn, bn, w) #define bn_cmp_1(bn) mpz_cmp_ui(bn, 1) #define bn_num_bytes(bn) (mpz_sizeinbase(bn, 2) + 7) / 8 -#define bn_bn2bin(bn, buf, len) nettle_mpz_get_str_256(len, buf, bn) +#define bn_bn2bin(bn, buf, len) \ + do { \ + memset(buf, 0, len); \ + if (bn_num_bytes(bn) <= len) \ + mpz_export(buf, NULL, 1, 1, 0, 0, bn); \ + } while (0) #define bn_bin2bn(bn, buf, len) \ do { \ bn_new(bn); \ if (bn) \ - nettle_mpz_set_str_256_u(bn, len, buf); \ + mpz_import(bn, len, 1, 1, 0, 0, buf); \ } while (0) #define bn_hex2bn(bn, buf, ret) \ do { \ diff --git a/libavformat/rtmpdh.h b/libavformat/rtmpdh.h index eab0b4adc8..21ad13ea16 100644 --- a/libavformat/rtmpdh.h +++ b/libavformat/rtmpdh.h @@ -25,10 +25,9 @@ #include "avformat.h" #include "config.h" -#if CONFIG_NETTLE || CONFIG_GCRYPT -#if CONFIG_NETTLE +#if CONFIG_GMP || CONFIG_GCRYPT +#if CONFIG_GMP #include <gmp.h> -#include <nettle/bignum.h> typedef mpz_ptr FFBigNum; #elif CONFIG_GCRYPT |