← Back to branch summary

~zooko/cryptopp/trunk

~zooko/cryptopp/trunk

« back to all changes in this revision

Viewing changes to rc6.cpp

Committer: weidai
Date: 2007-08-13 23:48:17 UTC
Revision ID: svn-v4:57ff6487-cd31-0410-9ec3-f628ee90f5f0:trunk/c5:383

fixed Salsa20 initialization crash on non-SSE2 machines

files added:
TestVectors/sosemanuk.txt

TestVectors/vmac.txt

cpu.cpp

cpu.h

cryptest_bds.bdsgroup

cryptest_bds.bdsproj

cryptest_bds.bpf

cryptlib_bds.bdsproj

cryptlib_bds.cpp

serpentp.h

sosemanuk.cpp

sosemanuk.h

vmac.cpp

vmac.h

x64masm.asm

files removed:
crypto++.mcp

haval.cpp

haval.h

havalcer.dat

md5mac.cpp

md5mac.h

xormac.h

files modified:
3way.cpp

3way.h

GNUmakefile

License.txt

Readme.txt

TestVectors/aes.txt

TestVectors/all.txt

TestVectors/camellia.txt

TestVectors/panama.txt

TestVectors/salsa.txt

TestVectors/seal.txt

TestVectors/shacal2.txt

TestVectors/tea.txt

adler32.h

algebra.cpp

algparam.h

arc4.cpp

arc4.h

argnames.h

asn.cpp

asn.h

bench.cpp

bench.h

bench2.cpp

blowfish.cpp

blowfish.h

blumshub.cpp

blumshub.h

camellia.cpp

camellia.h

cast.cpp

cast.h

cbcmac.cpp

cbcmac.h

channels.h

config.h

crc.h

cryptdll.dsp

cryptdll.vcproj

cryptest.dsp

cryptest.vcproj

cryptlib.cpp

cryptlib.dsp

cryptlib.h

cryptlib.vcproj

cryptopp.rc

datatest.cpp

des.cpp

des.h

dh2.cpp

dh2.h

dll.cpp

dlltest.cpp

dlltest.dsp

dlltest.vcproj

dmac.h

eccrypto.cpp

eccrypto.h

elgamal.h

eprecomp.cpp

esign.cpp

esign.h

factory.h

files.cpp

filters.cpp

filters.h

fipsalgt.cpp

fipstest.cpp

gf2_32.cpp

gfpcrypt.cpp

gfpcrypt.h

gost.cpp

gost.h

hmac.cpp

hmac.h

hrtimer.cpp

hrtimer.h

ida.cpp

idea.cpp

idea.h

integer.cpp

integer.h

iterhash.cpp

iterhash.h

lubyrack.h

mars.cpp

mars.h

md2.cpp

md2.h

md4.cpp

md4.h

md5.cpp

md5.h

mdc.h

misc.cpp

misc.h

modarith.h

modes.cpp

modes.h

nbtheory.cpp

network.cpp

network.h

osrng.cpp

osrng.h

panama.cpp

panama.h

pkcspad.cpp

pkcspad.h

pssr.cpp

pubkey.h

randpool.cpp

randpool.h

rc2.cpp

rc2.h

rc5.cpp

rc5.h

rc6.cpp

rc6.h

rdtables.cpp

regtest.cpp

rijndael.cpp

rijndael.h

rng.cpp

rng.h

rsa.cpp

rsa.h

rw.cpp

rw.h

safer.cpp

safer.h

salsa.cpp

salsa.h

seal.cpp

seal.h

secblock.h

seckey.h

serpent.cpp

serpent.h

sha.cpp

sha.h

shacal2.cpp

shacal2.h

shark.cpp

shark.h

simple.h

skipjack.cpp

skipjack.h

smartptr.h

socketft.h

square.cpp

square.h

strciphr.cpp

strciphr.h

tea.cpp

tea.h

test.cpp

tiger.cpp

tiger.h

tigertab.cpp

trunhash.h

ttmac.cpp

ttmac.h

twofish.cpp

twofish.h

usage.dat

validat1.cpp

validat2.cpp

validat3.cpp

validate.h

wait.cpp

wake.cpp

wake.h

whrlpool.cpp

whrlpool.h

words.h

zdeflate.cpp

Show diffs side-by-side

added added

removed removed

7

7

8

8

NAMESPACE_BEGIN(CryptoPP)

9

9

10

void RC6::Base::UncheckedSetKey(CipherDir direction, const byte *k, unsigned int keylen, unsigned int rounds)

10

void RC6::Base::UncheckedSetKey(const byte *k, unsigned int keylen, const NameValuePairs &params)

11

11

{

12

12

AssertValidKeyLength(keylen);

13

AssertValidRounds(rounds);

14

13

15

r = rounds;

14

r = GetRoundsAndThrowIfInvalid(params, this);

16

15

sTable.New(2*(r+2));

17

16

18

17

static const RC6_WORD MAGIC_P = 0xb7e15163L; // magic constant P for wordsize

Older »