X-Git-Url: http://wagner.pp.ru/gitweb/?a=blobdiff_plain;f=test_digest.c;h=ce7f60a591eb1b88bfae14f1d58e2c8ad8ec39d4;hb=9465f47596fb0ca5db8ea89c69ba07990e682ced;hp=71470f498b1b15b2b03064a63def29c107636f67;hpb=0ec3f1a77a0ff3addd205527e74e1260d4a7ed54;p=openssl-gost%2Fengine.git

diff --git a/test_digest.c b/test_digest.c
index 71470f4..ce7f60a 100644
--- a/test_digest.c
+++ b/test_digest.c
@@ -8,11 +8,16 @@
  */
 
 #include <openssl/engine.h>
+#include <openssl/opensslv.h>
 #include <openssl/evp.h>
-#include <openssl/hmac.h>
 #include <openssl/rand.h>
 #include <openssl/err.h>
 #include <openssl/asn1.h>
+#if OPENSSL_VERSION_MAJOR < 3
+# include <openssl/hmac.h>
+#else
+# include <openssl/core_names.h>
+#endif
 #include <openssl/obj_mac.h>
 #include <string.h>
 #include <stdlib.h>
@@ -49,13 +54,22 @@
 		 printf(cGREEN "  Test passed\n" cNORM);}
 
 /*
- * Test key from both GOST R 34.12-2015 and GOST R 34.13-2015.
+ * Test keys from both GOST R 34.12-2015 and GOST R 34.13-2015,
+ * for 128-bit cipher (A.1).
  */
 static const char K[32] = {
     0x88,0x99,0xaa,0xbb,0xcc,0xdd,0xee,0xff,0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77,
     0xfe,0xdc,0xba,0x98,0x76,0x54,0x32,0x10,0x01,0x23,0x45,0x67,0x89,0xab,0xcd,0xef,
 };
 
+/*
+ * Key for 64-bit cipher (A.2).
+ */
+static const char Km[32] = {
+    0xff,0xee,0xdd,0xcc,0xbb,0xaa,0x99,0x88,0x77,0x66,0x55,0x44,0x33,0x22,0x11,0x00,
+    0xf0,0xf1,0xf2,0xf3,0xf4,0xf5,0xf6,0xf7,0xf8,0xf9,0xfa,0xfb,0xfc,0xfd,0xfe,0xff,
+};
+
 /*
  * Plaintext from GOST R 34.13-2015 A.1.
  * First 16 bytes is vector (a) from GOST R 34.12-2015 A.1.
@@ -67,11 +81,22 @@ static const char P[] = {
     0x22,0x33,0x44,0x55,0x66,0x77,0x88,0x99,0xaa,0xbb,0xcc,0xee,0xff,0x0a,0x00,0x11,
 };
 
+/* Plaintext for 64-bit cipher (A.2) */
+static const char Pm[] = {
+    0x92,0xde,0xf0,0x6b,0x3c,0x13,0x0a,0x59,0xdb,0x54,0xc7,0x04,0xf8,0x18,0x9d,0x20,
+    0x4a,0x98,0xfb,0x2e,0x67,0xa8,0x02,0x4c,0x89,0x12,0x40,0x9b,0x17,0xb5,0x7e,0x41,
+};
+
 /*
- * OMAC1/CMAC test vector from GOST R 34.13-2015 А.1.6
+ * Kuznyechik OMAC1/CMAC test vector from GOST R 34.13-2015 А.1.6
  */
 static const char MAC_omac[] = { 0x33,0x6f,0x4d,0x29,0x60,0x59,0xfb,0xe3 };
 
+/*
+ * Magma OMAC1/CMAC test vector from GOST R 34.13-2015 А.2.6
+ */
+static const char MAC_magma_omac[] = { 0x15,0x4e,0x72,0x10 };
+
 /*
  * OMAC-ACPKM test vector from R 1323565.1.017-2018 A.4.1
  */
@@ -154,7 +179,7 @@ struct hash_testvec {
 };
 
 static const struct hash_testvec testvecs[] = {
-    {
+    { /* Test vectors from standards. */
 	.nid = NID_id_GostR3411_2012_512,
 	.name = "M1 from RFC 6986 (10.1.1) and GOST R 34.11-2012 (А.1.1)",
 	.plaintext =
@@ -222,6 +247,17 @@ static const struct hash_testvec testvecs[] = {
 	.mdsize = 128 / 8,
 	.truncate = sizeof(MAC_omac),
     },
+    {
+	.nid = NID_magma_mac,
+	.name = "P from GOST R 34.13-2015 (А.2.6)",
+	.plaintext = Pm,
+	.psize = sizeof(Pm),
+	.key = Km,
+	.key_size = sizeof(Km),
+	.digest = MAC_magma_omac,
+	.mdsize = 64 / 8,
+	.truncate = sizeof(MAC_magma_omac),
+    },
     {
 	.nid = NID_id_tc26_cipher_gostr3412_2015_kuznyechik_ctracpkm_omac,
 	.name = "M from R 1323565.1.017-2018 (A.4.1)",
@@ -414,35 +450,68 @@ static void hexdump(const void *ptr, size_t len)
     printf("\n");
 }
 
+#if OPENSSL_VERSION_MAJOR < 3
 static int do_hmac(const EVP_MD *type, const char *plaintext,
     unsigned int psize, const char *etalon, int mdsize,
     const char *key, unsigned int key_size)
 {
+    unsigned int len;
+    unsigned char md[EVP_MAX_MD_SIZE];
+
     HMAC_CTX *ctx;
     T(ctx = HMAC_CTX_new());
     T(HMAC_Init_ex(ctx, key, key_size, type, NULL));
-    if (mdsize)
-	T(HMAC_size(ctx) == mdsize);
-    else
-	T(mdsize = HMAC_size(ctx));
     T(HMAC_Update(ctx, (const unsigned char *)plaintext, psize));
-
-    unsigned int len;
-    unsigned char md[EVP_MAX_MD_SIZE];
     T(HMAC_Final(ctx, md, &len));
-
     HMAC_CTX_free(ctx);
-    T(len == mdsize);
 
-    if (memcmp(md, etalon, mdsize) != 0) {
+    if (mdsize)
+	T(len == mdsize);
+    if (memcmp(md, etalon, len) != 0) {
 	printf(cRED "hmac mismatch\n" cNORM);
-	hexdump(etalon, mdsize);
-	hexdump(md, mdsize);
+	hexdump(etalon, len);
+	hexdump(md, len);
 	return 1;
     }
+    return 0;
+}
+#else
+static int do_hmac(const EVP_MD *type, const char *plaintext,
+    unsigned int psize, const char *etalon, int mdsize,
+    const char *key, unsigned int key_size)
+{
+    size_t len;
+    unsigned char md[EVP_MAX_MD_SIZE];
+
+    EVP_MAC *hmac;
+    T(hmac = EVP_MAC_fetch(NULL, "HMAC", NULL));
+    EVP_MAC_CTX *ctx;
+    T(ctx = EVP_MAC_CTX_new(hmac));
+    OSSL_PARAM params[] = {
+	OSSL_PARAM_utf8_string(OSSL_MAC_PARAM_DIGEST,
+	    (char *)EVP_MD_name(type), 0),
+	OSSL_PARAM_octet_string(OSSL_MAC_PARAM_KEY, (char *)key, key_size),
+	OSSL_PARAM_END
+    };
+    T(EVP_MAC_CTX_set_params(ctx, params));
+    T(EVP_MAC_init(ctx));
+    T(EVP_MAC_update(ctx, (unsigned char *)plaintext, psize));
+    T(EVP_MAC_final(ctx, md, &len, EVP_MAX_MD_SIZE));
+    EVP_MAC_CTX_free(ctx);
+    EVP_MAC_free(hmac);
 
+    if (mdsize)
+	T(len == mdsize);
+    if (memcmp(md, etalon, len) != 0) {
+	printf(cRED "hmac mismatch\n" cNORM);
+	hexdump(etalon, len);
+	hexdump(md, len);
+	return 1;
+    }
     return 0;
 }
+#endif
+
 static int do_digest(const EVP_MD *type, const char *plaintext,
     unsigned int psize, const char *etalon, int mdsize, int truncate,
     const char *key, unsigned int key_size, int acpkm, int acpkm_t,
@@ -483,6 +552,8 @@ static int do_digest(const EVP_MD *type, const char *plaintext,
     T(len == mdsize);
     if (memcmp(md, etalon, mdsize) != 0) {
 	printf(cRED "digest mismatch\n" cNORM);
+	hexdump(etalon, mdsize);
+	hexdump(md, mdsize);
 	return 1;
     }