summaryrefslogtreecommitdiff
path: root/libavformat/rtmpdh.c
Commit message (Collapse)AuthorAge
* Merge commit '016387fe0fe3eff1a03ec0673bf4d2967f6cad94'Clément Bœsch2017-03-24
|\ | | | | | | | | | | | | * commit '016387fe0fe3eff1a03ec0673bf4d2967f6cad94': rtmpdh: Don't use the OpenSSL DH struct Merged-by: Clément Bœsch <u@pkh.me>
| * rtmpdh: Don't use the OpenSSL DH structMartin Storsjö2016-10-23
| | | | | | | | | | | | | | | | | | Instead use our own struct, which we already use when using gcrypt and gnutls. In OpenSSL 1.1, the DH struct has been made opaque. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'd12b5b2f135aade4099f4b26b0fe678656158c13'Derek Buitenhuis2016-05-11
|\| | | | | | | | | | | | | | | * commit 'd12b5b2f135aade4099f4b26b0fe678656158c13': build: Split test programs off into separate files Some conversions done by: James Almer <jamrial@gmail.com> Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * build: Split test programs off into separate filesDiego Biurrun2016-04-07
| | | | | | | | | | This avoids spurious library rebuilds when only the test program code is changed and simplifies the build system.
* | Merge commit '704a39769719d2e1ae3f13bfc562b51c9cd002d7'Derek Buitenhuis2016-04-22
|\| | | | | | | | | | | | | * commit '704a39769719d2e1ae3f13bfc562b51c9cd002d7': rtmpdh: add an stdio.h include Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * rtmpdh: add an stdio.h includeAnton Khirnov2016-03-25
| | | | | | | | The test uses printf.
* | Merge commit '439929859ae0eb9542d3bb8a0c856bd5a1d1ec48'Derek Buitenhuis2016-04-21
|\| | | | | | | | | | | | | * commit '439929859ae0eb9542d3bb8a0c856bd5a1d1ec48': testprogs: Clean up #includes Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * testprogs: Clean up #includesDiego Biurrun2016-03-24
| |
* | rtmpdh: Initialize gcrypt before using itRicardo Constantino2016-01-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge commit '63ce9fd23cfa5ac0d9a862be0da138108dc1c505'Michael Niedermayer2015-06-01
|\| | | | | | | | | | | | | * commit '63ce9fd23cfa5ac0d9a862be0da138108dc1c505': rtmpdh: Use GMP functions directly, instead of nettle wrappers Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmpdh: Use GMP functions directly, instead of nettle wrappersMartin Storsjö2015-06-01
| | | | | | | | | | | | | | | | | | mpz_import and mpz_export were added in GMP 4.1, in 2002. This simplifies the DH code by clarifying that it only uses pure bignum functions, no other parts of nettle/hogweed. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'b2f0f37d242f1194fe1f886557cf6cefdf98caf6'Michael Niedermayer2015-05-30
|\| | | | | | | | | | | | | * commit 'b2f0f37d242f1194fe1f886557cf6cefdf98caf6': rtmpdh: Generate the whole private exponent using av_get_random_seed() with nettle/gmp Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmpdh: Generate the whole private exponent using av_get_random_seed() with ↵Martin Storsjö2015-05-29
| | | | | | | | | | | | | | | | | | nettle/gmp Don't use a PRNG for generating it; that defies the intended use within the cryptograhic handshake. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'e9e86d9ef637f5a600c76b352ffe5a82b71b25d1'Michael Niedermayer2015-05-29
|\| | | | | | | | | | | | | * commit 'e9e86d9ef637f5a600c76b352ffe5a82b71b25d1': rtmpdh: Create sufficiently long private keys for gcrypt/nettle Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmpdh: Create sufficiently long private keys for gcrypt/nettleMartin Storsjö2015-05-29
| | | | | | | | | | | | | | There was a misunderstanding betewen bits and bytes for the parameter value for generating random big numbers. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '8016a1bd3b60e917e1b12748dd80c06c3462c286'Michael Niedermayer2015-05-29
|\| | | | | | | | | | | | | * commit '8016a1bd3b60e917e1b12748dd80c06c3462c286': rtmpdh: Remove an unnecessary check in the gcrypt/nettle dh_compute_key Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmpdh: Remove an unnecessary check in the gcrypt/nettle dh_compute_keyMartin Storsjö2015-05-29
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '063f7467e4d14ab7fe01b2845dab60cc75df8b53'Michael Niedermayer2015-05-29
|\| | | | | | | | | | | | | * commit '063f7467e4d14ab7fe01b2845dab60cc75df8b53': rtmpdh: Add fate test for the DH handshake routine Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmpdh: Add fate test for the DH handshake routineMartin Storsjö2015-05-29
| | | | | | | | | | | | | | This helps if these functions need to be implemented using another crypto API. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '0508faaa11bf7507ffdd655aee57c9dc5a8203f4'Michael Niedermayer2015-05-29
|\| | | | | | | | | | | | | * commit '0508faaa11bf7507ffdd655aee57c9dc5a8203f4': rtmpdh: Pass the actual buffer size of the output secret key Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmpdh: Pass the actual buffer size of the output secret keyMartin Storsjö2015-05-29
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '9f1b3050d9e31e9283d818f3640f3460ac8cfb5b'Michael Niedermayer2015-05-29
|\| | | | | | | | | | | | | * commit '9f1b3050d9e31e9283d818f3640f3460ac8cfb5b': rtmpdh: Check the output buffer size in the openssl version of dh_compute_key Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmpdh: Check the output buffer size in the openssl version of dh_compute_keyMartin Storsjö2015-05-29
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '127d813bcb5705202b7100cf1eccd1e26d72ba14'Michael Niedermayer2015-05-29
|\| | | | | | | | | | | | | * commit '127d813bcb5705202b7100cf1eccd1e26d72ba14': rtmpdh: Fix a local variable name in the nettle/gcrypt codepath Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmpdh: Fix a local variable name in the nettle/gcrypt codepathMartin Storsjö2015-05-29
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '78efc69e7c990226f4b913721ef1b308ca5bfa04'Michael Niedermayer2015-05-29
|\| | | | | | | | | | | | | * commit '78efc69e7c990226f4b913721ef1b308ca5bfa04': rtmpdh: Make sure ret is initialized in the nettle version of bn_hex2bn Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmpdh: Make sure ret is initialized in the nettle version of bn_hex2bnMartin Storsjö2015-05-29
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-08-18
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: mpegvideo_enc: don't use deprecated avcodec_encode_video(). cmdutils: refactor -codecs option. avconv: make -shortest a per-output file option. lavc: add avcodec_descriptor_get_by_name(). lavc: add const to AVCodec* function parameters. swf(dec): replace CODEC_ID with AV_CODEC_ID dvenc: don't use deprecated AVCODEC_MAX_AUDIO_FRAME_SIZE rtmpdh: Do not generate the same private key every time when using libnettle rtp: remove ff_rtp_get_rtcp_file_handle(). rtsp.c: use ffurl_get_multi_file_handle() instead of ff_rtp_get_rtcp_file_handle() avio: add (ff)url_get_multi_file_handle() for getting more than one fd h264: vdpau: fix crash with unsupported colorspace amrwbdec: Decode the fr_quality bit properly Conflicts: Changelog cmdutils.c cmdutils_common_opts.h doc/ffmpeg.texi ffmpeg.c ffmpeg.h ffmpeg_opt.c libavcodec/h264.c libavcodec/options.c libavcodec/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmpdh: Do not generate the same private key every time when using libnettleSamuel Pitoiset2012-08-17
| | | | | | | | | | | | | | Replace mpz_random by mpz_urandomb with a random state initialization in order to improve the randomness. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-24
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: rtmp: Add credit/copyright to librtmp authors for parts of the RTMPE code rtmp: Move the CONFIG_ condition into the if conditions aac: Mention abbreviation as well in long_name build: Skip compiling rtmpdh.h if ffrtmpcrypt protocol is not enabled doc: Add Git configuration section configure: Add a dependency on https for rtmpts rtp: Only choose static payload types if the sample rate and channels are right Conflicts: doc/git-howto.texi libavformat/rtmpproto.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmp: Add credit/copyright to librtmp authors for parts of the RTMPE codeMartin Storsjö2012-07-24
| | | | | | | | | | | | Our implementation of RTMPE is heavily based on librtmp. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-23
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: v410dec: Implement explode mode support zerocodec: fix direct rendering. wav: init st to NULL to avoid a false-positive warning. wavpack: set bits_per_raw_sample for S32 samples to properly identify 24-bit h264: refactor NAL decode loop RTMPTE protocol support RTMPE protocol support rtmp: Add ff_rtmp_calc_digest_pos() rtmp: Rename rtmp_calc_digest to ff_rtmp_calc_digest and make it global swscale: add missing HAVE_INLINE_ASM check. lavfi: place x86 inline assembly under HAVE_INLINE_ASM. vc1: Add a test for interlaced field pictures swscale: Mark all init functions as av_cold swscale: x86: Drop pointless _mmx suffix from filenames lavf: use conditional notation for default codec in muxer declarations. swscale: place inline assembly bilinear scaler under HAVE_INLINE_ASM. dsputil: ppc: cosmetics: pretty-print dsputil: x86: add SHUFFLE_MASK_W macro configure: respect CC_O setting in check_cc Conflicts: Changelog configure libavcodec/v410dec.c libavcodec/zerocodec.c libavformat/asfenc.c libavformat/version.h libswscale/utils.c libswscale/x86/swscale.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* RTMPE protocol supportSamuel Pitoiset2012-07-23
This adds two protocols, but one of them is an internal implementation detail just used as an abstraction layer/generalization in the code. The RTMPE protocol implementation uses ffrtmpcrypt:// as an alternative to the tcp:// protocol. This allows moving most of the lower level logic out from the higher level generic rtmp code. Signed-off-by: Martin Storsjö <martin@martin.st>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-23 15:44:00 +0000