Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[pandora-kernel.git] / crypto / tcrypt.h

diff --git a/crypto/tcrypt.h b/crypto/tcrypt.h
index 6cc1b85..f0bfee1 100644 (file)
--- a/crypto/tcrypt.h
+++ b/crypto/tcrypt.h
@@ -61,12 +61,14 @@ static u8 speed_template_32_40_48[] = {32, 40, 48, 0};
 static u8 speed_template_32_48[] = {32, 48, 0};
 static u8 speed_template_32_48_64[] = {32, 48, 64, 0};
 static u8 speed_template_32_64[] = {32, 64, 0};
+static u8 speed_template_32[] = {32, 0};
 
 /*
  * AEAD speed tests
  */
 static u8 aead_speed_template_19[] = {19, 0};
 static u8 aead_speed_template_20[] = {20, 0};
+static u8 aead_speed_template_36[] = {36, 0};
 
 /*
  * Digest speed tests
@@ -127,4 +129,22 @@ static struct hash_speed hash_speed_template_16[] = {
        {  .blen = 0,   .plen = 0,      .klen = 0, }
 };
 
+static struct hash_speed poly1305_speed_template[] = {
+       { .blen = 96,   .plen = 16, },
+       { .blen = 96,   .plen = 32, },
+       { .blen = 96,   .plen = 96, },
+       { .blen = 288,  .plen = 16, },
+       { .blen = 288,  .plen = 32, },
+       { .blen = 288,  .plen = 288, },
+       { .blen = 1056, .plen = 32, },
+       { .blen = 1056, .plen = 1056, },
+       { .blen = 2080, .plen = 32, },
+       { .blen = 2080, .plen = 2080, },
+       { .blen = 4128, .plen = 4128, },
+       { .blen = 8224, .plen = 8224, },
+
+       /* End marker */
+       {  .blen = 0,   .plen = 0, }
+};
+
 #endif /* _CRYPTO_TCRYPT_H */