From dabc9ea37e2748e34fb3e1e0d7f2285325024e78 Mon Sep 17 00:00:00 2001 From: "nelsonb%netscape.com" Date: Wed, 6 Apr 2005 23:19:22 +0000 Subject: [PATCH] decouple block size from buffer size for AES/rijndael in bltest. Bug 289066. r=saul.edwards,rrelyea. git-svn-id: svn://10.0.0.236/trunk@171827 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/security/nss/cmd/bltest/blapitest.c | 8 ++++---- mozilla/security/nss/tests/cipher/hash.txt | 6 +++--- mozilla/security/nss/tests/cipher/symmkey.txt | 4 ++++ 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/mozilla/security/nss/cmd/bltest/blapitest.c b/mozilla/security/nss/cmd/bltest/blapitest.c index a2f96800350..2a5a90c734a 100644 --- a/mozilla/security/nss/cmd/bltest/blapitest.c +++ b/mozilla/security/nss/cmd/bltest/blapitest.c @@ -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; diff --git a/mozilla/security/nss/tests/cipher/hash.txt b/mozilla/security/nss/tests/cipher/hash.txt index 17c6a41a15a..6a785640b0a 100644 --- a/mozilla/security/nss/tests/cipher/hash.txt +++ b/mozilla/security/nss/tests/cipher/hash.txt @@ -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 diff --git a/mozilla/security/nss/tests/cipher/symmkey.txt b/mozilla/security/nss/tests/cipher/symmkey.txt index 741f868805e..d1f18ad1ca5 100644 --- a/mozilla/security/nss/tests/cipher/symmkey.txt +++ b/mozilla/security/nss/tests/cipher/symmkey.txt @@ -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