Revise ED25519 regress following API changes.

diff --git a/regress/lib/libcrypto/curve25519/ed25519test.c b/regress/lib/libcrypto/curve25519/ed25519test.c
index d7c0ff4..1ad070a 100644 (file)
--- a/regress/lib/libcrypto/curve25519/ed25519test.c
+++ b/regress/lib/libcrypto/curve25519/ed25519test.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ed25519test.c,v 1.2 2022/11/07 12:36:21 tb Exp $ */
+/*     $OpenBSD: ed25519test.c,v 1.3 2022/11/09 17:49:54 jsing Exp $ */
 /*
  * Copyright (c) 2019 Theo Buehler <tb@openbsd.org>
  *
@@ -22,9 +22,9 @@
 #include <openssl/curve25519.h>
 
 struct testvector {
-       const uint8_t sec_key[ED25519_PRIVATE_KEY_LEN];
-       const uint8_t pub_key[ED25519_PUBLIC_KEY_LEN];
-       const uint8_t signature[ED25519_SIGNATURE_LEN];
+       const uint8_t sec_key[ED25519_PRIVATE_KEY_LENGTH];
+       const uint8_t pub_key[ED25519_PUBLIC_KEY_LENGTH];
+       const uint8_t signature[ED25519_SIGNATURE_LENGTH];
        size_t message_len;
        const uint8_t *message;
 };
@@ -40,10 +40,6 @@ struct testvector testvectors[] = {
                        0xba, 0x84, 0x4a, 0xf4, 0x92, 0xec, 0x2c, 0xc4,
                        0x44, 0x49, 0xc5, 0x69, 0x7b, 0x32, 0x69, 0x19,
                        0x70, 0x3b, 0xac, 0x03, 0x1c, 0xae, 0x7f, 0x60,
-                       0xd7, 0x5a, 0x98, 0x01, 0x82, 0xb1, 0x0a, 0xb7,
-                       0xd5, 0x4b, 0xfe, 0xd3, 0xc9, 0x64, 0x07, 0x3a,
-                       0x0e, 0xe1, 0x72, 0xf3, 0xda, 0xa6, 0x23, 0x25,
-                       0xaf, 0x02, 0x1a, 0x68, 0xf7, 0x07, 0x51, 0x1a,
                },
                .pub_key = {
                        0xd7, 0x5a, 0x98, 0x01, 0x82, 0xb1, 0x0a, 0xb7,
@@ -70,10 +66,6 @@ struct testvector testvectors[] = {
                        0x9d, 0xb6, 0xc3, 0x46, 0xec, 0x11, 0x4e, 0x0f,
                        0x5b, 0x8a, 0x31, 0x9f, 0x35, 0xab, 0xa6, 0x24,
                        0xda, 0x8c, 0xf6, 0xed, 0x4f, 0xb8, 0xa6, 0xfb,
-                       0x3d, 0x40, 0x17, 0xc3, 0xe8, 0x43, 0x89, 0x5a,
-                       0x92, 0xb7, 0x0a, 0xa7, 0x4d, 0x1b, 0x7e, 0xbc,
-                       0x9c, 0x98, 0x2c, 0xcf, 0x2e, 0xc4, 0x96, 0x8c,
-                       0xc0, 0xcd, 0x55, 0xf1, 0x2a, 0xf4, 0x66, 0x0c,
                },
                .pub_key =  {
                        0x3d, 0x40, 0x17, 0xc3, 0xe8, 0x43, 0x89, 0x5a,
@@ -100,10 +92,6 @@ struct testvector testvectors[] = {
                        0xed, 0xb7, 0x44, 0x2f, 0x31, 0xdc, 0xb7, 0xb1,
                        0x66, 0xd3, 0x85, 0x35, 0x07, 0x6f, 0x09, 0x4b,
                        0x85, 0xce, 0x3a, 0x2e, 0x0b, 0x44, 0x58, 0xf7,
-                       0xfc, 0x51, 0xcd, 0x8e, 0x62, 0x18, 0xa1, 0xa3,
-                       0x8d, 0xa4, 0x7e, 0xd0, 0x02, 0x30, 0xf0, 0x58,
-                       0x08, 0x16, 0xed, 0x13, 0xba, 0x33, 0x03, 0xac,
-                       0x5d, 0xeb, 0x91, 0x15, 0x48, 0x90, 0x80, 0x25,
                },
                .pub_key = {
                        0xfc, 0x51, 0xcd, 0x8e, 0x62, 0x18, 0xa1, 0xa3,
@@ -130,10 +118,6 @@ struct testvector testvectors[] = {
                        0x17, 0x63, 0x0f, 0x22, 0x68, 0x76, 0xb8, 0x6c,
                        0x81, 0x60, 0xcc, 0x58, 0x3b, 0xc0, 0x13, 0x74,
                        0x4c, 0x6b, 0xf2, 0x55, 0xf5, 0xcc, 0x0e, 0xe5,
-                       0x27, 0x81, 0x17, 0xfc, 0x14, 0x4c, 0x72, 0x34,
-                       0x0f, 0x67, 0xd0, 0xf2, 0x31, 0x6e, 0x83, 0x86,
-                       0xce, 0xff, 0xbf, 0x2b, 0x24, 0x28, 0xc9, 0xc5,
-                       0x1f, 0xef, 0x7c, 0x59, 0x7f, 0x1d, 0x42, 0x6e,
                },
                .pub_key = {
                        0x27, 0x81, 0x17, 0xfc, 0x14, 0x4c, 0x72, 0x34,
@@ -289,10 +273,6 @@ struct testvector testvectors[] = {
                        0x62, 0xec, 0x77, 0x58, 0x75, 0x20, 0x91, 0x1e,
                        0x9a, 0x75, 0x9c, 0xec, 0x1d, 0x19, 0x75, 0x5b,
                        0x7d, 0xa9, 0x01, 0xb9, 0x6d, 0xca, 0x3d, 0x42,
-                       0xec, 0x17, 0x2b, 0x93, 0xad, 0x5e, 0x56, 0x3b,
-                       0xf4, 0x93, 0x2c, 0x70, 0xe1, 0x24, 0x50, 0x34,
-                       0xc3, 0x54, 0x67, 0xef, 0x2e, 0xfd, 0x4d, 0x64,
-                       0xeb, 0xf8, 0x19, 0x68, 0x34, 0x67, 0xe2, 0xbf,
                },
                .pub_key = {
                        0xec, 0x17, 0x2b, 0x93, 0xad, 0x5e, 0x56, 0x3b,
@@ -359,7 +339,7 @@ test_ED25519_sign(void)
                uint8_t signature[64];
 
                if (!ED25519_sign(signature, tc->message, tc->message_len,
-                   tc->sec_key)) {
+                   tc->pub_key, tc->sec_key)) {
                        warnx("failed signature in test case %zu", i);
                        failed = 1;
                }