[git] GCRYPT - branch, master, updated. libgcrypt-1.6.0-294-g6fadbcd
by Jussi Kivilinna
cvs at cvs.gnupg.org
Thu Dec 3 20:22:28 CET 2015
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU crypto library".
The branch, master has been updated
via 6fadbcd088e2af3e48407b95d8d0c2a8b7ad6c38 (commit)
via 2cba0dbda462237f55438d4199eccd10c5e3f6ca (commit)
from d421ac283ec46d0ecaf6278ba4c24843f65fb2fa (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 6fadbcd088e2af3e48407b95d8d0c2a8b7ad6c38
Author: Jussi Kivilinna <jussi.kivilinna at iki.fi>
Date: Thu Dec 3 21:06:50 2015 +0200
chacha20: fix alignment of self-test context
* cipher/chacha20.c (selftest): Ensure 16-byte alignment for chacha20
context structure.
--
Signed-off-by: Jussi Kivilinna <jussi.kivilinna at iki.fi>
diff --git a/cipher/chacha20.c b/cipher/chacha20.c
index e25e239..613fa82 100644
--- a/cipher/chacha20.c
+++ b/cipher/chacha20.c
@@ -514,7 +514,8 @@ chacha20_encrypt_stream (void *context, byte * outbuf, const byte * inbuf,
static const char *
selftest (void)
{
- CHACHA20_context_t ctx;
+ byte ctxbuf[sizeof(CHACHA20_context_t) + 15];
+ CHACHA20_context_t *ctx;
byte scratch[127 + 1];
byte buf[512 + 64 + 4];
int i;
@@ -565,46 +566,49 @@ selftest (void)
0x05, 0x3c, 0x84, 0xe4, 0x9a, 0x4a, 0x33
};
- chacha20_setkey (&ctx, key_1, sizeof key_1);
- chacha20_setiv (&ctx, nonce_1, sizeof nonce_1);
+ /* 16-byte alignment required for amd64 implementation. */
+ ctx = (CHACHA20_context_t *)((uintptr_t)(ctxbuf + 15) & ~(uintptr_t)15);
+
+ chacha20_setkey (ctx, key_1, sizeof key_1);
+ chacha20_setiv (ctx, nonce_1, sizeof nonce_1);
scratch[sizeof (scratch) - 1] = 0;
- chacha20_encrypt_stream (&ctx, scratch, plaintext_1, sizeof plaintext_1);
+ chacha20_encrypt_stream (ctx, scratch, plaintext_1, sizeof plaintext_1);
if (memcmp (scratch, ciphertext_1, sizeof ciphertext_1))
return "ChaCha20 encryption test 1 failed.";
if (scratch[sizeof (scratch) - 1])
return "ChaCha20 wrote too much.";
- chacha20_setkey (&ctx, key_1, sizeof (key_1));
- chacha20_setiv (&ctx, nonce_1, sizeof nonce_1);
- chacha20_encrypt_stream (&ctx, scratch, scratch, sizeof plaintext_1);
+ chacha20_setkey (ctx, key_1, sizeof (key_1));
+ chacha20_setiv (ctx, nonce_1, sizeof nonce_1);
+ chacha20_encrypt_stream (ctx, scratch, scratch, sizeof plaintext_1);
if (memcmp (scratch, plaintext_1, sizeof plaintext_1))
return "ChaCha20 decryption test 1 failed.";
for (i = 0; i < sizeof buf; i++)
buf[i] = i;
- chacha20_setkey (&ctx, key_1, sizeof key_1);
- chacha20_setiv (&ctx, nonce_1, sizeof nonce_1);
+ chacha20_setkey (ctx, key_1, sizeof key_1);
+ chacha20_setiv (ctx, nonce_1, sizeof nonce_1);
/*encrypt */
- chacha20_encrypt_stream (&ctx, buf, buf, sizeof buf);
+ chacha20_encrypt_stream (ctx, buf, buf, sizeof buf);
/*decrypt */
- chacha20_setkey (&ctx, key_1, sizeof key_1);
- chacha20_setiv (&ctx, nonce_1, sizeof nonce_1);
- chacha20_encrypt_stream (&ctx, buf, buf, 1);
- chacha20_encrypt_stream (&ctx, buf + 1, buf + 1, (sizeof buf) - 1 - 1);
- chacha20_encrypt_stream (&ctx, buf + (sizeof buf) - 1,
+ chacha20_setkey (ctx, key_1, sizeof key_1);
+ chacha20_setiv (ctx, nonce_1, sizeof nonce_1);
+ chacha20_encrypt_stream (ctx, buf, buf, 1);
+ chacha20_encrypt_stream (ctx, buf + 1, buf + 1, (sizeof buf) - 1 - 1);
+ chacha20_encrypt_stream (ctx, buf + (sizeof buf) - 1,
buf + (sizeof buf) - 1, 1);
for (i = 0; i < sizeof buf; i++)
if (buf[i] != (byte) i)
return "ChaCha20 encryption test 2 failed.";
- chacha20_setkey (&ctx, key_1, sizeof key_1);
- chacha20_setiv (&ctx, nonce_1, sizeof nonce_1);
+ chacha20_setkey (ctx, key_1, sizeof key_1);
+ chacha20_setiv (ctx, nonce_1, sizeof nonce_1);
/* encrypt */
for (i = 0; i < sizeof buf; i++)
- chacha20_encrypt_stream (&ctx, &buf[i], &buf[i], 1);
+ chacha20_encrypt_stream (ctx, &buf[i], &buf[i], 1);
/* decrypt */
- chacha20_setkey (&ctx, key_1, sizeof key_1);
- chacha20_setiv (&ctx, nonce_1, sizeof nonce_1);
- chacha20_encrypt_stream (&ctx, buf, buf, sizeof buf);
+ chacha20_setkey (ctx, key_1, sizeof key_1);
+ chacha20_setiv (ctx, nonce_1, sizeof nonce_1);
+ chacha20_encrypt_stream (ctx, buf, buf, sizeof buf);
for (i = 0; i < sizeof buf; i++)
if (buf[i] != (byte) i)
return "ChaCha20 encryption test 3 failed.";
commit 2cba0dbda462237f55438d4199eccd10c5e3f6ca
Author: Jussi Kivilinna <jussi.kivilinna at iki.fi>
Date: Thu Dec 3 21:06:50 2015 +0200
salsa20: fix alignment of self-test context
* cipher/salsa20.c (selftest): Ensure 16-byte alignment for salsa20
context structure.
--
Reported-by: Carlos J Puga Medina <cpm at fbsd.es>
Signed-off-by: Jussi Kivilinna <jussi.kivilinna at iki.fi>
diff --git a/cipher/salsa20.c b/cipher/salsa20.c
index fa3d23b..9768198 100644
--- a/cipher/salsa20.c
+++ b/cipher/salsa20.c
@@ -501,7 +501,8 @@ salsa20r12_encrypt_stream (void *context,
static const char*
selftest (void)
{
- SALSA20_context_t ctx;
+ byte ctxbuf[sizeof(SALSA20_context_t) + 15];
+ SALSA20_context_t *ctx;
byte scratch[8+1];
byte buf[256+64+4];
int i;
@@ -518,32 +519,35 @@ selftest (void)
static const byte ciphertext_1[] =
{ 0xE3, 0xBE, 0x8F, 0xDD, 0x8B, 0xEC, 0xA2, 0xE3};
- salsa20_setkey (&ctx, key_1, sizeof key_1);
- salsa20_setiv (&ctx, nonce_1, sizeof nonce_1);
+ /* 16-byte alignment required for amd64 implementation. */
+ ctx = (SALSA20_context_t *)((uintptr_t)(ctxbuf + 15) & ~(uintptr_t)15);
+
+ salsa20_setkey (ctx, key_1, sizeof key_1);
+ salsa20_setiv (ctx, nonce_1, sizeof nonce_1);
scratch[8] = 0;
- salsa20_encrypt_stream (&ctx, scratch, plaintext_1, sizeof plaintext_1);
+ salsa20_encrypt_stream (ctx, scratch, plaintext_1, sizeof plaintext_1);
if (memcmp (scratch, ciphertext_1, sizeof ciphertext_1))
return "Salsa20 encryption test 1 failed.";
if (scratch[8])
return "Salsa20 wrote too much.";
- salsa20_setkey( &ctx, key_1, sizeof(key_1));
- salsa20_setiv (&ctx, nonce_1, sizeof nonce_1);
- salsa20_encrypt_stream (&ctx, scratch, scratch, sizeof plaintext_1);
+ salsa20_setkey( ctx, key_1, sizeof(key_1));
+ salsa20_setiv (ctx, nonce_1, sizeof nonce_1);
+ salsa20_encrypt_stream (ctx, scratch, scratch, sizeof plaintext_1);
if (memcmp (scratch, plaintext_1, sizeof plaintext_1))
return "Salsa20 decryption test 1 failed.";
for (i = 0; i < sizeof buf; i++)
buf[i] = i;
- salsa20_setkey (&ctx, key_1, sizeof key_1);
- salsa20_setiv (&ctx, nonce_1, sizeof nonce_1);
+ salsa20_setkey (ctx, key_1, sizeof key_1);
+ salsa20_setiv (ctx, nonce_1, sizeof nonce_1);
/*encrypt*/
- salsa20_encrypt_stream (&ctx, buf, buf, sizeof buf);
+ salsa20_encrypt_stream (ctx, buf, buf, sizeof buf);
/*decrypt*/
- salsa20_setkey (&ctx, key_1, sizeof key_1);
- salsa20_setiv (&ctx, nonce_1, sizeof nonce_1);
- salsa20_encrypt_stream (&ctx, buf, buf, 1);
- salsa20_encrypt_stream (&ctx, buf+1, buf+1, (sizeof buf)-1-1);
- salsa20_encrypt_stream (&ctx, buf+(sizeof buf)-1, buf+(sizeof buf)-1, 1);
+ salsa20_setkey (ctx, key_1, sizeof key_1);
+ salsa20_setiv (ctx, nonce_1, sizeof nonce_1);
+ salsa20_encrypt_stream (ctx, buf, buf, 1);
+ salsa20_encrypt_stream (ctx, buf+1, buf+1, (sizeof buf)-1-1);
+ salsa20_encrypt_stream (ctx, buf+(sizeof buf)-1, buf+(sizeof buf)-1, 1);
for (i = 0; i < sizeof buf; i++)
if (buf[i] != (byte)i)
return "Salsa20 encryption test 2 failed.";
-----------------------------------------------------------------------
Summary of changes:
cipher/chacha20.c | 46 +++++++++++++++++++++++++---------------------
cipher/salsa20.c | 34 +++++++++++++++++++---------------
2 files changed, 44 insertions(+), 36 deletions(-)
hooks/post-receive
--
The GNU crypto library
http://git.gnupg.org
_______________________________________________
Gnupg-commits mailing list
Gnupg-commits at gnupg.org
http://lists.gnupg.org/mailman/listinfo/gnupg-commits
More information about the Gcrypt-devel
mailing list