On Sat, Jun 30, 2012 at 11:13 PM, Samuel Pitoiset <[email protected]> wrote: > --- > libavutil/Makefile | 3 + > libavutil/avutil.h | 2 +- > libavutil/blowfish.c | 504 > ++++++++++++++++++++++++++++++++++++++++++++++ > libavutil/blowfish.h | 60 ++++++ > tests/fate/libavutil.mak | 4 + > tests/ref/fate/blowfish | 2 + > 6 files changed, 574 insertions(+), 1 deletions(-) > create mode 100644 libavutil/blowfish.c > create mode 100644 libavutil/blowfish.h > create mode 100644 tests/ref/fate/blowfish > > diff --git a/libavutil/Makefile b/libavutil/Makefile > index 6fe174b..ea8139f 100644 > --- a/libavutil/Makefile > +++ b/libavutil/Makefile > @@ -9,6 +9,7 @@ HEADERS = adler32.h > \ > avstring.h \ > avutil.h \ > base64.h \ > + blowfish.h \ > bswap.h \ > common.h \ > cpu.h \ > @@ -51,6 +52,7 @@ OBJS = adler32.o > \ > audioconvert.o \ > avstring.o \ > base64.o \ > + blowfish.o \ > cpu.o \ > crc.o \ > des.o \ > @@ -86,6 +88,7 @@ TESTPROGS = adler32 > \ > aes \ > avstring \ > base64 \ > + blowfish \ > cpu \ > crc \ > des \ > diff --git a/libavutil/avutil.h b/libavutil/avutil.h > index 351e827..2aae161 100644 > --- a/libavutil/avutil.h > +++ b/libavutil/avutil.h > @@ -152,7 +152,7 @@ > */ > > #define LIBAVUTIL_VERSION_MAJOR 51 > -#define LIBAVUTIL_VERSION_MINOR 34 > +#define LIBAVUTIL_VERSION_MINOR 0 > #define LIBAVUTIL_VERSION_MICRO 0 > > #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ > diff --git a/libavutil/blowfish.c b/libavutil/blowfish.c > new file mode 100644 > index 0000000..0fb88eb > --- /dev/null > +++ b/libavutil/blowfish.c > @@ -0,0 +1,504 @@ > +/* > + * Blowfish algorithm > + * Copyright (c) 2012 Samuel Pitoiset > + * > + * loosely based on Paul Kocher's implementation > + * > + * This file is part of Libav. > + * > + * Libav is free software; you can redistribute it and/or > + * modify it under the terms of the GNU Lesser General Public > + * License as published by the Free Software Foundation; either > + * version 2.1 of the License, or (at your option) any later version. > + * > + * Libav 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 > + * Lesser General Public License for more details. > + * > + * You should have received a copy of the GNU Lesser General Public > + * License along with Libav; if not, write to the Free Software > + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 > USA > + */ > + > +#include "avutil.h" > +#include "common.h" > +#include "blowfish.h" > + > +static const uint32_t orig_p[BF_ROUNDS + 2] = { > + 0x243F6A88u, 0x85A308D3u, 0x13198A2Eu, 0x03707344u, > + 0xA4093822u, 0x299F31D0u, 0x082EFA98u, 0xEC4E6C89u, > + 0x452821E6u, 0x38D01377u, 0xBE5466CFu, 0x34E90C6Cu, > + 0xC0AC29B7u, 0xC97C50DDu, 0x3F84D5B5u, 0xB5470917u, > + 0x9216D5D9u, 0x8979FB1Bu > +}; > + > +static const uint32_t orig_s[4][256] = { > + { 0xD1310BA6u, 0x98DFB5ACu, 0x2FFD72DBu, 0xD01ADFB7u, > + 0xB8E1AFEDu, 0x6A267E96u, 0xBA7C9045u, 0xF12C7F99u, > + 0x24A19947u, 0xB3916CF7u, 0x0801F2E2u, 0x858EFC16u, > + 0x636920D8u, 0x71574E69u, 0xA458FEA3u, 0xF4933D7Eu, > + 0x0D95748Fu, 0x728EB658u, 0x718BCD58u, 0x82154AEEu, > + 0x7B54A41Du, 0xC25A59B5u, 0x9C30D539u, 0x2AF26013u, > + 0xC5D1B023u, 0x286085F0u, 0xCA417918u, 0xB8DB38EFu, > + 0x8E79DCB0u, 0x603A180Eu, 0x6C9E0E8Bu, 0xB01E8A3Eu, > + 0xD71577C1u, 0xBD314B27u, 0x78AF2FDAu, 0x55605C60u, > + 0xE65525F3u, 0xAA55AB94u, 0x57489862u, 0x63E81440u, > + 0x55CA396Au, 0x2AAB10B6u, 0xB4CC5C34u, 0x1141E8CEu, > + 0xA15486AFu, 0x7C72E993u, 0xB3EE1411u, 0x636FBC2Au, > + 0x2BA9C55Du, 0x741831F6u, 0xCE5C3E16u, 0x9B87931Eu, > + 0xAFD6BA33u, 0x6C24CF5Cu, 0x7A325381u, 0x28958677u, > + 0x3B8F4898u, 0x6B4BB9AFu, 0xC4BFE81Bu, 0x66282193u, > + 0x61D809CCu, 0xFB21A991u, 0x487CAC60u, 0x5DEC8032u, > + 0xEF845D5Du, 0xE98575B1u, 0xDC262302u, 0xEB651B88u, > + 0x23893E81u, 0xD396ACC5u, 0x0F6D6FF3u, 0x83F44239u, > + 0x2E0B4482u, 0xA4842004u, 0x69C8F04Au, 0x9E1F9B5Eu, > + 0x21C66842u, 0xF6E96C9Au, 0x670C9C61u, 0xABD388F0u, > + 0x6A51A0D2u, 0xD8542F68u, 0x960FA728u, 0xAB5133A3u, > + 0x6EEF0B6Cu, 0x137A3BE4u, 0xBA3BF050u, 0x7EFB2A98u, > + 0xA1F1651Du, 0x39AF0176u, 0x66CA593Eu, 0x82430E88u, > + 0x8CEE8619u, 0x456F9FB4u, 0x7D84A5C3u, 0x3B8B5EBEu, > + 0xE06F75D8u, 0x85C12073u, 0x401A449Fu, 0x56C16AA6u, > + 0x4ED3AA62u, 0x363F7706u, 0x1BFEDF72u, 0x429B023Du, > + 0x37D0D724u, 0xD00A1248u, 0xDB0FEAD3u, 0x49F1C09Bu, > + 0x075372C9u, 0x80991B7Bu, 0x25D479D8u, 0xF6E8DEF7u, > + 0xE3FE501Au, 0xB6794C3Bu, 0x976CE0BDu, 0x04C006BAu, > + 0xC1A94FB6u, 0x409F60C4u, 0x5E5C9EC2u, 0x196A2463u, > + 0x68FB6FAFu, 0x3E6C53B5u, 0x1339B2EBu, 0x3B52EC6Fu, > + 0x6DFC511Fu, 0x9B30952Cu, 0xCC814544u, 0xAF5EBD09u, > + 0xBEE3D004u, 0xDE334AFDu, 0x660F2807u, 0x192E4BB3u, > + 0xC0CBA857u, 0x45C8740Fu, 0xD20B5F39u, 0xB9D3FBDBu, > + 0x5579C0BDu, 0x1A60320Au, 0xD6A100C6u, 0x402C7279u, > + 0x679F25FEu, 0xFB1FA3CCu, 0x8EA5E9F8u, 0xDB3222F8u, > + 0x3C7516DFu, 0xFD616B15u, 0x2F501EC8u, 0xAD0552ABu, > + 0x323DB5FAu, 0xFD238760u, 0x53317B48u, 0x3E00DF82u, > + 0x9E5C57BBu, 0xCA6F8CA0u, 0x1A87562Eu, 0xDF1769DBu, > + 0xD542A8F6u, 0x287EFFC3u, 0xAC6732C6u, 0x8C4F5573u, > + 0x695B27B0u, 0xBBCA58C8u, 0xE1FFA35Du, 0xB8F011A0u, > + 0x10FA3D98u, 0xFD2183B8u, 0x4AFCB56Cu, 0x2DD1D35Bu, > + 0x9A53E479u, 0xB6F84565u, 0xD28E49BCu, 0x4BFB9790u, > + 0xE1DDF2DAu, 0xA4CB7E33u, 0x62FB1341u, 0xCEE4C6E8u, > + 0xEF20CADAu, 0x36774C01u, 0xD07E9EFEu, 0x2BF11FB4u, > + 0x95DBDA4Du, 0xAE909198u, 0xEAAD8E71u, 0x6B93D5A0u, > + 0xD08ED1D0u, 0xAFC725E0u, 0x8E3C5B2Fu, 0x8E7594B7u, > + 0x8FF6E2FBu, 0xF2122B64u, 0x8888B812u, 0x900DF01Cu, > + 0x4FAD5EA0u, 0x688FC31Cu, 0xD1CFF191u, 0xB3A8C1ADu, > + 0x2F2F2218u, 0xBE0E1777u, 0xEA752DFEu, 0x8B021FA1u, > + 0xE5A0CC0Fu, 0xB56F74E8u, 0x18ACF3D6u, 0xCE89E299u, > + 0xB4A84FE0u, 0xFD13E0B7u, 0x7CC43B81u, 0xD2ADA8D9u, > + 0x165FA266u, 0x80957705u, 0x93CC7314u, 0x211A1477u, > + 0xE6AD2065u, 0x77B5FA86u, 0xC75442F5u, 0xFB9D35CFu, > + 0xEBCDAF0Cu, 0x7B3E89A0u, 0xD6411BD3u, 0xAE1E7E49u, > + 0x00250E2Du, 0x2071B35Eu, 0x226800BBu, 0x57B8E0AFu, > + 0x2464369Bu, 0xF009B91Eu, 0x5563911Du, 0x59DFA6AAu, > + 0x78C14389u, 0xD95A537Fu, 0x207D5BA2u, 0x02E5B9C5u, > + 0x83260376u, 0x6295CFA9u, 0x11C81968u, 0x4E734A41u, > + 0xB3472DCAu, 0x7B14A94Au, 0x1B510052u, 0x9A532915u, > + 0xD60F573Fu, 0xBC9BC6E4u, 0x2B60A476u, 0x81E67400u, > + 0x08BA6FB5u, 0x571BE91Fu, 0xF296EC6Bu, 0x2A0DD915u, > + 0xB6636521u, 0xE7B9F9B6u, 0xFF34052Eu, 0xC5855664u, > + 0x53B02D5Du, 0xA99F8FA1u, 0x08BA4799u, 0x6E85076Au }, > + { 0x4B7A70E9u, 0xB5B32944u, 0xDB75092Eu, 0xC4192623u, > + 0xAD6EA6B0u, 0x49A7DF7Du, 0x9CEE60B8u, 0x8FEDB266u, > + 0xECAA8C71u, 0x699A17FFu, 0x5664526Cu, 0xC2B19EE1u, > + 0x193602A5u, 0x75094C29u, 0xA0591340u, 0xE4183A3Eu, > + 0x3F54989Au, 0x5B429D65u, 0x6B8FE4D6u, 0x99F73FD6u, > + 0xA1D29C07u, 0xEFE830F5u, 0x4D2D38E6u, 0xF0255DC1u, > + 0x4CDD2086u, 0x8470EB26u, 0x6382E9C6u, 0x021ECC5Eu, > + 0x09686B3Fu, 0x3EBAEFC9u, 0x3C971814u, 0x6B6A70A1u, > + 0x687F3584u, 0x52A0E286u, 0xB79C5305u, 0xAA500737u, > + 0x3E07841Cu, 0x7FDEAE5Cu, 0x8E7D44ECu, 0x5716F2B8u, > + 0xB03ADA37u, 0xF0500C0Du, 0xF01C1F04u, 0x0200B3FFu, > + 0xAE0CF51Au, 0x3CB574B2u, 0x25837A58u, 0xDC0921BDu, > + 0xD19113F9u, 0x7CA92FF6u, 0x94324773u, 0x22F54701u, > + 0x3AE5E581u, 0x37C2DADCu, 0xC8B57634u, 0x9AF3DDA7u, > + 0xA9446146u, 0x0FD0030Eu, 0xECC8C73Eu, 0xA4751E41u, > + 0xE238CD99u, 0x3BEA0E2Fu, 0x3280BBA1u, 0x183EB331u, > + 0x4E548B38u, 0x4F6DB908u, 0x6F420D03u, 0xF60A04BFu, > + 0x2CB81290u, 0x24977C79u, 0x5679B072u, 0xBCAF89AFu, > + 0xDE9A771Fu, 0xD9930810u, 0xB38BAE12u, 0xDCCF3F2Eu, > + 0x5512721Fu, 0x2E6B7124u, 0x501ADDE6u, 0x9F84CD87u, > + 0x7A584718u, 0x7408DA17u, 0xBC9F9ABCu, 0xE94B7D8Cu, > + 0xEC7AEC3Au, 0xDB851DFAu, 0x63094366u, 0xC464C3D2u, > + 0xEF1C1847u, 0x3215D908u, 0xDD433B37u, 0x24C2BA16u, > + 0x12A14D43u, 0x2A65C451u, 0x50940002u, 0x133AE4DDu, > + 0x71DFF89Eu, 0x10314E55u, 0x81AC77D6u, 0x5F11199Bu, > + 0x043556F1u, 0xD7A3C76Bu, 0x3C11183Bu, 0x5924A509u, > + 0xF28FE6EDu, 0x97F1FBFAu, 0x9EBABF2Cu, 0x1E153C6Eu, > + 0x86E34570u, 0xEAE96FB1u, 0x860E5E0Au, 0x5A3E2AB3u, > + 0x771FE71Cu, 0x4E3D06FAu, 0x2965DCB9u, 0x99E71D0Fu, > + 0x803E89D6u, 0x5266C825u, 0x2E4CC978u, 0x9C10B36Au, > + 0xC6150EBAu, 0x94E2EA78u, 0xA5FC3C53u, 0x1E0A2DF4u, > + 0xF2F74EA7u, 0x361D2B3Du, 0x1939260Fu, 0x19C27960u, > + 0x5223A708u, 0xF71312B6u, 0xEBADFE6Eu, 0xEAC31F66u, > + 0xE3BC4595u, 0xA67BC883u, 0xB17F37D1u, 0x018CFF28u, > + 0xC332DDEFu, 0xBE6C5AA5u, 0x65582185u, 0x68AB9802u, > + 0xEECEA50Fu, 0xDB2F953Bu, 0x2AEF7DADu, 0x5B6E2F84u, > + 0x1521B628u, 0x29076170u, 0xECDD4775u, 0x619F1510u, > + 0x13CCA830u, 0xEB61BD96u, 0x0334FE1Eu, 0xAA0363CFu, > + 0xB5735C90u, 0x4C70A239u, 0xD59E9E0Bu, 0xCBAADE14u, > + 0xEECC86BCu, 0x60622CA7u, 0x9CAB5CABu, 0xB2F3846Eu, > + 0x648B1EAFu, 0x19BDF0CAu, 0xA02369B9u, 0x655ABB50u, > + 0x40685A32u, 0x3C2AB4B3u, 0x319EE9D5u, 0xC021B8F7u, > + 0x9B540B19u, 0x875FA099u, 0x95F7997Eu, 0x623D7DA8u, > + 0xF837889Au, 0x97E32D77u, 0x11ED935Fu, 0x16681281u, > + 0x0E358829u, 0xC7E61FD6u, 0x96DEDFA1u, 0x7858BA99u, > + 0x57F584A5u, 0x1B227263u, 0x9B83C3FFu, 0x1AC24696u, > + 0xCDB30AEBu, 0x532E3054u, 0x8FD948E4u, 0x6DBC3128u, > + 0x58EBF2EFu, 0x34C6FFEAu, 0xFE28ED61u, 0xEE7C3C73u, > + 0x5D4A14D9u, 0xE864B7E3u, 0x42105D14u, 0x203E13E0u, > + 0x45EEE2B6u, 0xA3AAABEAu, 0xDB6C4F15u, 0xFACB4FD0u, > + 0xC742F442u, 0xEF6ABBB5u, 0x654F3B1Du, 0x41CD2105u, > + 0xD81E799Eu, 0x86854DC7u, 0xE44B476Au, 0x3D816250u, > + 0xCF62A1F2u, 0x5B8D2646u, 0xFC8883A0u, 0xC1C7B6A3u, > + 0x7F1524C3u, 0x69CB7492u, 0x47848A0Bu, 0x5692B285u, > + 0x095BBF00u, 0xAD19489Du, 0x1462B174u, 0x23820E00u, > + 0x58428D2Au, 0x0C55F5EAu, 0x1DADF43Eu, 0x233F7061u, > + 0x3372F092u, 0x8D937E41u, 0xD65FECF1u, 0x6C223BDBu, > + 0x7CDE3759u, 0xCBEE7460u, 0x4085F2A7u, 0xCE77326Eu, > + 0xA6078084u, 0x19F8509Eu, 0xE8EFD855u, 0x61D99735u, > + 0xA969A7AAu, 0xC50C06C2u, 0x5A04ABFCu, 0x800BCADCu, > + 0x9E447A2Eu, 0xC3453484u, 0xFDD56705u, 0x0E1E9EC9u, > + 0xDB73DBD3u, 0x105588CDu, 0x675FDA79u, 0xE3674340u, > + 0xC5C43465u, 0x713E38D8u, 0x3D28F89Eu, 0xF16DFF20u, > + 0x153E21E7u, 0x8FB03D4Au, 0xE6E39F2Bu, 0xDB83ADF7u }, > + { 0xE93D5A68u, 0x948140F7u, 0xF64C261Cu, 0x94692934u, > + 0x411520F7u, 0x7602D4F7u, 0xBCF46B2Eu, 0xD4A20068u, > + 0xD4082471u, 0x3320F46Au, 0x43B7D4B7u, 0x500061AFu, > + 0x1E39F62Eu, 0x97244546u, 0x14214F74u, 0xBF8B8840u, > + 0x4D95FC1Du, 0x96B591AFu, 0x70F4DDD3u, 0x66A02F45u, > + 0xBFBC09ECu, 0x03BD9785u, 0x7FAC6DD0u, 0x31CB8504u, > + 0x96EB27B3u, 0x55FD3941u, 0xDA2547E6u, 0xABCA0A9Au, > + 0x28507825u, 0x530429F4u, 0x0A2C86DAu, 0xE9B66DFBu, > + 0x68DC1462u, 0xD7486900u, 0x680EC0A4u, 0x27A18DEEu, > + 0x4F3FFEA2u, 0xE887AD8Cu, 0xB58CE006u, 0x7AF4D6B6u, > + 0xAACE1E7Cu, 0xD3375FECu, 0xCE78A399u, 0x406B2A42u, > + 0x20FE9E35u, 0xD9F385B9u, 0xEE39D7ABu, 0x3B124E8Bu, > + 0x1DC9FAF7u, 0x4B6D1856u, 0x26A36631u, 0xEAE397B2u, > + 0x3A6EFA74u, 0xDD5B4332u, 0x6841E7F7u, 0xCA7820FBu, > + 0xFB0AF54Eu, 0xD8FEB397u, 0x454056ACu, 0xBA489527u, > + 0x55533A3Au, 0x20838D87u, 0xFE6BA9B7u, 0xD096954Bu, > + 0x55A867BCu, 0xA1159A58u, 0xCCA92963u, 0x99E1DB33u, > + 0xA62A4A56u, 0x3F3125F9u, 0x5EF47E1Cu, 0x9029317Cu, > + 0xFDF8E802u, 0x04272F70u, 0x80BB155Cu, 0x05282CE3u, > + 0x95C11548u, 0xE4C66D22u, 0x48C1133Fu, 0xC70F86DCu, > + 0x07F9C9EEu, 0x41041F0Fu, 0x404779A4u, 0x5D886E17u, > + 0x325F51EBu, 0xD59BC0D1u, 0xF2BCC18Fu, 0x41113564u, > + 0x257B7834u, 0x602A9C60u, 0xDFF8E8A3u, 0x1F636C1Bu, > + 0x0E12B4C2u, 0x02E1329Eu, 0xAF664FD1u, 0xCAD18115u, > + 0x6B2395E0u, 0x333E92E1u, 0x3B240B62u, 0xEEBEB922u, > + 0x85B2A20Eu, 0xE6BA0D99u, 0xDE720C8Cu, 0x2DA2F728u, > + 0xD0127845u, 0x95B794FDu, 0x647D0862u, 0xE7CCF5F0u, > + 0x5449A36Fu, 0x877D48FAu, 0xC39DFD27u, 0xF33E8D1Eu, > + 0x0A476341u, 0x992EFF74u, 0x3A6F6EABu, 0xF4F8FD37u, > + 0xA812DC60u, 0xA1EBDDF8u, 0x991BE14Cu, 0xDB6E6B0Du, > + 0xC67B5510u, 0x6D672C37u, 0x2765D43Bu, 0xDCD0E804u, > + 0xF1290DC7u, 0xCC00FFA3u, 0xB5390F92u, 0x690FED0Bu, > + 0x667B9FFBu, 0xCEDB7D9Cu, 0xA091CF0Bu, 0xD9155EA3u, > + 0xBB132F88u, 0x515BAD24u, 0x7B9479BFu, 0x763BD6EBu, > + 0x37392EB3u, 0xCC115979u, 0x8026E297u, 0xF42E312Du, > + 0x6842ADA7u, 0xC66A2B3Bu, 0x12754CCCu, 0x782EF11Cu, > + 0x6A124237u, 0xB79251E7u, 0x06A1BBE6u, 0x4BFB6350u, > + 0x1A6B1018u, 0x11CAEDFAu, 0x3D25BDD8u, 0xE2E1C3C9u, > + 0x44421659u, 0x0A121386u, 0xD90CEC6Eu, 0xD5ABEA2Au, > + 0x64AF674Eu, 0xDA86A85Fu, 0xBEBFE988u, 0x64E4C3FEu, > + 0x9DBC8057u, 0xF0F7C086u, 0x60787BF8u, 0x6003604Du, > + 0xD1FD8346u, 0xF6381FB0u, 0x7745AE04u, 0xD736FCCCu, > + 0x83426B33u, 0xF01EAB71u, 0xB0804187u, 0x3C005E5Fu, > + 0x77A057BEu, 0xBDE8AE24u, 0x55464299u, 0xBF582E61u, > + 0x4E58F48Fu, 0xF2DDFDA2u, 0xF474EF38u, 0x8789BDC2u, > + 0x5366F9C3u, 0xC8B38E74u, 0xB475F255u, 0x46FCD9B9u, > + 0x7AEB2661u, 0x8B1DDF84u, 0x846A0E79u, 0x915F95E2u, > + 0x466E598Eu, 0x20B45770u, 0x8CD55591u, 0xC902DE4Cu, > + 0xB90BACE1u, 0xBB8205D0u, 0x11A86248u, 0x7574A99Eu, > + 0xB77F19B6u, 0xE0A9DC09u, 0x662D09A1u, 0xC4324633u, > + 0xE85A1F02u, 0x09F0BE8Cu, 0x4A99A025u, 0x1D6EFE10u, > + 0x1AB93D1Du, 0x0BA5A4DFu, 0xA186F20Fu, 0x2868F169u, > + 0xDCB7DA83u, 0x573906FEu, 0xA1E2CE9Bu, 0x4FCD7F52u, > + 0x50115E01u, 0xA70683FAu, 0xA002B5C4u, 0x0DE6D027u, > + 0x9AF88C27u, 0x773F8641u, 0xC3604C06u, 0x61A806B5u, > + 0xF0177A28u, 0xC0F586E0u, 0x006058AAu, 0x30DC7D62u, > + 0x11E69ED7u, 0x2338EA63u, 0x53C2DD94u, 0xC2C21634u, > + 0xBBCBEE56u, 0x90BCB6DEu, 0xEBFC7DA1u, 0xCE591D76u, > + 0x6F05E409u, 0x4B7C0188u, 0x39720A3Du, 0x7C927C24u, > + 0x86E3725Fu, 0x724D9DB9u, 0x1AC15BB4u, 0xD39EB8FCu, > + 0xED545578u, 0x08FCA5B5u, 0xD83D7CD3u, 0x4DAD0FC4u, > + 0x1E50EF5Eu, 0xB161E6F8u, 0xA28514D9u, 0x6C51133Cu, > + 0x6FD5C7E7u, 0x56E14EC4u, 0x362ABFCEu, 0xDDC6C837u, > + 0xD79A3234u, 0x92638212u, 0x670EFA8Eu, 0x406000E0u }, > + { 0x3A39CE37u, 0xD3FAF5CFu, 0xABC27737u, 0x5AC52D1Bu, > + 0x5CB0679Eu, 0x4FA33742u, 0xD3822740u, 0x99BC9BBEu, > + 0xD5118E9Du, 0xBF0F7315u, 0xD62D1C7Eu, 0xC700C47Bu, > + 0xB78C1B6Bu, 0x21A19045u, 0xB26EB1BEu, 0x6A366EB4u, > + 0x5748AB2Fu, 0xBC946E79u, 0xC6A376D2u, 0x6549C2C8u, > + 0x530FF8EEu, 0x468DDE7Du, 0xD5730A1Du, 0x4CD04DC6u, > + 0x2939BBDBu, 0xA9BA4650u, 0xAC9526E8u, 0xBE5EE304u, > + 0xA1FAD5F0u, 0x6A2D519Au, 0x63EF8CE2u, 0x9A86EE22u, > + 0xC089C2B8u, 0x43242EF6u, 0xA51E03AAu, 0x9CF2D0A4u, > + 0x83C061BAu, 0x9BE96A4Du, 0x8FE51550u, 0xBA645BD6u, > + 0x2826A2F9u, 0xA73A3AE1u, 0x4BA99586u, 0xEF5562E9u, > + 0xC72FEFD3u, 0xF752F7DAu, 0x3F046F69u, 0x77FA0A59u, > + 0x80E4A915u, 0x87B08601u, 0x9B09E6ADu, 0x3B3EE593u, > + 0xE990FD5Au, 0x9E34D797u, 0x2CF0B7D9u, 0x022B8B51u, > + 0x96D5AC3Au, 0x017DA67Du, 0xD1CF3ED6u, 0x7C7D2D28u, > + 0x1F9F25CFu, 0xADF2B89Bu, 0x5AD6B472u, 0x5A88F54Cu, > + 0xE029AC71u, 0xE019A5E6u, 0x47B0ACFDu, 0xED93FA9Bu, > + 0xE8D3C48Du, 0x283B57CCu, 0xF8D56629u, 0x79132E28u, > + 0x785F0191u, 0xED756055u, 0xF7960E44u, 0xE3D35E8Cu, > + 0x15056DD4u, 0x88F46DBAu, 0x03A16125u, 0x0564F0BDu, > + 0xC3EB9E15u, 0x3C9057A2u, 0x97271AECu, 0xA93A072Au, > + 0x1B3F6D9Bu, 0x1E6321F5u, 0xF59C66FBu, 0x26DCF319u, > + 0x7533D928u, 0xB155FDF5u, 0x03563482u, 0x8ABA3CBBu, > + 0x28517711u, 0xC20AD9F8u, 0xABCC5167u, 0xCCAD925Fu, > + 0x4DE81751u, 0x3830DC8Eu, 0x379D5862u, 0x9320F991u, > + 0xEA7A90C2u, 0xFB3E7BCEu, 0x5121CE64u, 0x774FBE32u, > + 0xA8B6E37Eu, 0xC3293D46u, 0x48DE5369u, 0x6413E680u, > + 0xA2AE0810u, 0xDD6DB224u, 0x69852DFDu, 0x09072166u, > + 0xB39A460Au, 0x6445C0DDu, 0x586CDECFu, 0x1C20C8AEu, > + 0x5BBEF7DDu, 0x1B588D40u, 0xCCD2017Fu, 0x6BB4E3BBu, > + 0xDDA26A7Eu, 0x3A59FF45u, 0x3E350A44u, 0xBCB4CDD5u, > + 0x72EACEA8u, 0xFA6484BBu, 0x8D6612AEu, 0xBF3C6F47u, > + 0xD29BE463u, 0x542F5D9Eu, 0xAEC2771Bu, 0xF64E6370u, > + 0x740E0D8Du, 0xE75B1357u, 0xF8721671u, 0xAF537D5Du, > + 0x4040CB08u, 0x4EB4E2CCu, 0x34D2466Au, 0x0115AF84u, > + 0xE1B00428u, 0x95983A1Du, 0x06B89FB4u, 0xCE6EA048u, > + 0x6F3F3B82u, 0x3520AB82u, 0x011A1D4Bu, 0x277227F8u, > + 0x611560B1u, 0xE7933FDCu, 0xBB3A792Bu, 0x344525BDu, > + 0xA08839E1u, 0x51CE794Bu, 0x2F32C9B7u, 0xA01FBAC9u, > + 0xE01CC87Eu, 0xBCC7D1F6u, 0xCF0111C3u, 0xA1E8AAC7u, > + 0x1A908749u, 0xD44FBD9Au, 0xD0DADECBu, 0xD50ADA38u, > + 0x0339C32Au, 0xC6913667u, 0x8DF9317Cu, 0xE0B12B4Fu, > + 0xF79E59B7u, 0x43F5BB3Au, 0xF2D519FFu, 0x27D9459Cu, > + 0xBF97222Cu, 0x15E6FC2Au, 0x0F91FC71u, 0x9B941525u, > + 0xFAE59361u, 0xCEB69CEBu, 0xC2A86459u, 0x12BAA8D1u, > + 0xB6C1075Eu, 0xE3056A0Cu, 0x10D25065u, 0xCB03A442u, > + 0xE0EC6E0Eu, 0x1698DB3Bu, 0x4C98A0BEu, 0x3278E964u, > + 0x9F1F9532u, 0xE0D392DFu, 0xD3A0342Bu, 0x8971F21Eu, > + 0x1B0A7441u, 0x4BA3348Cu, 0xC5BE7120u, 0xC37632D8u, > + 0xDF359F8Du, 0x9B992F2Eu, 0xE60B6F47u, 0x0FE3F11Du, > + 0xE54CDA54u, 0x1EDAD891u, 0xCE6279CFu, 0xCD3E7E6Fu, > + 0x1618B166u, 0xFD2C1D05u, 0x848FD2C5u, 0xF6FB2299u, > + 0xF523F357u, 0xA6327623u, 0x93A83531u, 0x56CCCD02u, > + 0xACF08162u, 0x5A75EBB5u, 0x6E163697u, 0x88D273CCu, > + 0xDE966292u, 0x81B949D0u, 0x4C50901Bu, 0x71C65614u, > + 0xE6C6C7BDu, 0x327A140Au, 0x45E1D006u, 0xC3F27B9Au, > + 0xC9AA53FDu, 0x62A80F00u, 0xBB25BFE2u, 0x35BDD2F6u, > + 0x71126905u, 0xB2040222u, 0xB6CBCF7Cu, 0xCD769C2Bu, > + 0x53113EC0u, 0x1640E3D3u, 0x38ABBD60u, 0x2547ADF0u, > + 0xBA38209Cu, 0xF746CE76u, 0x77AFA1C5u, 0x20756060u, > + 0x85CBFE4Eu, 0x8AE88DD8u, 0x7AAAF9B0u, 0x4CF9AA7Eu, > + 0x1948C25Cu, 0x02FB8A8Cu, 0x01C36AE4u, 0xD6EBE1F9u, > + 0x90D4F869u, 0xA65CDEA0u, 0x3F09252Du, 0xC208E69Fu, > + 0xB74E6132u, 0xCE77E25Bu, 0x578FDFE3u, 0x3AC372E6u } > +}; > + > +static void F(AVBlowfish *bf, uint32_t *xl, uint32_t *xr, int i) > +{ > + uint32_t y; > + > + *xl ^= bf->p[i]; > + y = bf->s[0][(*xl >> 24) & 0xFF]; > + y += bf->s[1][(*xl >> 16) & 0xFF]; > + y ^= bf->s[2][(*xl >> 8) & 0xFF]; > + y += bf->s[3][ *xl & 0xFF]; > + *xr ^= y; > + > + FFSWAP(uint32_t, *xl, *xr); > +} > + > +static void blowfish_crypt(AVBlowfish *bf, uint32_t *xl, uint32_t *xr, > + int direction) > +{ > + uint32_t Xl, Xr; > + int i; > + > + Xl = *xl; > + Xr = *xr; > + > + if (direction) { > + for (i = 0; i < BF_ROUNDS; ++i) > + F(bf, &Xl, &Xr, i); > + } else { > + for (i = BF_ROUNDS + 1; i > 1; --i) > + F(bf, &Xl, &Xr, i); > + } > + > + FFSWAP(uint32_t, Xl, Xr); > + > + if (direction) { > + Xr = Xr ^ bf->p[BF_ROUNDS]; > + Xl = Xl ^ bf->p[BF_ROUNDS + 1]; > + } else { > + Xr = Xr ^ bf->p[1]; > + Xl = Xl ^ bf->p[0]; > + } > + > + *xl = Xl; > + *xr = Xr; > +} > + > +void av_blowfish_init(AVBlowfish *bf, const uint8_t *key, int key_len) > +{ > + uint32_t data, datal, datar; > + int i, j, k; > + > + memcpy(bf->s, orig_s, sizeof(orig_s)); > + > + j = 0; > + for (i = 0; i < BF_ROUNDS + 2; ++i) { > + data = 0x00000000; > + for (k = 0; k < 4; k++) { > + data = (data << 8) | key[j++]; > + if (j >= key_len) > + j = 0; > + } > + bf->p[i] = orig_p[i] ^ data; > + } > + > + datal = 0x00000000; > + datar = 0x00000000; > + > + for (i = 0; i < BF_ROUNDS + 2; i += 2) { > + av_blowfish_encrypt(bf, &datal, &datar); > + bf->p[i] = datal; > + bf->p[i + 1] = datar; > + } > + > + for (i = 0; i < 4; ++i) { > + for (j = 0; j < 256; j += 2) { > + av_blowfish_encrypt(bf, &datal, &datar); > + bf->s[i][j] = datal; > + bf->s[i][j + 1] = datar; > + } > + } > +} > + > +void av_blowfish_encrypt(AVBlowfish *bf, uint32_t *xl, uint32_t *xr) > +{ > + blowfish_crypt(bf, xl, xr, 1); > +} > + > +void av_blowfish_decrypt(AVBlowfish *bf, uint32_t *xl, uint32_t *xr) > +{ > + blowfish_crypt(bf, xl, xr, 0); > +} > + > +#ifdef TEST > +#include <stdio.h> > +#undef printf > + > +#define NUM_VARIABLE_KEY_TESTS 34 > + > +/* plaintext bytes -- left halves */ > +uint32_t plaintext_l[NUM_VARIABLE_KEY_TESTS] = { > + 0x00000000l, 0xFFFFFFFFl, 0x10000000l, 0x11111111l, 0x11111111l, > + 0x01234567l, 0x00000000l, 0x01234567l, 0x01A1D6D0l, 0x5CD54CA8l, > + 0x0248D438l, 0x51454B58l, 0x42FD4430l, 0x059B5E08l, 0x0756D8E0l, > + 0x762514B8l, 0x3BDD1190l, 0x26955F68l, 0x164D5E40l, 0x6B056E18l, > + 0x004BD6EFl, 0x480D3900l, 0x437540C8l, 0x072D43A0l, 0x02FE5577l, > + 0x1D9D5C50l, 0x30553228l, 0x01234567l, 0x01234567l, 0x01234567l, > + 0xFFFFFFFFl, 0x00000000l, 0x00000000l, 0xFFFFFFFFl }; > + > +/* plaintext bytes -- right halves */ > +uint32_t plaintext_r[NUM_VARIABLE_KEY_TESTS] = { > + 0x00000000l, 0xFFFFFFFFl, 0x00000001l, 0x11111111l, 0x11111111l, > + 0x89ABCDEFl, 0x00000000l, 0x89ABCDEFl, 0x39776742l, 0x3DEF57DAl, > + 0x06F67172l, 0x2DDF440Al, 0x59577FA2l, 0x51CF143Al, 0x774761D2l, > + 0x29BF486Al, 0x49372802l, 0x35AF609Al, 0x4F275232l, 0x759F5CCAl, > + 0x09176062l, 0x6EE762F2l, 0x698F3CFAl, 0x77075292l, 0x8117F12Al, > + 0x18F728C2l, 0x6D6F295Al, 0x89ABCDEFl, 0x89ABCDEFl, 0x89ABCDEFl, > + 0xFFFFFFFFl, 0x00000000l, 0x00000000l, 0xFFFFFFFFl }; > + > +/* key bytes for variable key tests */ > +static const uint8_t variable_key[NUM_VARIABLE_KEY_TESTS][8] = { > + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, > + { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }, > + { 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, > + { 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11 }, > + { 0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF }, > + { 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11 }, > + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, > + { 0xFE, 0xDC, 0xBA, 0x98, 0x76, 0x54, 0x32, 0x10 }, > + { 0x7C, 0xA1, 0x10, 0x45, 0x4A, 0x1A, 0x6E, 0x57 }, > + { 0x01, 0x31, 0xD9, 0x61, 0x9D, 0xC1, 0x37, 0x6E }, > + { 0x07, 0xA1, 0x13, 0x3E, 0x4A, 0x0B, 0x26, 0x86 }, > + { 0x38, 0x49, 0x67, 0x4C, 0x26, 0x02, 0x31, 0x9E }, > + { 0x04, 0xB9, 0x15, 0xBA, 0x43, 0xFE, 0xB5, 0xB6 }, > + { 0x01, 0x13, 0xB9, 0x70, 0xFD, 0x34, 0xF2, 0xCE }, > + { 0x01, 0x70, 0xF1, 0x75, 0x46, 0x8F, 0xB5, 0xE6 }, > + { 0x43, 0x29, 0x7F, 0xAD, 0x38, 0xE3, 0x73, 0xFE }, > + { 0x07, 0xA7, 0x13, 0x70, 0x45, 0xDA, 0x2A, 0x16 }, > + { 0x04, 0x68, 0x91, 0x04, 0xC2, 0xFD, 0x3B, 0x2F }, > + { 0x37, 0xD0, 0x6B, 0xB5, 0x16, 0xCB, 0x75, 0x46 }, > + { 0x1F, 0x08, 0x26, 0x0D, 0x1A, 0xC2, 0x46, 0x5E }, > + { 0x58, 0x40, 0x23, 0x64, 0x1A, 0xBA, 0x61, 0x76 }, > + { 0x02, 0x58, 0x16, 0x16, 0x46, 0x29, 0xB0, 0x07 }, > + { 0x49, 0x79, 0x3E, 0xBC, 0x79, 0xB3, 0x25, 0x8F }, > + { 0x4F, 0xB0, 0x5E, 0x15, 0x15, 0xAB, 0x73, 0xA7 }, > + { 0x49, 0xE9, 0x5D, 0x6D, 0x4C, 0xA2, 0x29, 0xBF }, > + { 0x01, 0x83, 0x10, 0xDC, 0x40, 0x9B, 0x26, 0xD6 }, > + { 0x1C, 0x58, 0x7F, 0x1C, 0x13, 0x92, 0x4F, 0xEF }, > + { 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01 }, > + { 0x1F, 0x1F, 0x1F, 0x1F, 0x0E, 0x0E, 0x0E, 0x0E }, > + { 0xE0, 0xFE, 0xE0, 0xFE, 0xF1, 0xFE, 0xF1, 0xFE }, > + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, > + { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }, > + { 0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF }, > + { 0xFE, 0xDC, 0xBA, 0x98, 0x76, 0x54, 0x32, 0x10 }}; > + > +/* ciphertext bytes -- left halves */ > +uint32_t ciphertext_l[NUM_VARIABLE_KEY_TESTS] = { > + 0x4EF99745l, 0x51866FD5l, 0x7D856F9Al, 0x2466DD87l, 0x61F9C380l, > + 0x7D0CC630l, 0x4EF99745l, 0x0ACEAB0Fl, 0x59C68245l, 0xB1B8CC0Bl, > + 0x1730E577l, 0xA25E7856l, 0x353882B1l, 0x48F4D088l, 0x432193B7l, > + 0x13F04154l, 0x2EEDDA93l, 0xD887E039l, 0x5F99D04Fl, 0x4A057A3Bl, > + 0x452031C1l, 0x7555AE39l, 0x53C55F9Cl, 0x7A8E7BFAl, 0xCF9C5D7Al, > + 0xD1ABB290l, 0x55CB3774l, 0xFA34EC48l, 0xA7907951l, 0xC39E072Dl, > + 0x014933E0l, 0xF21E9A77l, 0x24594688l, 0x6B5C5A9Cl }; > + > +/* ciphertext bytes -- right halves */ > +uint32_t ciphertext_r[NUM_VARIABLE_KEY_TESTS] = { > + 0x6198DD78l, 0xB85ECB8Al, 0x613063F2l, 0x8B963C9Dl, 0x2281B096l, > + 0xAFDA1EC7l, 0x6198DD78l, 0xC6A0A28Dl, 0xEB05282Bl, 0x250F09A0l, > + 0x8BEA1DA4l, 0xCF2651EBl, 0x09CE8F1Al, 0x4C379918l, 0x8951FC98l, > + 0xD69D1AE5l, 0xFFD39C79l, 0x3C2DA6E3l, 0x5B163969l, 0x24D3977Bl, > + 0xE4FADA8El, 0xF59B87BDl, 0xB49FC019l, 0x937E89A3l, 0x4986ADB5l, > + 0x658BC778l, 0xD13EF201l, 0x47B268B2l, 0x08EA3CAEl, 0x9FAC631Dl, > + 0xCDAFF6E4l, 0xB71C49BCl, 0x5754369Al, 0x5D9E0A5Al }; > + > +int main(void) > +{ > + AVBlowfish bf; > + uint32_t tmptext_l[NUM_VARIABLE_KEY_TESTS]; > + uint32_t tmptext_r[NUM_VARIABLE_KEY_TESTS]; > + int i; > + > + memcpy(tmptext_l, plaintext_l, sizeof(uint32_t) * > NUM_VARIABLE_KEY_TESTS); > + memcpy(tmptext_r, plaintext_r, sizeof(uint32_t) * > NUM_VARIABLE_KEY_TESTS); > + > + for (i = 0; i < NUM_VARIABLE_KEY_TESTS; i++) { > + av_blowfish_init(&bf, variable_key[i], 8); > + av_blowfish_encrypt(&bf, &tmptext_l[i], &tmptext_r[i]); > + > + if (tmptext_l[i] != ciphertext_l[i] || tmptext_r[i] != > ciphertext_r[i]) { > + printf("Test encryption failed.\n"); > + return 1; > + } > + } > + printf("Test encryption success.\n"); > + > + for (i = 0; i < NUM_VARIABLE_KEY_TESTS; i++) { > + av_blowfish_init(&bf, variable_key[i], 8); > + av_blowfish_decrypt(&bf, &tmptext_l[i], &tmptext_r[i]); > + > + if (tmptext_l[i] != plaintext_l[i] || tmptext_r[i] != > plaintext_r[i]) { > + printf("Test decryption failed.\n"); > + return 1; > + } > + } > + printf("Test decryption success.\n"); > + > + return 0; > +} > + > +#endif > diff --git a/libavutil/blowfish.h b/libavutil/blowfish.h > new file mode 100644 > index 0000000..91d00a3 > --- /dev/null > +++ b/libavutil/blowfish.h > @@ -0,0 +1,60 @@ > +/* > + * Blowfish algorithm > + * > + * This file is part of Libav. > + * > + * Libav is free software; you can redistribute it and/or > + * modify it under the terms of the GNU Lesser General Public > + * License as published by the Free Software Foundation; either > + * version 2.1 of the License, or (at your option) any later version. > + * > + * Libav 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 > + * Lesser General Public License for more details. > + * > + * You should have received a copy of the GNU Lesser General Public > + * License along with Libav; if not, write to the Free Software > + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 > USA > + */ > + > +#ifndef AVUTIL_BF_H > +#define AVUTIL_BF_H > + > +#include <stdint.h> > + > +#define BF_ROUNDS 16 > + > +typedef struct AVBlowfish { > + uint32_t p[BF_ROUNDS + 2]; > + uint32_t s[4][256]; > +} AVBlowfish; > + > +/** > + * @brief Initializes an AVBlowfish context. > + * > + * @parma bf an AVBlowfish context > + * @param key a key > + * @param key_len length of the key > + */ > +void av_blowfish_init(struct AVBlowfish *bf, const uint8_t *key, int > key_len); > + > +/** > + * @brief Encrypts using the Blowfish algorithm. > + * > + * @param bf an AVBlowfish context > + * @param xl left eight bytes halves of input to be encrypted > + * @param xr right eight bytes halves of input to be encrypted > + */ > +void av_blowfish_encrypt(struct AVBlowfish *bf, uint32_t *xl, uint32_t *xr); > + > +/** > + * @brief Decrypts using the Blowfish algorithm. > + * > + * @param bf an AVBlowfish context > + * @param xl left eight bytes halves of input to be decrypted > + * @param xr right eight bytes halves of input to be decrypted > + */ > +void av_blowfish_decrypt(struct AVBlowfish *bf, uint32_t *xl, uint32_t *xr); > + > +#endif /* AVUTIL_BF_H */ > diff --git a/tests/fate/libavutil.mak b/tests/fate/libavutil.mak > index 9993584..89d47b1 100644 > --- a/tests/fate/libavutil.mak > +++ b/tests/fate/libavutil.mak > @@ -12,6 +12,10 @@ FATE_LIBAVUTIL += fate-base64 > fate-base64: libavutil/base64-test$(EXESUF) > fate-base64: CMD = run libavutil/base64-test > > +FATE_LIBAVUTIL += fate-blowfish > +fate-base64: libavutil/blowfish-test$(EXESUF) > +fate-base64: CMD = run libavutil/blowfish-test
I'm sorry... s/fate-base64/fate-blowfish > + > FATE_LIBAVUTIL += fate-crc > fate-crc: libavutil/crc-test$(EXESUF) > fate-crc: CMD = run libavutil/crc-test > diff --git a/tests/ref/fate/blowfish b/tests/ref/fate/blowfish > new file mode 100644 > index 0000000..ddd856d > --- /dev/null > +++ b/tests/ref/fate/blowfish > @@ -0,0 +1,2 @@ > +Test encryption success. > +Test decryption success. > -- > 1.7.7.5 (Apple Git-26) > -- Best regards, Samuel Pitoiset. _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
