Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

decouple block size from buffer size for AES/rijndael in bltest.

Browse Source 
Bug 289066. r=saul.edwards,rrelyea.


git-svn-id: svn://10.0.0.236/trunk@171827 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
nelsonb%netscape.com 2005-04-06 23:19:22 +00:00
parent 39f25aa68b
commit dabc9ea37e
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mozilla/security/nss/cmd/bltest/blapitest.c
View File

@ -1223,13 +1223,13 @@ bltest_rc5_init(bltestCipherInfo *cipherInfo, PRBool encrypt)
SECStatus
bltest_aes_init(bltestCipherInfo *cipherInfo, PRBool encrypt)
{
PRIntervalTime time1, time2;
bltestSymmKeyParams *aesp = &cipherInfo->params.sk;
int minorMode;
int i;
/* XXX */ int keylen, blocklen;
keylen = aesp->key.buf.len;
blocklen = cipherInfo->input.pBuf.len;
int keylen = aesp->key.buf.len;
int blocklen = AES_BLOCK_SIZE;
PRIntervalTime time1, time2;
switch (cipherInfo->mode) {
case bltestAES_ECB: minorMode = NSS_AES; break;
case bltestAES_CBC: minorMode = NSS_AES_CBC; break;

6
mozilla/security/nss/tests/cipher/hash.txt
View File

@ -3,6 +3,6 @@
#
#
# mode bufsize repetitions
md2 1024 1000
md5 1024 100000
sha1 1024 10000
md2 10240 5000
md5 10240 100000
sha1 10240 100000

4
mozilla/security/nss/tests/cipher/symmkey.txt
View File

@ -17,3 +17,7 @@
rc4 8 8192 10000 100000
rc4 16 8192 10000 100000
rc4 24 8192 10000 100000
aes_ecb 16 8192 10000 100000
aes_cbc 16 8192 10000 100000
aes_ecb 32 8192 10000 100000
aes_cbc 32 8192 10000 100000