diff -Nru rtmpdump-2.4~20110711.gitc28f1bab/ChangeLog rtmpdump-2.3/ChangeLog --- rtmpdump-2.4~20110711.gitc28f1bab/ChangeLog 2011-08-16 11:42:12.000000000 +0000 +++ rtmpdump-2.3/ChangeLog 2010-06-30 19:58:35.000000000 +0000 @@ -1,12 +1,9 @@ RTMPDump Copyright 2008-2009 Andrej Stepanchuk; Distributed under the GPL v2 -Copyright 2009-2011 Howard Chu +Copyright 2009-2010 Howard Chu Copyright 2009 The Flvstreamer Team http://rtmpdump.mplayerhq.hu/ -11 July 2011, v2.4 -- add RTMPE type 9 handshake support - 30 June 2010, v2.3 - fix RC4 cleanup for GnuTLS/gcrypt - declare RTMP_Write buf as const diff -Nru rtmpdump-2.4~20110711.gitc28f1bab/debian/changelog rtmpdump-2.3/debian/changelog --- rtmpdump-2.4~20110711.gitc28f1bab/debian/changelog 2011-08-17 10:17:12.000000000 +0000 +++ rtmpdump-2.3/debian/changelog 2011-10-23 10:13:24.000000000 +0000 @@ -1,36 +1,8 @@ -rtmpdump (2.4~20110711.gitc28f1bab-1) unstable; urgency=low +rtmpdump (2.3-2~ppa1~lucid) lucid; urgency=low - * Team upload. + * Backport from natty - [ Fabian Greffrath ] - * Fix previous changelog entry. - * Fix debian/watch to scan for .tgz as well as .tar.gz file extensions. - * Remove myself from Uploaders. - - [ Andres Mejia ] - * Build depend on libgnutls-dev >= 2.4.1. - - [ Alessio Treglia ] - * New upstream release (Closes: #637867): - - Add RTMPE type 9 handshake support. - * Switch packaging to source format 3.0 (quilt). - * Enable multiarch (Closes: #637861). - Thanks to Steve Langasek for the patch! - * Refresh 01_unbreak_makefile.diff - * Drop patches applied upstream: - - 02_strtime-visibility.patch - - 03-Dont-link-explicitly-against-static-library.patch - * debian/control: - - Correct team's name in the Maintainer field. - - Correct small error in the description, URL should be - capitalized (Closes: #616461). - - Description should not start with an article. - * Update debian/copyright. - * Add gbp config file. - * Add simple script to prepare release tarballs from upstream's git. - * Bump Standards. - - -- Alessio Treglia Wed, 17 Aug 2011 12:16:03 +0200 + -- Nathan Rennie-Waldock Sat, 22 Oct 2011 12:12:42 +0100 rtmpdump (2.3-2) unstable; urgency=low @@ -40,11 +12,6 @@ [ Andres Mejia ] * Move ${misc:Depends} as last entry in Depends field of librtmp-dev. - [ Fabian Greffrath ] - * debian/patches/03-Dont-link-explicitly-against-static-library.patch: - New patch from upstream SVN (slightly modified) to avoid explicit - linking against the static library. - -- Reinhard Tartler Sun, 01 Aug 2010 08:59:47 -0400 rtmpdump (2.3-1) unstable; urgency=low diff -Nru rtmpdump-2.4~20110711.gitc28f1bab/debian/compat rtmpdump-2.3/debian/compat --- rtmpdump-2.4~20110711.gitc28f1bab/debian/compat 2011-08-17 10:07:29.000000000 +0000 +++ rtmpdump-2.3/debian/compat 2011-10-23 10:13:24.000000000 +0000 @@ -1 +1 @@ -9 +7 diff -Nru rtmpdump-2.4~20110711.gitc28f1bab/debian/control rtmpdump-2.3/debian/control --- rtmpdump-2.4~20110711.gitc28f1bab/debian/control 2011-08-17 10:08:34.000000000 +0000 +++ rtmpdump-2.3/debian/control 2011-10-23 10:13:24.000000000 +0000 @@ -1,13 +1,10 @@ Source: rtmpdump Priority: extra -Maintainer: Debian Multimedia Maintainers -Uploaders: - Reinhard Tartler , - Sebastian Dröge -Build-Depends: - debhelper (>= 8.1.3), - libgnutls-dev (>= 2.4.1) -Standards-Version: 3.9.2 +Maintainer: Debian multimedia packages maintainers +Uploaders: Reinhard Tartler , Sebastian Dröge , + Fabian Greffrath +Build-Depends: quilt (>= 0.46-7~), debhelper (>= 7.0.50~), libgnutls-dev +Standards-Version: 3.9.0 Section: web Vcs-Git: git://git.debian.org/git/pkg-multimedia/rtmpdump.git Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/rtmpdump.git;a=summary @@ -15,22 +12,20 @@ Package: rtmpdump Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Suggests: ffmpeg, mplayer -Description: small dumper for media content streamed over the RTMP protocol +Description: A small dumper for media content streamed over the RTMP protocol A small dumper for media content streamed over the RTMP protocol (like BBC's - iPlayer high quality streams). Supplying an rtmp URL will result in a dumped + iPlayer high quality streams). Supplying an rtmp url will result in a dumped flv file, which can be played/transcoded using ffmpeg/mplayer, etc. Package: librtmp0 Section: libs -Depends: ${misc:Depends}, ${shlibs:Depends} -Pre-Depends: ${misc:Pre-Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Architecture: any -Multi-Arch: same Description: toolkit for RTMP streams (shared library) A small dumper for media content streamed over the RTMP protocol (like BBC's - iPlayer high quality streams). Supplying an rtmp URL will result in a dumped + iPlayer high quality streams). Supplying an rtmp url will result in a dumped flv file, which can be played/transcoded using ffmpeg/mplayer, etc. . This package contains the shared libraries, header files needed by @@ -38,11 +33,11 @@ Package: librtmp-dev Section: libdevel -Depends: libgnutls-dev, librtmp0 (= ${binary:Version}), ${misc:Depends} +Depends: librtmp0 (= ${binary:Version}), libgnutls-dev, ${misc:Depends} Architecture: any Description: toolkit for RTMP streams (development files) A small dumper for media content streamed over the RTMP protocol (like BBC's - iPlayer high quality streams). Supplying an rtmp URL will result in a dumped + iPlayer high quality streams). Supplying an rtmp url will result in a dumped flv file, which can be played/transcoded using ffmpeg/mplayer, etc. . This package contains the development libraries, header files needed by diff -Nru rtmpdump-2.4~20110711.gitc28f1bab/debian/copyright rtmpdump-2.3/debian/copyright --- rtmpdump-2.4~20110711.gitc28f1bab/debian/copyright 2011-08-17 10:05:32.000000000 +0000 +++ rtmpdump-2.3/debian/copyright 2011-10-23 10:13:24.000000000 +0000 @@ -8,7 +8,7 @@ RTMP Dump (C) 2009 Andrej Stepanchuk -(C) 2009-2011 Howard Chu +(C) 2009-2010 Howard Chu (C) 2010 2a665470ced7adb7156fcef47f8199a6371c117b8a79e399a2771e0b36384090 @@ -46,12 +46,12 @@ it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1, or (at your option) any later version. - + librtmp is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU Lesser General Public License along with librtmp see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, @@ -69,3 +69,6 @@ On Debian GNU/Linux systems, the complete text of the GNU General Public License can be found in `/usr/share/common-licenses/GPL-2' and the text of the GNU Lesser General Public License is in `/usr/share/common-licenses/LGPL-2.1'. + + + diff -Nru rtmpdump-2.4~20110711.gitc28f1bab/debian/gbp.conf rtmpdump-2.3/debian/gbp.conf --- rtmpdump-2.4~20110711.gitc28f1bab/debian/gbp.conf 2011-08-16 11:19:08.000000000 +0000 +++ rtmpdump-2.3/debian/gbp.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -[DEFAULT] -pristine-tar = True diff -Nru rtmpdump-2.4~20110711.gitc28f1bab/debian/get-git-source.sh rtmpdump-2.3/debian/get-git-source.sh --- rtmpdump-2.4~20110711.gitc28f1bab/debian/get-git-source.sh 2011-08-16 11:41:21.000000000 +0000 +++ rtmpdump-2.3/debian/get-git-source.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ -#!/bin/sh - -BASE_REL=$(dpkg-parsechangelog 2>/dev/null | sed -ne 's/Version: \([0-9.]\+\)+\?.*/\1/p') -OLDDIR=${PWD} -GOS_DIR=${OLDDIR}/get-orig-source -GIT_COMMIT='git log --no-color -1 --oneline | cut -d" " -f1' -GIT_DATE='git log --no-color -1 --date=iso | sed -ne "s/Date:\s\+\(.*\).*/\1/p" | cut -d" " -f1 | tr -d "-"' - -if [ -z ${BASE_REL} ]; then - echo 'Please run this script from the sources root directory.' - exit 1 -fi - - -rm -rf ${GOS_DIR} -mkdir ${GOS_DIR} && cd ${GOS_DIR} -git clone git://git.ffmpeg.org/rtmpdump rtmpdump -cd rtmpdump/ -RTMPDUMP_GIT_COMMIT=$(eval "${GIT_COMMIT}") -RTMPDUMP_GIT_DATE=$(eval "${GIT_DATE}") -cd .. && tar cf \ - ${OLDDIR}/rtmpdump_${BASE_REL}+${RTMPDUMP_GIT_DATE}.git${RTMPDUMP_GIT_COMMIT}.orig.tar \ - rtmpdump --exclude-vcs && gzip -9fn \ - ${OLDDIR}/rtmpdump_${BASE_REL}+${RTMPDUMP_GIT_DATE}.git${RTMPDUMP_GIT_COMMIT}.orig.tar -rm -rf ${GOS_DIR} diff -Nru rtmpdump-2.4~20110711.gitc28f1bab/debian/librtmp0.install rtmpdump-2.3/debian/librtmp0.install --- rtmpdump-2.4~20110711.gitc28f1bab/debian/librtmp0.install 2011-08-17 10:09:20.000000000 +0000 +++ rtmpdump-2.3/debian/librtmp0.install 2011-10-23 10:13:24.000000000 +0000 @@ -1 +1 @@ -usr/lib/*/lib*.so.* +usr/lib/lib*.so.* diff -Nru rtmpdump-2.4~20110711.gitc28f1bab/debian/librtmp-dev.install rtmpdump-2.3/debian/librtmp-dev.install --- rtmpdump-2.4~20110711.gitc28f1bab/debian/librtmp-dev.install 2011-08-17 10:09:09.000000000 +0000 +++ rtmpdump-2.3/debian/librtmp-dev.install 2011-10-23 10:13:24.000000000 +0000 @@ -1,4 +1,4 @@ usr/include/* -usr/lib/*/lib*.a -usr/lib/*/lib*.so -usr/lib/*/pkgconfig/* +usr/lib/lib*.a +usr/lib/lib*.so +usr/lib/pkgconfig/* diff -Nru rtmpdump-2.4~20110711.gitc28f1bab/debian/patches/01_unbreak_makefile.diff rtmpdump-2.3/debian/patches/01_unbreak_makefile.diff --- rtmpdump-2.4~20110711.gitc28f1bab/debian/patches/01_unbreak_makefile.diff 2011-08-17 09:45:54.000000000 +0000 +++ rtmpdump-2.3/debian/patches/01_unbreak_makefile.diff 2011-10-23 10:13:24.000000000 +0000 @@ -19,13 +19,11 @@ 5.7.3 ---- - Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- rtmpdump.orig/Makefile -+++ rtmpdump/Makefile -@@ -64,11 +64,11 @@ install: $(PROGS) +Index: rtmpdump-2.3/Makefile +=================================================================== +--- rtmpdump-2.3.orig/Makefile 2010-06-30 21:58:35.000000000 +0200 ++++ rtmpdump-2.3/Makefile 2010-07-05 19:52:07.272780868 +0200 +@@ -57,11 +57,11 @@ cp rtmpgw$(EXT) rtmpsrv$(EXT) rtmpsuck$(EXT) $(SBINDIR) cp rtmpdump.1 $(MANDIR)/man1 cp rtmpgw.8 $(MANDIR)/man8 diff -Nru rtmpdump-2.4~20110711.gitc28f1bab/debian/patches/02_strtime-visibility.patch rtmpdump-2.3/debian/patches/02_strtime-visibility.patch --- rtmpdump-2.4~20110711.gitc28f1bab/debian/patches/02_strtime-visibility.patch 1970-01-01 00:00:00.000000000 +0000 +++ rtmpdump-2.3/debian/patches/02_strtime-visibility.patch 2011-10-23 10:13:24.000000000 +0000 @@ -0,0 +1,13 @@ +Index: rtmpdump-2.3/librtmp/hashswf.c +=================================================================== +--- rtmpdump-2.3.orig/librtmp/hashswf.c 2010-07-05 19:54:38.120781678 +0200 ++++ rtmpdump-2.3/librtmp/hashswf.c 2010-07-05 19:54:48.908791094 +0200 +@@ -435,7 +435,7 @@ + /* Convert a Unix time to a network time string + * Weekday, DD-MMM-YYYY HH:MM:SS GMT + */ +-void ++static void + strtime(time_t * t, char *s) + { + struct tm *tm; diff -Nru rtmpdump-2.4~20110711.gitc28f1bab/debian/patches/03-Dont-link-explicitly-against-static-library.patch rtmpdump-2.3/debian/patches/03-Dont-link-explicitly-against-static-library.patch --- rtmpdump-2.4~20110711.gitc28f1bab/debian/patches/03-Dont-link-explicitly-against-static-library.patch 1970-01-01 00:00:00.000000000 +0000 +++ rtmpdump-2.3/debian/patches/03-Dont-link-explicitly-against-static-library.patch 2011-10-23 10:13:24.000000000 +0000 @@ -0,0 +1,63 @@ +------------------------------------------------------------------------ +r544 | hyc | 2010-07-08 12:38:33 +0200 (Thu, 08 Jul 2010) | 2 lines + +Don't link explicitly against static library + +------------------------------------------------------------------------ +--- rtmpdump.orig/Makefile ++++ rtmpdump/Makefile +@@ -33,7 +33,7 @@ MANDIR=$(DESTDIR)$(mandir) + + LIBS_posix= + LIBS_mingw=-lws2_32 -lwinmm -lgdi32 +-LIBS=$(CRYPTO_LIB) -lz $(LIBS_$(SYS)) $(XLIBS) ++LIBS=-L librtmp -lrtmp $(CRYPTO_LIB) -lz $(LIBS_$(SYS)) $(XLIBS) + + THREADLIB_posix=-lpthread + THREADLIB_mingw= +@@ -47,11 +47,13 @@ EXT_posix= + EXT_mingw=.exe + EXT=$(EXT_$(SYS)) + +-all: $(LIBRTMP) progs ++PROGS=rtmpdump rtmpgw rtmpsrv rtmpsuck + +-progs: rtmpdump rtmpgw rtmpsrv rtmpsuck ++all: $(LIBRTMP) $(PROGS) + +-install: progs ++$(PROGS): $(LIBRTMP) ++ ++install: $(PROGS) + -mkdir -p $(BINDIR) $(SBINDIR) $(MANDIR)/man1 $(MANDIR)/man8 + cp rtmpdump$(EXT) $(BINDIR) + cp rtmpgw$(EXT) rtmpsrv$(EXT) rtmpsuck$(EXT) $(SBINDIR) +@@ -68,20 +70,17 @@ FORCE: + $(LIBRTMP): FORCE + @cd librtmp; $(MAKE) all + +-# note: $^ is GNU Make's equivalent to BSD $> +-# we use both since either make will ignore the one it doesn't recognize +- +-rtmpdump: rtmpdump.o $(LIBRTMP) +- $(CC) $(LDFLAGS) $^ $> -o $@$(EXT) $(LIBS) ++rtmpdump: rtmpdump.o ++ $(CC) $(LDFLAGS) -o $@$(EXT) $@.o $(LIBS) + +-rtmpsrv: rtmpsrv.o thread.o $(LIBRTMP) +- $(CC) $(LDFLAGS) $^ $> -o $@$(EXT) $(SLIBS) ++rtmpsrv: rtmpsrv.o thread.o ++ $(CC) $(LDFLAGS) -o $@$(EXT) $@.o thread.o $(SLIBS) + +-rtmpsuck: rtmpsuck.o thread.o $(LIBRTMP) +- $(CC) $(LDFLAGS) $^ $> -o $@$(EXT) $(SLIBS) ++rtmpsuck: rtmpsuck.o thread.o ++ $(CC) $(LDFLAGS) -o $@$(EXT) $@.o thread.o $(SLIBS) + +-rtmpgw: rtmpgw.o thread.o $(LIBRTMP) +- $(CC) $(LDFLAGS) $^ $> -o $@$(EXT) $(SLIBS) ++rtmpgw: rtmpgw.o thread.o ++ $(CC) $(LDFLAGS) -o $@$(EXT) $@.o thread.o $(SLIBS) + + rtmpgw.o: rtmpgw.c $(INCRTMP) Makefile + rtmpdump.o: rtmpdump.c $(INCRTMP) Makefile diff -Nru rtmpdump-2.4~20110711.gitc28f1bab/debian/patches/series rtmpdump-2.3/debian/patches/series --- rtmpdump-2.4~20110711.gitc28f1bab/debian/patches/series 2011-08-17 09:53:18.000000000 +0000 +++ rtmpdump-2.3/debian/patches/series 2011-10-23 10:13:24.000000000 +0000 @@ -1 +1,3 @@ 01_unbreak_makefile.diff +02_strtime-visibility.patch +03-Dont-link-explicitly-against-static-library.patch diff -Nru rtmpdump-2.4~20110711.gitc28f1bab/debian/README.source rtmpdump-2.3/debian/README.source --- rtmpdump-2.4~20110711.gitc28f1bab/debian/README.source 1970-01-01 00:00:00.000000000 +0000 +++ rtmpdump-2.3/debian/README.source 2011-10-23 10:13:24.000000000 +0000 @@ -0,0 +1,13 @@ +rtmpdump for Debian +------------------- + +This package uses quilt to manage all modifications to the upstream +source. Changes are stored in the source package as diffs in +debian/patches and applied during the build. Please see: + + /usr/share/doc/quilt/README.source + +for more information on how to apply the patches, modify patches, or +remove a patch. + + -- Reinhard Tartler , Sun, 30 May 2010 20:47:32 +0200 diff -Nru rtmpdump-2.4~20110711.gitc28f1bab/debian/rules rtmpdump-2.3/debian/rules --- rtmpdump-2.4~20110711.gitc28f1bab/debian/rules 2011-08-17 10:09:55.000000000 +0000 +++ rtmpdump-2.3/debian/rules 2011-10-23 10:13:24.000000000 +0000 @@ -4,8 +4,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) -MAKEVARS=prefix=/usr CRYPTO=GNUTLS libdir=/usr/lib/$(DEB_HOST_MULTIARCH) +MAKEVARS=prefix=/usr CRYPTO=GNUTLS override_dh_auto_build: dh_auto_build -- $(MAKEVARS) @@ -13,12 +12,5 @@ override_dh_auto_install: dh_auto_install -- $(MAKEVARS) -override_dh_auto_clean: - rm -rf get-orig-source - dh_auto_clean - -get-orig-source: - debian/get-git-source.sh - %: - dh $@ + dh $@ --with quilt diff -Nru rtmpdump-2.4~20110711.gitc28f1bab/debian/source/format rtmpdump-2.3/debian/source/format --- rtmpdump-2.4~20110711.gitc28f1bab/debian/source/format 2011-10-23 10:13:24.000000000 +0000 +++ rtmpdump-2.3/debian/source/format 2011-10-23 10:13:24.000000000 +0000 @@ -1 +1 @@ -3.0 (quilt) +1.0 diff -Nru rtmpdump-2.4~20110711.gitc28f1bab/debian/watch rtmpdump-2.3/debian/watch --- rtmpdump-2.4~20110711.gitc28f1bab/debian/watch 2011-05-04 20:01:12.000000000 +0000 +++ rtmpdump-2.3/debian/watch 2011-10-23 10:13:24.000000000 +0000 @@ -1,3 +1,3 @@ # See uscan(1) for format version=3 -http://rtmpdump.mplayerhq.hu/download/rtmpdump-(.*)\.(?:tgz|tar\.gz) +http://rtmpdump.mplayerhq.hu/download/rtmpdump-(.*)\.tar\.gz diff -Nru rtmpdump-2.4~20110711.gitc28f1bab/librtmp/handshake.h rtmpdump-2.3/librtmp/handshake.h --- rtmpdump-2.4~20110711.gitc28f1bab/librtmp/handshake.h 2011-08-16 11:08:09.000000000 +0000 +++ rtmpdump-2.3/librtmp/handshake.h 2010-06-30 19:58:35.000000000 +0000 @@ -358,337 +358,6 @@ out[7] = v1; } -/* RTMPE type 9 uses Blowfish on the regular signature - * http://en.wikipedia.org/wiki/Blowfish_(cipher) - */ -#define BF_ROUNDS 16 -typedef struct bf_key { - uint32_t s[4][256]; - uint32_t p[BF_ROUNDS+2]; -} bf_key; - -static const uint32_t bf_sinit[][256] = { - - /* S-Box 0 */ - { 0xd1310ba6, 0x98dfb5ac, 0x2ffd72db, 0xd01adfb7, 0xb8e1afed, 0x6a267e96, - 0xba7c9045, 0xf12c7f99, 0x24a19947, 0xb3916cf7, 0x0801f2e2, 0x858efc16, - 0x636920d8, 0x71574e69, 0xa458fea3, 0xf4933d7e, 0x0d95748f, 0x728eb658, - 0x718bcd58, 0x82154aee, 0x7b54a41d, 0xc25a59b5, 0x9c30d539, 0x2af26013, - 0xc5d1b023, 0x286085f0, 0xca417918, 0xb8db38ef, 0x8e79dcb0, 0x603a180e, - 0x6c9e0e8b, 0xb01e8a3e, 0xd71577c1, 0xbd314b27, 0x78af2fda, 0x55605c60, - 0xe65525f3, 0xaa55ab94, 0x57489862, 0x63e81440, 0x55ca396a, 0x2aab10b6, - 0xb4cc5c34, 0x1141e8ce, 0xa15486af, 0x7c72e993, 0xb3ee1411, 0x636fbc2a, - 0x2ba9c55d, 0x741831f6, 0xce5c3e16, 0x9b87931e, 0xafd6ba33, 0x6c24cf5c, - 0x7a325381, 0x28958677, 0x3b8f4898, 0x6b4bb9af, 0xc4bfe81b, 0x66282193, - 0x61d809cc, 0xfb21a991, 0x487cac60, 0x5dec8032, 0xef845d5d, 0xe98575b1, - 0xdc262302, 0xeb651b88, 0x23893e81, 0xd396acc5, 0x0f6d6ff3, 0x83f44239, - 0x2e0b4482, 0xa4842004, 0x69c8f04a, 0x9e1f9b5e, 0x21c66842, 0xf6e96c9a, - 0x670c9c61, 0xabd388f0, 0x6a51a0d2, 0xd8542f68, 0x960fa728, 0xab5133a3, - 0x6eef0b6c, 0x137a3be4, 0xba3bf050, 0x7efb2a98, 0xa1f1651d, 0x39af0176, - 0x66ca593e, 0x82430e88, 0x8cee8619, 0x456f9fb4, 0x7d84a5c3, 0x3b8b5ebe, - 0xe06f75d8, 0x85c12073, 0x401a449f, 0x56c16aa6, 0x4ed3aa62, 0x363f7706, - 0x1bfedf72, 0x429b023d, 0x37d0d724, 0xd00a1248, 0xdb0fead3, 0x49f1c09b, - 0x075372c9, 0x80991b7b, 0x25d479d8, 0xf6e8def7, 0xe3fe501a, 0xb6794c3b, - 0x976ce0bd, 0x04c006ba, 0xc1a94fb6, 0x409f60c4, 0x5e5c9ec2, 0x196a2463, - 0x68fb6faf, 0x3e6c53b5, 0x1339b2eb, 0x3b52ec6f, 0x6dfc511f, 0x9b30952c, - 0xcc814544, 0xaf5ebd09, 0xbee3d004, 0xde334afd, 0x660f2807, 0x192e4bb3, - 0xc0cba857, 0x45c8740f, 0xd20b5f39, 0xb9d3fbdb, 0x5579c0bd, 0x1a60320a, - 0xd6a100c6, 0x402c7279, 0x679f25fe, 0xfb1fa3cc, 0x8ea5e9f8, 0xdb3222f8, - 0x3c7516df, 0xfd616b15, 0x2f501ec8, 0xad0552ab, 0x323db5fa, 0xfd238760, - 0x53317b48, 0x3e00df82, 0x9e5c57bb, 0xca6f8ca0, 0x1a87562e, 0xdf1769db, - 0xd542a8f6, 0x287effc3, 0xac6732c6, 0x8c4f5573, 0x695b27b0, 0xbbca58c8, - 0xe1ffa35d, 0xb8f011a0, 0x10fa3d98, 0xfd2183b8, 0x4afcb56c, 0x2dd1d35b, - 0x9a53e479, 0xb6f84565, 0xd28e49bc, 0x4bfb9790, 0xe1ddf2da, 0xa4cb7e33, - 0x62fb1341, 0xcee4c6e8, 0xef20cada, 0x36774c01, 0xd07e9efe, 0x2bf11fb4, - 0x95dbda4d, 0xae909198, 0xeaad8e71, 0x6b93d5a0, 0xd08ed1d0, 0xafc725e0, - 0x8e3c5b2f, 0x8e7594b7, 0x8ff6e2fb, 0xf2122b64, 0x8888b812, 0x900df01c, - 0x4fad5ea0, 0x688fc31c, 0xd1cff191, 0xb3a8c1ad, 0x2f2f2218, 0xbe0e1777, - 0xea752dfe, 0x8b021fa1, 0xe5a0cc0f, 0xb56f74e8, 0x18acf3d6, 0xce89e299, - 0xb4a84fe0, 0xfd13e0b7, 0x7cc43b81, 0xd2ada8d9, 0x165fa266, 0x80957705, - 0x93cc7314, 0x211a1477, 0xe6ad2065, 0x77b5fa86, 0xc75442f5, 0xfb9d35cf, - 0xebcdaf0c, 0x7b3e89a0, 0xd6411bd3, 0xae1e7e49, 0x00250e2d, 0x2071b35e, - 0x226800bb, 0x57b8e0af, 0x2464369b, 0xf009b91e, 0x5563911d, 0x59dfa6aa, - 0x78c14389, 0xd95a537f, 0x207d5ba2, 0x02e5b9c5, 0x83260376, 0x6295cfa9, - 0x11c81968, 0x4e734a41, 0xb3472dca, 0x7b14a94a, 0x1b510052, 0x9a532915, - 0xd60f573f, 0xbc9bc6e4, 0x2b60a476, 0x81e67400, 0x08ba6fb5, 0x571be91f, - 0xf296ec6b, 0x2a0dd915, 0xb6636521, 0xe7b9f9b6, 0xff34052e, 0xc5855664, - 0x53b02d5d, 0xa99f8fa1, 0x08ba4799, 0x6e85076a, }, - - /* S-Box 1 */ - { 0x4b7a70e9, 0xb5b32944, 0xdb75092e, 0xc4192623, 0xad6ea6b0, 0x49a7df7d, - 0x9cee60b8, 0x8fedb266, 0xecaa8c71, 0x699a17ff, 0x5664526c, 0xc2b19ee1, - 0x193602a5, 0x75094c29, 0xa0591340, 0xe4183a3e, 0x3f54989a, 0x5b429d65, - 0x6b8fe4d6, 0x99f73fd6, 0xa1d29c07, 0xefe830f5, 0x4d2d38e6, 0xf0255dc1, - 0x4cdd2086, 0x8470eb26, 0x6382e9c6, 0x021ecc5e, 0x09686b3f, 0x3ebaefc9, - 0x3c971814, 0x6b6a70a1, 0x687f3584, 0x52a0e286, 0xb79c5305, 0xaa500737, - 0x3e07841c, 0x7fdeae5c, 0x8e7d44ec, 0x5716f2b8, 0xb03ada37, 0xf0500c0d, - 0xf01c1f04, 0x0200b3ff, 0xae0cf51a, 0x3cb574b2, 0x25837a58, 0xdc0921bd, - 0xd19113f9, 0x7ca92ff6, 0x94324773, 0x22f54701, 0x3ae5e581, 0x37c2dadc, - 0xc8b57634, 0x9af3dda7, 0xa9446146, 0x0fd0030e, 0xecc8c73e, 0xa4751e41, - 0xe238cd99, 0x3bea0e2f, 0x3280bba1, 0x183eb331, 0x4e548b38, 0x4f6db908, - 0x6f420d03, 0xf60a04bf, 0x2cb81290, 0x24977c79, 0x5679b072, 0xbcaf89af, - 0xde9a771f, 0xd9930810, 0xb38bae12, 0xdccf3f2e, 0x5512721f, 0x2e6b7124, - 0x501adde6, 0x9f84cd87, 0x7a584718, 0x7408da17, 0xbc9f9abc, 0xe94b7d8c, - 0xec7aec3a, 0xdb851dfa, 0x63094366, 0xc464c3d2, 0xef1c1847, 0x3215d908, - 0xdd433b37, 0x24c2ba16, 0x12a14d43, 0x2a65c451, 0x50940002, 0x133ae4dd, - 0x71dff89e, 0x10314e55, 0x81ac77d6, 0x5f11199b, 0x043556f1, 0xd7a3c76b, - 0x3c11183b, 0x5924a509, 0xf28fe6ed, 0x97f1fbfa, 0x9ebabf2c, 0x1e153c6e, - 0x86e34570, 0xeae96fb1, 0x860e5e0a, 0x5a3e2ab3, 0x771fe71c, 0x4e3d06fa, - 0x2965dcb9, 0x99e71d0f, 0x803e89d6, 0x5266c825, 0x2e4cc978, 0x9c10b36a, - 0xc6150eba, 0x94e2ea78, 0xa5fc3c53, 0x1e0a2df4, 0xf2f74ea7, 0x361d2b3d, - 0x1939260f, 0x19c27960, 0x5223a708, 0xf71312b6, 0xebadfe6e, 0xeac31f66, - 0xe3bc4595, 0xa67bc883, 0xb17f37d1, 0x018cff28, 0xc332ddef, 0xbe6c5aa5, - 0x65582185, 0x68ab9802, 0xeecea50f, 0xdb2f953b, 0x2aef7dad, 0x5b6e2f84, - 0x1521b628, 0x29076170, 0xecdd4775, 0x619f1510, 0x13cca830, 0xeb61bd96, - 0x0334fe1e, 0xaa0363cf, 0xb5735c90, 0x4c70a239, 0xd59e9e0b, 0xcbaade14, - 0xeecc86bc, 0x60622ca7, 0x9cab5cab, 0xb2f3846e, 0x648b1eaf, 0x19bdf0ca, - 0xa02369b9, 0x655abb50, 0x40685a32, 0x3c2ab4b3, 0x319ee9d5, 0xc021b8f7, - 0x9b540b19, 0x875fa099, 0x95f7997e, 0x623d7da8, 0xf837889a, 0x97e32d77, - 0x11ed935f, 0x16681281, 0x0e358829, 0xc7e61fd6, 0x96dedfa1, 0x7858ba99, - 0x57f584a5, 0x1b227263, 0x9b83c3ff, 0x1ac24696, 0xcdb30aeb, 0x532e3054, - 0x8fd948e4, 0x6dbc3128, 0x58ebf2ef, 0x34c6ffea, 0xfe28ed61, 0xee7c3c73, - 0x5d4a14d9, 0xe864b7e3, 0x42105d14, 0x203e13e0, 0x45eee2b6, 0xa3aaabea, - 0xdb6c4f15, 0xfacb4fd0, 0xc742f442, 0xef6abbb5, 0x654f3b1d, 0x41cd2105, - 0xd81e799e, 0x86854dc7, 0xe44b476a, 0x3d816250, 0xcf62a1f2, 0x5b8d2646, - 0xfc8883a0, 0xc1c7b6a3, 0x7f1524c3, 0x69cb7492, 0x47848a0b, 0x5692b285, - 0x095bbf00, 0xad19489d, 0x1462b174, 0x23820e00, 0x58428d2a, 0x0c55f5ea, - 0x1dadf43e, 0x233f7061, 0x3372f092, 0x8d937e41, 0xd65fecf1, 0x6c223bdb, - 0x7cde3759, 0xcbee7460, 0x4085f2a7, 0xce77326e, 0xa6078084, 0x19f8509e, - 0xe8efd855, 0x61d99735, 0xa969a7aa, 0xc50c06c2, 0x5a04abfc, 0x800bcadc, - 0x9e447a2e, 0xc3453484, 0xfdd56705, 0x0e1e9ec9, 0xdb73dbd3, 0x105588cd, - 0x675fda79, 0xe3674340, 0xc5c43465, 0x713e38d8, 0x3d28f89e, 0xf16dff20, - 0x153e21e7, 0x8fb03d4a, 0xe6e39f2b, 0xdb83adf7, }, - - /* S-Box 2 */ - { 0xe93d5a68, 0x948140f7, 0xf64c261c, 0x94692934, 0x411520f7, 0x7602d4f7, - 0xbcf46b2e, 0xd4a20068, 0xd4082471, 0x3320f46a, 0x43b7d4b7, 0x500061af, - 0x1e39f62e, 0x97244546, 0x14214f74, 0xbf8b8840, 0x4d95fc1d, 0x96b591af, - 0x70f4ddd3, 0x66a02f45, 0xbfbc09ec, 0x03bd9785, 0x7fac6dd0, 0x31cb8504, - 0x96eb27b3, 0x55fd3941, 0xda2547e6, 0xabca0a9a, 0x28507825, 0x530429f4, - 0x0a2c86da, 0xe9b66dfb, 0x68dc1462, 0xd7486900, 0x680ec0a4, 0x27a18dee, - 0x4f3ffea2, 0xe887ad8c, 0xb58ce006, 0x7af4d6b6, 0xaace1e7c, 0xd3375fec, - 0xce78a399, 0x406b2a42, 0x20fe9e35, 0xd9f385b9, 0xee39d7ab, 0x3b124e8b, - 0x1dc9faf7, 0x4b6d1856, 0x26a36631, 0xeae397b2, 0x3a6efa74, 0xdd5b4332, - 0x6841e7f7, 0xca7820fb, 0xfb0af54e, 0xd8feb397, 0x454056ac, 0xba489527, - 0x55533a3a, 0x20838d87, 0xfe6ba9b7, 0xd096954b, 0x55a867bc, 0xa1159a58, - 0xcca92963, 0x99e1db33, 0xa62a4a56, 0x3f3125f9, 0x5ef47e1c, 0x9029317c, - 0xfdf8e802, 0x04272f70, 0x80bb155c, 0x05282ce3, 0x95c11548, 0xe4c66d22, - 0x48c1133f, 0xc70f86dc, 0x07f9c9ee, 0x41041f0f, 0x404779a4, 0x5d886e17, - 0x325f51eb, 0xd59bc0d1, 0xf2bcc18f, 0x41113564, 0x257b7834, 0x602a9c60, - 0xdff8e8a3, 0x1f636c1b, 0x0e12b4c2, 0x02e1329e, 0xaf664fd1, 0xcad18115, - 0x6b2395e0, 0x333e92e1, 0x3b240b62, 0xeebeb922, 0x85b2a20e, 0xe6ba0d99, - 0xde720c8c, 0x2da2f728, 0xd0127845, 0x95b794fd, 0x647d0862, 0xe7ccf5f0, - 0x5449a36f, 0x877d48fa, 0xc39dfd27, 0xf33e8d1e, 0x0a476341, 0x992eff74, - 0x3a6f6eab, 0xf4f8fd37, 0xa812dc60, 0xa1ebddf8, 0x991be14c, 0xdb6e6b0d, - 0xc67b5510, 0x6d672c37, 0x2765d43b, 0xdcd0e804, 0xf1290dc7, 0xcc00ffa3, - 0xb5390f92, 0x690fed0b, 0x667b9ffb, 0xcedb7d9c, 0xa091cf0b, 0xd9155ea3, - 0xbb132f88, 0x515bad24, 0x7b9479bf, 0x763bd6eb, 0x37392eb3, 0xcc115979, - 0x8026e297, 0xf42e312d, 0x6842ada7, 0xc66a2b3b, 0x12754ccc, 0x782ef11c, - 0x6a124237, 0xb79251e7, 0x06a1bbe6, 0x4bfb6350, 0x1a6b1018, 0x11caedfa, - 0x3d25bdd8, 0xe2e1c3c9, 0x44421659, 0x0a121386, 0xd90cec6e, 0xd5abea2a, - 0x64af674e, 0xda86a85f, 0xbebfe988, 0x64e4c3fe, 0x9dbc8057, 0xf0f7c086, - 0x60787bf8, 0x6003604d, 0xd1fd8346, 0xf6381fb0, 0x7745ae04, 0xd736fccc, - 0x83426b33, 0xf01eab71, 0xb0804187, 0x3c005e5f, 0x77a057be, 0xbde8ae24, - 0x55464299, 0xbf582e61, 0x4e58f48f, 0xf2ddfda2, 0xf474ef38, 0x8789bdc2, - 0x5366f9c3, 0xc8b38e74, 0xb475f255, 0x46fcd9b9, 0x7aeb2661, 0x8b1ddf84, - 0x846a0e79, 0x915f95e2, 0x466e598e, 0x20b45770, 0x8cd55591, 0xc902de4c, - 0xb90bace1, 0xbb8205d0, 0x11a86248, 0x7574a99e, 0xb77f19b6, 0xe0a9dc09, - 0x662d09a1, 0xc4324633, 0xe85a1f02, 0x09f0be8c, 0x4a99a025, 0x1d6efe10, - 0x1ab93d1d, 0x0ba5a4df, 0xa186f20f, 0x2868f169, 0xdcb7da83, 0x573906fe, - 0xa1e2ce9b, 0x4fcd7f52, 0x50115e01, 0xa70683fa, 0xa002b5c4, 0x0de6d027, - 0x9af88c27, 0x773f8641, 0xc3604c06, 0x61a806b5, 0xf0177a28, 0xc0f586e0, - 0x006058aa, 0x30dc7d62, 0x11e69ed7, 0x2338ea63, 0x53c2dd94, 0xc2c21634, - 0xbbcbee56, 0x90bcb6de, 0xebfc7da1, 0xce591d76, 0x6f05e409, 0x4b7c0188, - 0x39720a3d, 0x7c927c24, 0x86e3725f, 0x724d9db9, 0x1ac15bb4, 0xd39eb8fc, - 0xed545578, 0x08fca5b5, 0xd83d7cd3, 0x4dad0fc4, 0x1e50ef5e, 0xb161e6f8, - 0xa28514d9, 0x6c51133c, 0x6fd5c7e7, 0x56e14ec4, 0x362abfce, 0xddc6c837, - 0xd79a3234, 0x92638212, 0x670efa8e, 0x406000e0, }, - - /* S-Box 3 */ - { 0x3a39ce37, 0xd3faf5cf, 0xabc27737, 0x5ac52d1b, 0x5cb0679e, 0x4fa33742, - 0xd3822740, 0x99bc9bbe, 0xd5118e9d, 0xbf0f7315, 0xd62d1c7e, 0xc700c47b, - 0xb78c1b6b, 0x21a19045, 0xb26eb1be, 0x6a366eb4, 0x5748ab2f, 0xbc946e79, - 0xc6a376d2, 0x6549c2c8, 0x530ff8ee, 0x468dde7d, 0xd5730a1d, 0x4cd04dc6, - 0x2939bbdb, 0xa9ba4650, 0xac9526e8, 0xbe5ee304, 0xa1fad5f0, 0x6a2d519a, - 0x63ef8ce2, 0x9a86ee22, 0xc089c2b8, 0x43242ef6, 0xa51e03aa, 0x9cf2d0a4, - 0x83c061ba, 0x9be96a4d, 0x8fe51550, 0xba645bd6, 0x2826a2f9, 0xa73a3ae1, - 0x4ba99586, 0xef5562e9, 0xc72fefd3, 0xf752f7da, 0x3f046f69, 0x77fa0a59, - 0x80e4a915, 0x87b08601, 0x9b09e6ad, 0x3b3ee593, 0xe990fd5a, 0x9e34d797, - 0x2cf0b7d9, 0x022b8b51, 0x96d5ac3a, 0x017da67d, 0xd1cf3ed6, 0x7c7d2d28, - 0x1f9f25cf, 0xadf2b89b, 0x5ad6b472, 0x5a88f54c, 0xe029ac71, 0xe019a5e6, - 0x47b0acfd, 0xed93fa9b, 0xe8d3c48d, 0x283b57cc, 0xf8d56629, 0x79132e28, - 0x785f0191, 0xed756055, 0xf7960e44, 0xe3d35e8c, 0x15056dd4, 0x88f46dba, - 0x03a16125, 0x0564f0bd, 0xc3eb9e15, 0x3c9057a2, 0x97271aec, 0xa93a072a, - 0x1b3f6d9b, 0x1e6321f5, 0xf59c66fb, 0x26dcf319, 0x7533d928, 0xb155fdf5, - 0x03563482, 0x8aba3cbb, 0x28517711, 0xc20ad9f8, 0xabcc5167, 0xccad925f, - 0x4de81751, 0x3830dc8e, 0x379d5862, 0x9320f991, 0xea7a90c2, 0xfb3e7bce, - 0x5121ce64, 0x774fbe32, 0xa8b6e37e, 0xc3293d46, 0x48de5369, 0x6413e680, - 0xa2ae0810, 0xdd6db224, 0x69852dfd, 0x09072166, 0xb39a460a, 0x6445c0dd, - 0x586cdecf, 0x1c20c8ae, 0x5bbef7dd, 0x1b588d40, 0xccd2017f, 0x6bb4e3bb, - 0xdda26a7e, 0x3a59ff45, 0x3e350a44, 0xbcb4cdd5, 0x72eacea8, 0xfa6484bb, - 0x8d6612ae, 0xbf3c6f47, 0xd29be463, 0x542f5d9e, 0xaec2771b, 0xf64e6370, - 0x740e0d8d, 0xe75b1357, 0xf8721671, 0xaf537d5d, 0x4040cb08, 0x4eb4e2cc, - 0x34d2466a, 0x0115af84, 0xe1b00428, 0x95983a1d, 0x06b89fb4, 0xce6ea048, - 0x6f3f3b82, 0x3520ab82, 0x011a1d4b, 0x277227f8, 0x611560b1, 0xe7933fdc, - 0xbb3a792b, 0x344525bd, 0xa08839e1, 0x51ce794b, 0x2f32c9b7, 0xa01fbac9, - 0xe01cc87e, 0xbcc7d1f6, 0xcf0111c3, 0xa1e8aac7, 0x1a908749, 0xd44fbd9a, - 0xd0dadecb, 0xd50ada38, 0x0339c32a, 0xc6913667, 0x8df9317c, 0xe0b12b4f, - 0xf79e59b7, 0x43f5bb3a, 0xf2d519ff, 0x27d9459c, 0xbf97222c, 0x15e6fc2a, - 0x0f91fc71, 0x9b941525, 0xfae59361, 0xceb69ceb, 0xc2a86459, 0x12baa8d1, - 0xb6c1075e, 0xe3056a0c, 0x10d25065, 0xcb03a442, 0xe0ec6e0e, 0x1698db3b, - 0x4c98a0be, 0x3278e964, 0x9f1f9532, 0xe0d392df, 0xd3a0342b, 0x8971f21e, - 0x1b0a7441, 0x4ba3348c, 0xc5be7120, 0xc37632d8, 0xdf359f8d, 0x9b992f2e, - 0xe60b6f47, 0x0fe3f11d, 0xe54cda54, 0x1edad891, 0xce6279cf, 0xcd3e7e6f, - 0x1618b166, 0xfd2c1d05, 0x848fd2c5, 0xf6fb2299, 0xf523f357, 0xa6327623, - 0x93a83531, 0x56cccd02, 0xacf08162, 0x5a75ebb5, 0x6e163697, 0x88d273cc, - 0xde966292, 0x81b949d0, 0x4c50901b, 0x71c65614, 0xe6c6c7bd, 0x327a140a, - 0x45e1d006, 0xc3f27b9a, 0xc9aa53fd, 0x62a80f00, 0xbb25bfe2, 0x35bdd2f6, - 0x71126905, 0xb2040222, 0xb6cbcf7c, 0xcd769c2b, 0x53113ec0, 0x1640e3d3, - 0x38abbd60, 0x2547adf0, 0xba38209c, 0xf746ce76, 0x77afa1c5, 0x20756060, - 0x85cbfe4e, 0x8ae88dd8, 0x7aaaf9b0, 0x4cf9aa7e, 0x1948c25c, 0x02fb8a8c, - 0x01c36ae4, 0xd6ebe1f9, 0x90d4f869, 0xa65cdea0, 0x3f09252d, 0xc208e69f, - 0xb74e6132, 0xce77e25b, 0x578fdfe3, 0x3ac372e6, }, -}; - -static const uint32_t bf_pinit[] = { - /* P-Box */ - 0x243f6a88, 0x85a308d3, 0x13198a2e, 0x03707344, 0xa4093822, 0x299f31d0, - 0x082efa98, 0xec4e6c89, 0x452821e6, 0x38d01377, 0xbe5466cf, 0x34e90c6c, - 0xc0ac29b7, 0xc97c50dd, 0x3f84d5b5, 0xb5470917, 0x9216d5d9, 0x8979fb1b, -}; - -#define KEYBYTES 24 - -static const unsigned char rtmpe9_keys[16][KEYBYTES] = { - { 0x79, 0x34, 0x77, 0x4c, 0x67, 0xd1, 0x38, 0x3a, 0xdf, 0xb3, 0x56, 0xbe, - 0x8b, 0x7b, 0xd0, 0x24, 0x38, 0xe0, 0x73, 0x58, 0x41, 0x5d, 0x69, 0x67, }, - { 0x46, 0xf6, 0xb4, 0xcc, 0x01, 0x93, 0xe3, 0xa1, 0x9e, 0x7d, 0x3c, 0x65, - 0x55, 0x86, 0xfd, 0x09, 0x8f, 0xf7, 0xb3, 0xc4, 0x6f, 0x41, 0xca, 0x5c, }, - { 0x1a, 0xe7, 0xe2, 0xf3, 0xf9, 0x14, 0x79, 0x94, 0xc0, 0xd3, 0x97, 0x43, - 0x08, 0x7b, 0xb3, 0x84, 0x43, 0x2f, 0x9d, 0x84, 0x3f, 0x21, 0x01, 0x9b, }, - { 0xd3, 0xe3, 0x54, 0xb0, 0xf7, 0x1d, 0xf6, 0x2b, 0x5a, 0x43, 0x4d, 0x04, - 0x83, 0x64, 0x3e, 0x0d, 0x59, 0x2f, 0x61, 0xcb, 0xb1, 0x6a, 0x59, 0x0d, }, - { 0xc8, 0xc1, 0xe9, 0xb8, 0x16, 0x56, 0x99, 0x21, 0x7b, 0x5b, 0x36, 0xb7, - 0xb5, 0x9b, 0xdf, 0x06, 0x49, 0x2c, 0x97, 0xf5, 0x95, 0x48, 0x85, 0x7e, }, - { 0xeb, 0xe5, 0xe6, 0x2e, 0xa4, 0xba, 0xd4, 0x2c, 0xf2, 0x16, 0xe0, 0x8f, - 0x66, 0x23, 0xa9, 0x43, 0x41, 0xce, 0x38, 0x14, 0x84, 0x95, 0x00, 0x53, }, - { 0x66, 0xdb, 0x90, 0xf0, 0x3b, 0x4f, 0xf5, 0x6f, 0xe4, 0x9c, 0x20, 0x89, - 0x35, 0x5e, 0xd2, 0xb2, 0xc3, 0x9e, 0x9f, 0x7f, 0x63, 0xb2, 0x28, 0x81, }, - { 0xbb, 0x20, 0xac, 0xed, 0x2a, 0x04, 0x6a, 0x19, 0x94, 0x98, 0x9b, 0xc8, - 0xff, 0xcd, 0x93, 0xef, 0xc6, 0x0d, 0x56, 0xa7, 0xeb, 0x13, 0xd9, 0x30, }, - { 0xbc, 0xf2, 0x43, 0x82, 0x09, 0x40, 0x8a, 0x87, 0x25, 0x43, 0x6d, 0xe6, - 0xbb, 0xa4, 0xb9, 0x44, 0x58, 0x3f, 0x21, 0x7c, 0x99, 0xbb, 0x3f, 0x24, }, - { 0xec, 0x1a, 0xaa, 0xcd, 0xce, 0xbd, 0x53, 0x11, 0xd2, 0xfb, 0x83, 0xb6, - 0xc3, 0xba, 0xab, 0x4f, 0x62, 0x79, 0xe8, 0x65, 0xa9, 0x92, 0x28, 0x76, }, - { 0xc6, 0x0c, 0x30, 0x03, 0x91, 0x18, 0x2d, 0x7b, 0x79, 0xda, 0xe1, 0xd5, - 0x64, 0x77, 0x9a, 0x12, 0xc5, 0xb1, 0xd7, 0x91, 0x4f, 0x96, 0x4c, 0xa3, }, - { 0xd7, 0x7c, 0x2a, 0xbf, 0xa6, 0xe7, 0x85, 0x7c, 0x45, 0xad, 0xff, 0x12, - 0x94, 0xd8, 0xde, 0xa4, 0x5c, 0x3d, 0x79, 0xa4, 0x44, 0x02, 0x5d, 0x22, }, - { 0x16, 0x19, 0x0d, 0x81, 0x6a, 0x4c, 0xc7, 0xf8, 0xb8, 0xf9, 0x4e, 0xcd, - 0x2c, 0x9e, 0x90, 0x84, 0xb2, 0x08, 0x25, 0x60, 0xe1, 0x1e, 0xae, 0x18, }, - { 0xe9, 0x7c, 0x58, 0x26, 0x1b, 0x51, 0x9e, 0x49, 0x82, 0x60, 0x61, 0xfc, - 0xa0, 0xa0, 0x1b, 0xcd, 0xf5, 0x05, 0xd6, 0xa6, 0x6d, 0x07, 0x88, 0xa3, }, - { 0x2b, 0x97, 0x11, 0x8b, 0xd9, 0x4e, 0xd9, 0xdf, 0x20, 0xe3, 0x9c, 0x10, - 0xe6, 0xa1, 0x35, 0x21, 0x11, 0xf9, 0x13, 0x0d, 0x0b, 0x24, 0x65, 0xb2, }, - { 0x53, 0x6a, 0x4c, 0x54, 0xac, 0x8b, 0x9b, 0xb8, 0x97, 0x29, 0xfc, 0x60, - 0x2c, 0x5b, 0x3a, 0x85, 0x68, 0xb5, 0xaa, 0x6a, 0x44, 0xcd, 0x3f, 0xa7, }, -}; - -#define BF_ENC(X,S) \ - (((S[0][X>>24] + S[1][X>>16 & 0xff]) ^ S[2][(X>>8) & 0xff]) + S[3][X & 0xff]) - -static void bf_enc(uint32_t *x, bf_key *key) -{ - uint32_t Xl; - uint32_t Xr; - uint32_t temp; - int i; - - Xl = x[0]; - Xr = x[1]; - - for (i = 0; i < BF_ROUNDS; ++i) { - Xl ^= key->p[i]; - Xr ^= BF_ENC(Xl,key->s); - - temp = Xl; - Xl = Xr; - Xr = temp; - } - - Xl ^= key->p[BF_ROUNDS]; - Xr ^= key->p[BF_ROUNDS + 1]; - - x[0] = Xr; - x[1] = Xl; -} - -static void bf_setkey(const unsigned char *kp, int keybytes, bf_key *key) -{ - int i; - int j; - int k; - uint32_t data; - uint32_t d[2]; - - memcpy(key->p, bf_pinit, sizeof(key->p)); - memcpy(key->s, bf_sinit, sizeof(key->s)); - - j = 0; - for (i = 0; i < BF_ROUNDS + 2; ++i) { - data = 0x00000000; - for (k = 0; k < 4; ++k) { - data = (data << 8) | kp[j]; - j = j + 1; - if (j >= keybytes) { - j = 0; - } - } - key->p[i] ^= data; - } - - d[0] = 0x00000000; - d[1] = 0x00000000; - - for (i = 0; i < BF_ROUNDS + 2; i += 2) { - bf_enc(d, key); - - key->p[i] = d[0]; - key->p[i + 1] = d[1]; - } - - for (i = 0; i < 4; ++i) { - for (j = 0; j < 256; j += 2) { - - bf_enc(d, key); - - key->s[i][j] = d[0]; - key->s[i][j + 1] = d[1]; - } - } -} - -static void rtmpe9_sig(uint8_t *in, uint8_t *out, int keyid) -{ - uint32_t d[2]; - bf_key key; - - bf_setkey(rtmpe9_keys[keyid], KEYBYTES, &key); - - /* input is little-endian */ - d[0] = in[0] | (in[1] << 8) | (in[2] << 16) | (in[3] << 24); - d[1] = in[4] | (in[5] << 8) | (in[6] << 16) | (in[7] << 24); - bf_enc(d, &key); - out[0] = d[0] & 0xff; - out[1] = (d[0] >> 8) & 0xff; - out[2] = (d[0] >> 16) & 0xff; - out[3] = (d[0] >> 24) & 0xff; - out[4] = d[1] & 0xff; - out[5] = (d[1] >> 8) & 0xff; - out[6] = (d[1] >> 16) & 0xff; - out[7] = (d[1] >> 24) & 0xff; -} - static int HandShake(RTMP * r, int FP9HandShake) { @@ -936,7 +605,8 @@ for (i=0; i - #endif /* CRYPTO */ +#include + #define AGENT "Mozilla/5.0" HTTPResult @@ -435,7 +435,7 @@ /* Convert a Unix time to a network time string * Weekday, DD-MMM-YYYY HH:MM:SS GMT */ -static void +void strtime(time_t * t, char *s) { struct tm *tm; @@ -466,7 +466,7 @@ date[0] = '\0'; #ifdef _WIN32 -#ifdef XBMC4XBOX +#ifdef _XBOX hpre.av_val = "Q:"; hpre.av_len = 2; home.av_val = "\\UserData"; diff -Nru rtmpdump-2.4~20110711.gitc28f1bab/librtmp/librtmp.3 rtmpdump-2.3/librtmp/librtmp.3 --- rtmpdump-2.4~20110711.gitc28f1bab/librtmp/librtmp.3 2011-08-16 11:42:12.000000000 +0000 +++ rtmpdump-2.3/librtmp/librtmp.3 2010-06-30 19:58:35.000000000 +0000 @@ -1,4 +1,4 @@ -.TH LIBRTMP 3 "2010-07-03" "RTMPDump v2.3" +.TH LIBRTMP 3 "2010-05-29" "RTMPDump v2.2e" .\" Copyright 2010 Howard Chu. .\" Copying permitted according to the GNU General Public License V2. .SH NAME @@ -57,19 +57,14 @@ .BR RTMP_Free (). All data is transferred using FLV format. The basic session requires -an RTMP URL. The RTMP URL format is of the form +an RTMP URL. Additional options may be specified by appending +space-separated key=value pairs to the URL. The RTMP URL format +is of the form .nf rtmp[t][e|s]://hostname[:port][/app[/playpath]] .fi Plain rtmp, as well as tunneled and encrypted sessions are supported. - -Additional options may be specified by appending space-separated -key=value pairs to the URL. Special characters in values may need -to be escaped to prevent misinterpretation by the option parser. -The escape encoding uses a backslash followed by two hexadecimal digits -representing the ASCII value of the character. E.g., spaces must -be escaped as \fB\\20\fP and backslashes must be escaped as \fB\\5c\fP. .SH OPTIONS .SS "Network Parameters" These options define how to connect to the media server. diff -Nru rtmpdump-2.4~20110711.gitc28f1bab/librtmp/librtmp.3.html rtmpdump-2.3/librtmp/librtmp.3.html --- rtmpdump-2.4~20110711.gitc28f1bab/librtmp/librtmp.3.html 2011-08-16 11:42:12.000000000 +0000 +++ rtmpdump-2.3/librtmp/librtmp.3.html 2010-06-30 19:58:35.000000000 +0000 @@ -6,7 +6,7 @@ LIBRTMP(3)LIBRTMP(3) -RTMPDump v2.32010-07-03LIBRTMP(3) +RTMPDump v2.2e2010-05-29LIBRTMP(3)