diff options
| author | Ricardo Constantino <wiiaboo@gmail.com> | 2015-12-29 21:40:14 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-01-12 00:56:02 +0100 |
| commit | d50b5d547f4070678c88aa095b5292c872e2c1dc (patch) | |
| tree | 0138851ccac566eaea6166dd1775c9b939213062 /libavformat | |
| parent | d637a58750ef456e4254736add04b5c7d0b6dc40 (diff) | |
| download | ffmpeg-d50b5d547f4070678c88aa095b5292c872e2c1dc.tar.gz | |
rtmpdh: Initialize gcrypt before using it
Either disabling or init'ing secure memory is required after the use
of gcry_check_version. From a look at the functions rtmpdh uses, I
noticed none require the use of secure memory, so we disable it [1][2].
This resolves some errors returned by rtmpdh code with uninitialized
gcrypt, especifically:
Fatal: failed to create the RNG lock: Invalid argument
FATAL: failed to acquire the FSM lock in libgrypt: Invalid argument
Version "1.5.4" was arbitrarily chosen. An older version probably works
as well, but I couldn't compile older versions to test on my machine.
[1]
https://gnupg.org/documentation/manuals/gcrypt/Initializing-the-library.html
[2]
https://www.gnupg.org/documentation/manuals/gcrypt/Controlling-the-library.html
Signed-off-by: Ricardo Constantino <wiiaboo@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/rtmpdh.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/libavformat/rtmpdh.c b/libavformat/rtmpdh.c index 91b1349cca..42ad72c6bb 100644 --- a/libavformat/rtmpdh.c +++ b/libavformat/rtmpdh.c @@ -97,7 +97,16 @@ mpz_fdiv_r_2exp(bn, bn, num_bits); \ } while (0) #elif CONFIG_GCRYPT -#define bn_new(bn) bn = gcry_mpi_new(1) +#define bn_new(bn) \ + do { \ + if (!gcry_control(GCRYCTL_INITIALIZATION_FINISHED_P)) { \ + if (!gcry_check_version("1.5.4")) \ + return AVERROR(EINVAL); \ + gcry_control(GCRYCTL_DISABLE_SECMEM, 0); \ + gcry_control(GCRYCTL_INITIALIZATION_FINISHED, 0); \ + } \ + bn = gcry_mpi_new(1); \ + } while (0) #define bn_free(bn) gcry_mpi_release(bn) #define bn_set_word(bn, w) gcry_mpi_set_ui(bn, w) #define bn_cmp(a, b) gcry_mpi_cmp(a, b) |