[git] GCRYPT - branch, LIBGCRYPT-1-7-BRANCH, updated. libgcrypt-1.7.3-19-ga8b2d8b
by Dmitry Eremin-Solenikov
cvs at cvs.gnupg.org
Mon Nov 28 01:53:27 CET 2016
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, LIBGCRYPT-1-7-BRANCH has been updated
via a8b2d8b502d9cbc9157c261f12e4623ec20b3960 (commit)
via 432eaf2ab83631a4e70ad4ecd20a9b6f81c1c329 (commit)
via d0940e3d194296bc334f06f97ae91b411e1f152f (commit)
via 4bfec0a52af8c847f558b9ade56d896c224019b3 (commit)
from a22d7bb3945cec2d8a6b23d8f2bd2f675bb2f4e6 (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 a8b2d8b502d9cbc9157c261f12e4623ec20b3960
Author: Dmitry Eremin-Solenikov <dbaryshkov at gmail.com>
Date: Fri Nov 25 15:52:47 2016 +0300
tests: Add PBKDF2 tests for Stribog512.
* tests/t-kdf.c (check_pbkdf2): Add Stribog512 test cases from TC26's
additions to PKCS#5.
--
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov at gmail.com>
Backport from master commit: a0580d446fef648a177ca4ab060d0e449780db84
diff --git a/tests/t-kdf.c b/tests/t-kdf.c
index bf31c83..4299141 100644
--- a/tests/t-kdf.c
+++ b/tests/t-kdf.c
@@ -1047,11 +1047,80 @@ check_pbkdf2 (void)
20,
"\x43\xe0\x6c\x55\x90\xb0\x8c\x02\x25\x24"
"\x23\x73\x12\x7e\xdf\x9c\x8e\x9c\x32\x91"
+ },
+ {
+ "password", 8,
+ "salt", 4,
+ GCRY_MD_STRIBOG512,
+ 1,
+ 64,
+ "\x64\x77\x0a\xf7\xf7\x48\xc3\xb1\xc9\xac\x83\x1d\xbc\xfd\x85\xc2"
+ "\x61\x11\xb3\x0a\x8a\x65\x7d\xdc\x30\x56\xb8\x0c\xa7\x3e\x04\x0d"
+ "\x28\x54\xfd\x36\x81\x1f\x6d\x82\x5c\xc4\xab\x66\xec\x0a\x68\xa4"
+ "\x90\xa9\xe5\xcf\x51\x56\xb3\xa2\xb7\xee\xcd\xdb\xf9\xa1\x6b\x47"
+ },
+ {
+ "password", 8,
+ "salt", 4,
+ GCRY_MD_STRIBOG512,
+ 2,
+ 64,
+ "\x5a\x58\x5b\xaf\xdf\xbb\x6e\x88\x30\xd6\xd6\x8a\xa3\xb4\x3a\xc0"
+ "\x0d\x2e\x4a\xeb\xce\x01\xc9\xb3\x1c\x2c\xae\xd5\x6f\x02\x36\xd4"
+ "\xd3\x4b\x2b\x8f\xbd\x2c\x4e\x89\xd5\x4d\x46\xf5\x0e\x47\xd4\x5b"
+ "\xba\xc3\x01\x57\x17\x43\x11\x9e\x8d\x3c\x42\xba\x66\xd3\x48\xde"
+ },
+ {
+ "password", 8,
+ "salt", 4,
+ GCRY_MD_STRIBOG512,
+ 4096,
+ 64,
+ "\xe5\x2d\xeb\x9a\x2d\x2a\xaf\xf4\xe2\xac\x9d\x47\xa4\x1f\x34\xc2"
+ "\x03\x76\x59\x1c\x67\x80\x7f\x04\x77\xe3\x25\x49\xdc\x34\x1b\xc7"
+ "\x86\x7c\x09\x84\x1b\x6d\x58\xe2\x9d\x03\x47\xc9\x96\x30\x1d\x55"
+ "\xdf\x0d\x34\xe4\x7c\xf6\x8f\x4e\x3c\x2c\xda\xf1\xd9\xab\x86\xc3"
+ },
+ /* { -- takes toooo long
+ "password", 8,
+ "salt", 4,
+ GCRY_MD_STRIBOG512,
+ 16777216,
+ 64,
+ "\x49\xe4\x84\x3b\xba\x76\xe3\x00\xaf\xe2\x4c\x4d\x23\xdc\x73\x92"
+ "\xde\xf1\x2f\x2c\x0e\x24\x41\x72\x36\x7c\xd7\x0a\x89\x82\xac\x36"
+ "\x1a\xdb\x60\x1c\x7e\x2a\x31\x4e\x8c\xb7\xb1\xe9\xdf\x84\x0e\x36"
+ "\xab\x56\x15\xbe\x5d\x74\x2b\x6c\xf2\x03\xfb\x55\xfd\xc4\x80\x71"
+ }, */
+ {
+ "passwordPASSWORDpassword", 24,
+ "saltSALTsaltSALTsaltSALTsaltSALTsalt", 36,
+ GCRY_MD_STRIBOG512,
+ 4096,
+ 100,
+ "\xb2\xd8\xf1\x24\x5f\xc4\xd2\x92\x74\x80\x20\x57\xe4\xb5\x4e\x0a"
+ "\x07\x53\xaa\x22\xfc\x53\x76\x0b\x30\x1c\xf0\x08\x67\x9e\x58\xfe"
+ "\x4b\xee\x9a\xdd\xca\xe9\x9b\xa2\xb0\xb2\x0f\x43\x1a\x9c\x5e\x50"
+ "\xf3\x95\xc8\x93\x87\xd0\x94\x5a\xed\xec\xa6\xeb\x40\x15\xdf\xc2"
+ "\xbd\x24\x21\xee\x9b\xb7\x11\x83\xba\x88\x2c\xee\xbf\xef\x25\x9f"
+ "\x33\xf9\xe2\x7d\xc6\x17\x8c\xb8\x9d\xc3\x74\x28\xcf\x9c\xc5\x2a"
+ "\x2b\xaa\x2d\x3a"
+ },
+ {
+ "pass\0word", 9,
+ "sa\0lt", 5,
+ GCRY_MD_STRIBOG512,
+ 4096,
+ 64,
+ "\x50\xdf\x06\x28\x85\xb6\x98\x01\xa3\xc1\x02\x48\xeb\x0a\x27\xab"
+ "\x6e\x52\x2f\xfe\xb2\x0c\x99\x1c\x66\x0f\x00\x14\x75\xd7\x3a\x4e"
+ "\x16\x7f\x78\x2c\x18\xe9\x7e\x92\x97\x6d\x9c\x1d\x97\x08\x31\xea"
+ "\x78\xcc\xb8\x79\xf6\x70\x68\xcd\xac\x19\x10\x74\x08\x44\xe8\x30"
}
};
int tvidx;
gpg_error_t err;
- unsigned char outbuf[40];
+ unsigned char outbuf[100];
int i;
for (tvidx=0; tvidx < DIM(tv); tvidx++)
commit 432eaf2ab83631a4e70ad4ecd20a9b6f81c1c329
Author: Dmitry Eremin-Solenikov <dbaryshkov at gmail.com>
Date: Fri Nov 25 15:52:46 2016 +0300
tests: Add Stribog HMAC tests from TC26ALG.
* tests/basic.c (check_mac): add HMAC test vectors from TC26ALG document
for Stribog.
--
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov at gmail.com>
Backport from master commit: fe6077e6ee8565bfcc91bad14a73e68f45b3c32b
diff --git a/tests/basic.c b/tests/basic.c
index b6f4f4b..ffb4397 100644
--- a/tests/basic.c
+++ b/tests/basic.c
@@ -8164,6 +8164,22 @@ check_mac (void)
"\x5e\xad\x03\xb7\x43\x4f\x87\xa1\x14\x8e\x17\x8f\x2a\x97\x7d\xe8"
"\xbd\xb0\x37\x3b\x67\xb9\x97\x36\xa5\x82\x9b\xdc\x0d\xe4\x5a\x8c"
"\x5e\xda\xb5\xca\xea\xa9\xb4\x6e\xba\xca\x25\xc8\xbf\xa1\x0e\xb0" },
+ { GCRY_MAC_HMAC_STRIBOG256,
+ "\x01\x26\xbd\xb8\x78\x00\xaf\x21\x43\x41\x45\x65\x63\x78\x01\x00",
+ "\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"
+ "\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f",
+ "\xa1\xaa\x5f\x7d\xe4\x02\xd7\xb3\xd3\x23\xf2\x99\x1c\x8d\x45\x34"
+ "\x01\x31\x37\x01\x0a\x83\x75\x4f\xd0\xaf\x6d\x7c\xd4\x92\x2e\xd9",
+ NULL, 16, 32 },
+ { GCRY_MAC_HMAC_STRIBOG512,
+ "\x01\x26\xbd\xb8\x78\x00\xaf\x21\x43\x41\x45\x65\x63\x78\x01\x00",
+ "\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"
+ "\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f",
+ "\xa5\x9b\xab\x22\xec\xae\x19\xc6\x5f\xbd\xe6\xe5\xf4\xe9\xf5\xd8"
+ "\x54\x9d\x31\xf0\x37\xf9\xdf\x9b\x90\x55\x00\xe1\x71\x92\x3a\x77"
+ "\x3d\x5f\x15\x30\xf2\xed\x7e\x96\x4c\xb2\xee\xdc\x29\xe9\xad\x2f"
+ "\x3a\xfe\x93\xb2\x81\x4f\x79\xf5\x00\x0f\xfc\x03\x66\xc2\x51\xe6",
+ NULL, 16, 32 },
/* CMAC AES and DES test vectors from
http://web.archive.org/web/20130930212819/http://csrc.nist.gov/publica\
tions/nistpubs/800-38B/Updated_CMAC_Examples.pdf */
commit d0940e3d194296bc334f06f97ae91b411e1f152f
Author: Dmitry Eremin-Solenikov <dbaryshkov at gmail.com>
Date: Fri Nov 25 15:52:45 2016 +0300
cipher: Add Stribog OIDs from TC26 space.
* cipher/stribog.c (oid_spec_stribog256, oid_spec_stribog512): New.
--
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov at gmail.com>
Backport from master commit: ccffacaf6c3abe6120a0898db922981d28ab7af2
diff --git a/cipher/stribog.c b/cipher/stribog.c
index 7f38e6f..7b6e330 100644
--- a/cipher/stribog.c
+++ b/cipher/stribog.c
@@ -1321,10 +1321,28 @@ stribog_read_256 (void *context)
return hd->result + 32;
}
+static gcry_md_oid_spec_t oid_spec_stribog256[] =
+ {
+ /* id-tc26-signwithdigest-gost3410-12-256 */
+ { "1.2.643.7.1.1.3.2" },
+ /* id-tc26-gost3411-12-256 */
+ { "1.2.643.7.1.1.2.2" },
+ { NULL },
+ };
+
+static gcry_md_oid_spec_t oid_spec_stribog512[] =
+ {
+ /* id-tc26-signwithdigest-gost3410-12-512 */
+ { "1.2.643.7.1.1.3.3" },
+ /* id-tc26-gost3411-12-512 */
+ { "1.2.643.7.1.1.2.3" },
+ { NULL },
+ };
+
gcry_md_spec_t _gcry_digest_spec_stribog_256 =
{
GCRY_MD_STRIBOG256, {0, 0},
- "STRIBOG256", NULL, 0, NULL, 32,
+ "STRIBOG256", NULL, 0, oid_spec_stribog256, 32,
stribog_init_256, _gcry_md_block_write, stribog_final, stribog_read_256,
NULL,
sizeof (STRIBOG_CONTEXT)
@@ -1333,7 +1351,7 @@ gcry_md_spec_t _gcry_digest_spec_stribog_256 =
gcry_md_spec_t _gcry_digest_spec_stribog_512 =
{
GCRY_MD_STRIBOG512, {0, 0},
- "STRIBOG512", NULL, 0, NULL, 64,
+ "STRIBOG512", NULL, 0, oid_spec_stribog512, 64,
stribog_init_512, _gcry_md_block_write, stribog_final, stribog_read_512,
NULL,
sizeof (STRIBOG_CONTEXT)
commit 4bfec0a52af8c847f558b9ade56d896c224019b3
Author: Justus Winter <justus at g10code.com>
Date: Fri Nov 25 09:38:51 2016 +0100
tests: Fix memory leak.
* tests/basic.c (check_gost28147_cipher): Free cipher handles.
--
Fixes-commit: 4f5c26c73c66daf2e4aff966e43c22b2db7e0138
Signed-off-by: Justus Winter <justus at g10code.com>
Backport from master commit: 5530a8234d703ce9b685f78fb6e951136eb0aeb2
diff --git a/tests/basic.c b/tests/basic.c
index 7f7bce3..b6f4f4b 100644
--- a/tests/basic.c
+++ b/tests/basic.c
@@ -4033,6 +4033,9 @@ check_gost28147_cipher (void)
mismatch (tv[i].plaintext, tv[i].inlen,
out, tv[i].inlen);
}
+
+ gcry_cipher_close (hde);
+ gcry_cipher_close (hdd);
}
#endif
-----------------------------------------------------------------------
Summary of changes:
cipher/stribog.c | 22 ++++++++++++++++--
tests/basic.c | 19 +++++++++++++++
tests/t-kdf.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
3 files changed, 109 insertions(+), 3 deletions(-)
hooks/post-receive
--
The GNU crypto library
http://git.gnupg.org
More information about the Gnupg-commits
mailing list