Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 42 insertions, 0 deletions

diff --git a/crypto/testmgr.c b/crypto/testmgr.c
index fa8c8f78c8d4..b6b93d416351 100644
--- a/crypto/testmgr.c
+++ b/crypto/testmgr.c
@@ -6,6 +6,13 @@
  * Copyright (c) 2007 Nokia Siemens Networks
  * Copyright (c) 2008 Herbert Xu <herbert@gondor.apana.org.au>
  *
+ * Updated RFC4106 AES-GCM testing.
+ *    Authors: Aidan O'Mahony (aidan.o.mahony@intel.com)
+ *             Adrian Hoban <adrian.hoban@intel.com>
+ *             Gabriele Paoloni <gabriele.paoloni@intel.com>
+ *             Tadeusz Struk (tadeusz.struk@intel.com)
+ *    Copyright (c) 2010, Intel Corporation.
+ *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
  * Software Foundation; either version 2 of the License, or (at your option)
@@ -2070,6 +2077,7 @@ static const struct alg_test_desc alg_test_descs[] = {
         }, {
                 .alg = "ghash",
                 .test = alg_test_hash,
+                .fips_allowed = 1,
                 .suite = {
                         .hash = {
                                 .vecs = ghash_tv_template,
@@ -2211,6 +2219,22 @@ static const struct alg_test_desc alg_test_descs[] = {
                         }
                 }
         }, {
+                .alg = "ofb(aes)",
+                .test = alg_test_skcipher,
+                .fips_allowed = 1,
+                .suite = {
+                        .cipher = {
+                                .enc = {
+                                        .vecs = aes_ofb_enc_tv_template,
+                                        .count = AES_OFB_ENC_TEST_VECTORS
+                                },
+                                .dec = {
+                                        .vecs = aes_ofb_dec_tv_template,
+                                        .count = AES_OFB_DEC_TEST_VECTORS
+                                }
+                        }
+                }
+        }, {
                 .alg = "pcbc(fcrypt)",
                 .test = alg_test_skcipher,
                 .suite = {
@@ -2242,6 +2266,23 @@ static const struct alg_test_desc alg_test_descs[] = {
                         }
                 }
         }, {
+                .alg = "rfc4106(gcm(aes))",
+                .test = alg_test_aead,
+                .suite = {
+                        .aead = {
+                                .enc = {
+                                        .vecs = aes_gcm_rfc4106_enc_tv_template,
+                                        .count = AES_GCM_4106_ENC_TEST_VECTORS
+                                },
+                                .dec = {
+                                        .vecs = aes_gcm_rfc4106_dec_tv_template,
+                                        .count = AES_GCM_4106_DEC_TEST_VECTORS
+                                }
+                        }
+                }
+        }, {
+
+
                 .alg = "rfc4309(ccm(aes))",
                 .test = alg_test_aead,
                 .fips_allowed = 1,
@@ -2429,6 +2470,7 @@ static const struct alg_test_desc alg_test_descs[] = {
         }, {
                 .alg = "xts(aes)",
                 .test = alg_test_skcipher,
+                .fips_allowed = 1,
                 .suite = {
                         .cipher = {
                                 .enc = {