| Message ID | 2239265.sodxccK8do@tachyon.chronox.de (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Herbert Xu |
| Headers | show |
On Mon, Sep 21, 2015 at 08:59:56PM +0200, Stephan Mueller wrote: > > + .iv_out = "\x03\x1f\x6b\xd7\xe6\x1e\x64\x3d", > + }, > +}; This doesn't build. Please fix and resubmit. Thanks,
Am Mittwoch, 14. Oktober 2015, 22:26:24 schrieb Herbert Xu: Hi Herbert, >On Mon, Sep 21, 2015 at 08:59:56PM +0200, Stephan Mueller wrote: >> + .iv_out = "\x03\x1f\x6b\xd7\xe6\x1e\x64\x3d", >> + }, >> +}; > >This doesn't build. Please fix and resubmit. Did you apply the depending patch referenced in the beginning? https://lkml.org/lkml/2015/6/16/342 I thought I understood you wanted to pull it. If not, I will add the necessary code and resubmit. Ciao Stephan -- To unsubscribe from this list: send the line "unsubscribe linux-crypto" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, Oct 14, 2015 at 08:44:53PM +0200, Stephan Mueller wrote: > > Did you apply the depending patch referenced in the beginning? > > https://lkml.org/lkml/2015/6/16/342 > > I thought I understood you wanted to pull it. If not, I will add the necessary > code and resubmit. Yes but I want to finish the skcipher conversion before applying these patches so please don't depend on them just yet. Thanks,
Am Donnerstag, 15. Oktober 2015, 08:58:33 schrieb Herbert Xu: Hi Herbert, > On Wed, Oct 14, 2015 at 08:44:53PM +0200, Stephan Mueller wrote: > > Did you apply the depending patch referenced in the beginning? > > > > https://lkml.org/lkml/2015/6/16/342 > > > > I thought I understood you wanted to pull it. If not, I will add the > > necessary code and resubmit. > > Yes but I want to finish the skcipher conversion before applying > these patches so please don't depend on them just yet. Ok, then I will resubmit my patch, including the aforementioned patch giving credits to Boris.
diff --git a/crypto/testmgr.c b/crypto/testmgr.c index fa18753..7d7bf13 100644 --- a/crypto/testmgr.c +++ b/crypto/testmgr.c @@ -3292,6 +3292,22 @@ static const struct alg_test_desc alg_test_descs[] = { .fips_allowed = 1, .test = alg_test_null, }, { + .alg = "kw(aes)", + .test = alg_test_skcipher, + .fips_allowed = 1, + .suite = { + .cipher = { + .enc = { + .vecs = aes_kw_enc_tv_template, + .count = ARRAY_SIZE(aes_kw_enc_tv_template) + }, + .dec = { + .vecs = aes_kw_dec_tv_template, + .count = ARRAY_SIZE(aes_kw_dec_tv_template) + } + } + } + }, { .alg = "lrw(aes)", .test = alg_test_skcipher, .suite = { diff --git a/crypto/testmgr.h b/crypto/testmgr.h index 64b8a80..907d409 100644 --- a/crypto/testmgr.h +++ b/crypto/testmgr.h @@ -23814,6 +23814,46 @@ static struct aead_testvec rfc7539esp_dec_tv_template[] = { }; /* + * All key wrapping test vectors taken from + * http://csrc.nist.gov/groups/STM/cavp/documents/mac/kwtestvectors.zip + * + * Note: as documented in keywrap.c, the ivout for encryption is the first + * semiblock of the ciphertext from the test vector. For decryption, iv is + * the first semiblock of the ciphertext. + */ +static struct cipher_testvec aes_kw_enc_tv_template[] = { + { + .key = "\x75\x75\xda\x3a\x93\x60\x7c\xc2" + "\xbf\xd8\xce\xc7\xaa\xdf\xd9\xa6", + .klen = 16, + .input = "\x42\x13\x6d\x3c\x38\x4a\x3e\xea" + "\xc9\x5a\x06\x6f\xd2\x8f\xed\x3f", + .ilen = 16, + .result = "\xf6\x85\x94\x81\x6f\x64\xca\xa3" + "\xf5\x6f\xab\xea\x25\x48\xf5\xfb", + .rlen = 16, + .iv_out = "\x03\x1f\x6b\xd7\xe6\x1e\x64\x3d", + }, +}; + +static struct cipher_testvec aes_kw_dec_tv_template[] = { + { + .key = "\x80\xaa\x99\x73\x27\xa4\x80\x6b" + "\x6a\x7a\x41\xa5\x2b\x86\xc3\x71" + "\x03\x86\xf9\x32\x78\x6e\xf7\x96" + "\x76\xfa\xfb\x90\xb8\x26\x3c\x5f", + .klen = 32, + .input = "\xd3\x3d\x3d\x97\x7b\xf0\xa9\x15" + "\x59\xf9\x9c\x8a\xcd\x29\x3d\x43", + .ilen = 16, + .result = "\x0a\x25\x6b\xa7\x5c\xfa\x03\xaa" + "\xa0\x2b\xa9\x42\x03\xf1\x5b\xaa", + .rlen = 16, + .iv = "\x42\x3c\x96\x0d\x8a\x2a\xc4\xc1", + }, +}; + +/* * ANSI X9.31 Continuous Pseudo-Random Number Generator (AES mode) * test vectors, taken from Appendix B.2.9 and B.2.10: * http://csrc.nist.gov/groups/STM/cavp/documents/rng/RNGVS.pdf
The testmanager code for symmetric ciphers is extended to allow verification of the IV after a cipher operation. In addition, test vectors for kw(aes) for encryption and decryption are added. Signed-off-by: Stephan Mueller <smueller@chronox.de> --- crypto/testmgr.c | 16 ++++++++++++++++ crypto/testmgr.h | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+)