Skip to content

Commit

Permalink
[CRYPTO]: Use template keys for speed tests if possible
Browse files Browse the repository at this point in the history 
The existing keys used in the speed tests do not pass the 3DES quality check.
This patch makes it use the template keys instead.

Other algorithms can supply template keys through the same interface if needed.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Herbert Xu authored and David S. Miller committed Jun 22, 2005
1 parent ebfd9bc commit dce907c
Showing 1 changed file with 57 additions and 22 deletions.
79 changes: 57 additions & 22 deletions crypto/tcrypt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -427,9 +427,10 @@ static void test_cipher(char *algo, int mode, int enc,
}

static void test_cipher_speed(char *algo, int mode, int enc, unsigned int sec,
struct cipher_speed *speed)
struct cipher_testvec *template,
unsigned int tcount, struct cipher_speed *speed)
{
unsigned int ret, i, iv_len;
unsigned int ret, i, j, iv_len;
unsigned char *key, *p, iv[128];
struct crypto_tfm *tfm;
struct scatterlist sg[8];
Expand Down Expand Up @@ -471,6 +472,12 @@ static void test_cipher_speed(char *algo, int mode, int enc, unsigned int sec,

/* set key, plain text and IV */
key = (unsigned char *)tvmem;
for (j = 0; j < tcount; j++) {
if (template[j].klen == speed[i].klen) {
key = template[j].key;
break;
}
}
p = (unsigned char *)tvmem + speed[i].klen;

ret = crypto_cipher_setkey(tfm, key, speed[i].klen);
Expand Down Expand Up @@ -953,38 +960,66 @@ static void do_test(void)
#endif

case 200:
test_cipher_speed("aes", MODE_ECB, ENCRYPT, sec, aes_speed_template);
test_cipher_speed("aes", MODE_ECB, DECRYPT, sec, aes_speed_template);
test_cipher_speed("aes", MODE_CBC, ENCRYPT, sec, aes_speed_template);
test_cipher_speed("aes", MODE_CBC, DECRYPT, sec, aes_speed_template);
test_cipher_speed("aes", MODE_ECB, ENCRYPT, sec, NULL, 0,
aes_speed_template);
test_cipher_speed("aes", MODE_ECB, DECRYPT, sec, NULL, 0,
aes_speed_template);
test_cipher_speed("aes", MODE_CBC, ENCRYPT, sec, NULL, 0,
aes_speed_template);
test_cipher_speed("aes", MODE_CBC, DECRYPT, sec, NULL, 0,
aes_speed_template);
break;

case 201:
test_cipher_speed("des3_ede", MODE_ECB, ENCRYPT, sec, des3_ede_speed_template);
test_cipher_speed("des3_ede", MODE_ECB, DECRYPT, sec, des3_ede_speed_template);
test_cipher_speed("des3_ede", MODE_CBC, ENCRYPT, sec, des3_ede_speed_template);
test_cipher_speed("des3_ede", MODE_CBC, DECRYPT, sec, des3_ede_speed_template);
test_cipher_speed("des3_ede", MODE_ECB, ENCRYPT, sec,
des3_ede_enc_tv_template,
DES3_EDE_ENC_TEST_VECTORS,
des3_ede_speed_template);
test_cipher_speed("des3_ede", MODE_ECB, DECRYPT, sec,
des3_ede_dec_tv_template,
DES3_EDE_DEC_TEST_VECTORS,
des3_ede_speed_template);
test_cipher_speed("des3_ede", MODE_CBC, ENCRYPT, sec,
des3_ede_enc_tv_template,
DES3_EDE_ENC_TEST_VECTORS,
des3_ede_speed_template);
test_cipher_speed("des3_ede", MODE_CBC, DECRYPT, sec,
des3_ede_dec_tv_template,
DES3_EDE_DEC_TEST_VECTORS,
des3_ede_speed_template);
break;

case 202:
test_cipher_speed("twofish", MODE_ECB, ENCRYPT, sec, twofish_speed_template);
test_cipher_speed("twofish", MODE_ECB, DECRYPT, sec, twofish_speed_template);
test_cipher_speed("twofish", MODE_CBC, ENCRYPT, sec, twofish_speed_template);
test_cipher_speed("twofish", MODE_CBC, DECRYPT, sec, twofish_speed_template);
test_cipher_speed("twofish", MODE_ECB, ENCRYPT, sec, NULL, 0,
twofish_speed_template);
test_cipher_speed("twofish", MODE_ECB, DECRYPT, sec, NULL, 0,
twofish_speed_template);
test_cipher_speed("twofish", MODE_CBC, ENCRYPT, sec, NULL, 0,
twofish_speed_template);
test_cipher_speed("twofish", MODE_CBC, DECRYPT, sec, NULL, 0,
twofish_speed_template);
break;

case 203:
test_cipher_speed("blowfish", MODE_ECB, ENCRYPT, sec, blowfish_speed_template);
test_cipher_speed("blowfish", MODE_ECB, DECRYPT, sec, blowfish_speed_template);
test_cipher_speed("blowfish", MODE_CBC, ENCRYPT, sec, blowfish_speed_template);
test_cipher_speed("blowfish", MODE_CBC, DECRYPT, sec, blowfish_speed_template);
test_cipher_speed("blowfish", MODE_ECB, ENCRYPT, sec, NULL, 0,
blowfish_speed_template);
test_cipher_speed("blowfish", MODE_ECB, DECRYPT, sec, NULL, 0,
blowfish_speed_template);
test_cipher_speed("blowfish", MODE_CBC, ENCRYPT, sec, NULL, 0,
blowfish_speed_template);
test_cipher_speed("blowfish", MODE_CBC, DECRYPT, sec, NULL, 0,
blowfish_speed_template);
break;

case 204:
test_cipher_speed("des", MODE_ECB, ENCRYPT, sec, des_speed_template);
test_cipher_speed("des", MODE_ECB, DECRYPT, sec, des_speed_template);
test_cipher_speed("des", MODE_CBC, ENCRYPT, sec, des_speed_template);
test_cipher_speed("des", MODE_CBC, DECRYPT, sec, des_speed_template);
test_cipher_speed("des", MODE_ECB, ENCRYPT, sec, NULL, 0,
des_speed_template);
test_cipher_speed("des", MODE_ECB, DECRYPT, sec, NULL, 0,
des_speed_template);
test_cipher_speed("des", MODE_CBC, ENCRYPT, sec, NULL, 0,
des_speed_template);
test_cipher_speed("des", MODE_CBC, DECRYPT, sec, NULL, 0,
des_speed_template);
break;

case 1000:
Expand Down

0 comments on commit dce907c

Please sign in to comment.