Commit b3bfc7bf55 for openssl.org
commit b3bfc7bf552d534fc96db740cdb6b3191cb317d6
Author: Norbert Pocs <norbertp@openssl.org>
Date: Wed May 13 16:10:55 2026 +0200
Use valid DH peer pubkey in the KAT tests
Co-authored-by: Viktor Dukhovni <viktor@openssl.org>
Signed-off-by: Norbert Pocs <norbertp@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.foundation>
MergeDate: Mon May 18 07:34:16 2026
(Merged from https://github.com/openssl/openssl/pull/31171)
diff --git a/providers/fips/self_test_data.c b/providers/fips/self_test_data.c
index 1f403be7dc..dcb7552952 100644
--- a/providers/fips/self_test_data.c
+++ b/providers/fips/self_test_data.c
@@ -1063,114 +1063,113 @@ static const unsigned char drbg_hmac_sha2_pr_expected[] = {
#ifndef OPENSSL_NO_DH
/* DH KAT */
static const unsigned char dh_priv[] = {
- 0x14, 0x33, 0xe0, 0xb5, 0xa9, 0x17, 0xb6, 0x0a,
- 0x30, 0x23, 0xf2, 0xf8, 0xaa, 0x2c, 0x2d, 0x70,
- 0xd2, 0x96, 0x8a, 0xba, 0x9a, 0xea, 0xc8, 0x15,
- 0x40, 0xb8, 0xfc, 0xe6
+ 0x01, 0x14, 0xf7, 0x53, 0x7a, 0x2e, 0xc7, 0x08,
+ 0x2e, 0x36, 0xf7, 0x38, 0x7a, 0xc9, 0xe4, 0x5b,
+ 0xac, 0x68, 0xc7, 0xf7, 0x20, 0x8d, 0xf0, 0x8a,
+ 0xee, 0x96, 0x67, 0x92, 0x8a
};
static const unsigned char dh_pub[] = {
- 0x00, 0x8f, 0x81, 0x67, 0x68, 0xce, 0x97, 0x99,
- 0x7e, 0x11, 0x5c, 0xad, 0x5b, 0xe1, 0x0c, 0xd4,
- 0x15, 0x44, 0xdf, 0xc2, 0x47, 0xe7, 0x06, 0x27,
- 0x5e, 0xf3, 0x9d, 0x5c, 0x4b, 0x2e, 0x35, 0x05,
- 0xfd, 0x3c, 0x8f, 0x35, 0x85, 0x1b, 0x82, 0xdd,
- 0x49, 0xc9, 0xa8, 0x7e, 0x3a, 0x5f, 0x33, 0xdc,
- 0x8f, 0x5e, 0x32, 0x76, 0xe1, 0x52, 0x1b, 0x88,
- 0x85, 0xda, 0xa9, 0x1d, 0x5f, 0x1c, 0x05, 0x3a,
- 0xd4, 0x8d, 0xbb, 0xe7, 0x46, 0x46, 0x1e, 0x29,
- 0x4b, 0x5a, 0x02, 0x88, 0x46, 0x94, 0xd0, 0x68,
- 0x7d, 0xb2, 0x9f, 0x3a, 0x3d, 0x82, 0x05, 0xe5,
- 0xa7, 0xbe, 0x6c, 0x7e, 0x24, 0x35, 0x25, 0x14,
- 0xf3, 0x45, 0x08, 0x90, 0xfc, 0x55, 0x2e, 0xa8,
- 0xb8, 0xb1, 0x89, 0x15, 0x94, 0x51, 0x44, 0xa9,
- 0x9f, 0x68, 0xcb, 0x90, 0xbc, 0xd3, 0xae, 0x02,
- 0x37, 0x26, 0xe4, 0xe9, 0x1a, 0x90, 0x95, 0x7e,
- 0x1d, 0xac, 0x0c, 0x91, 0x97, 0x83, 0x24, 0x83,
- 0xb9, 0xa1, 0x40, 0x72, 0xac, 0xf0, 0x55, 0x32,
- 0x18, 0xab, 0xb8, 0x90, 0xda, 0x13, 0x4a, 0xc8,
- 0x4b, 0x7c, 0x18, 0xbc, 0x33, 0xbf, 0x99, 0x85,
- 0x39, 0x3e, 0xc6, 0x95, 0x9b, 0x48, 0x8e, 0xbe,
- 0x46, 0x59, 0x48, 0x41, 0x0d, 0x37, 0x25, 0x94,
- 0xbe, 0x8d, 0xf5, 0x81, 0x52, 0xf6, 0xdc, 0xeb,
- 0x98, 0xd7, 0x3b, 0x44, 0x61, 0x6f, 0xa3, 0xef,
- 0x7b, 0xfe, 0xbb, 0xc2, 0x8e, 0x46, 0x63, 0xbc,
- 0x52, 0x65, 0xf9, 0xf8, 0x85, 0x41, 0xdf, 0x82,
- 0x4a, 0x10, 0x2a, 0xe3, 0x0c, 0xb7, 0xad, 0x84,
- 0xa6, 0x6f, 0x4e, 0x8e, 0x96, 0x1e, 0x04, 0xf7,
- 0x57, 0x39, 0xca, 0x58, 0xd4, 0xef, 0x5a, 0xf1,
- 0xf5, 0x69, 0xc2, 0xb1, 0x5c, 0x0a, 0xce, 0xbe,
- 0x38, 0x01, 0xb5, 0x3f, 0x07, 0x8a, 0x72, 0x90,
- 0x10, 0xac, 0x51, 0x3a, 0x96, 0x43, 0xdf, 0x6f,
- 0xea
+ 0x07, 0x21, 0x4b, 0x8d, 0x23, 0x75, 0x50, 0x84,
+ 0xaa, 0xec, 0x2f, 0xac, 0xae, 0x2a, 0xf4, 0xc1,
+ 0x25, 0xca, 0x0b, 0xee, 0x20, 0xaf, 0x3a, 0x2f,
+ 0xda, 0xf9, 0x5f, 0xce, 0x01, 0xb9, 0xd9, 0xc4,
+ 0x5f, 0x7c, 0xba, 0xd8, 0x46, 0xc6, 0xee, 0x0a,
+ 0x53, 0x80, 0x9d, 0x5c, 0x22, 0x75, 0xa9, 0xe5,
+ 0x3d, 0xfe, 0x31, 0x60, 0x4a, 0xe6, 0xd5, 0x18,
+ 0x02, 0x19, 0x0a, 0x80, 0xcd, 0x38, 0x35, 0x71,
+ 0x63, 0xe3, 0x1d, 0xe8, 0x96, 0xdb, 0x5e, 0x5b,
+ 0x23, 0x2f, 0x70, 0x5f, 0x4a, 0xf0, 0xf7, 0xf4,
+ 0xe8, 0x1f, 0x44, 0x5a, 0x4f, 0x22, 0xc5, 0x8b,
+ 0xc3, 0xc6, 0x48, 0x93, 0x50, 0xe1, 0x0f, 0x2f,
+ 0x73, 0xb9, 0xeb, 0xba, 0xe4, 0x8e, 0x35, 0x5c,
+ 0x67, 0xcf, 0xf8, 0xb0, 0x83, 0x19, 0xf3, 0xdb,
+ 0xb8, 0x80, 0xbc, 0x65, 0xcb, 0x8f, 0x91, 0x69,
+ 0x76, 0x06, 0xd9, 0xd7, 0xc1, 0x2b, 0xf9, 0x15,
+ 0x6b, 0x71, 0x76, 0x1e, 0xc8, 0x29, 0xb2, 0xc2,
+ 0x02, 0xc7, 0xef, 0x75, 0x74, 0x0f, 0xe6, 0x74,
+ 0x4a, 0x0b, 0x67, 0xbd, 0xa9, 0x44, 0x27, 0xa9,
+ 0x67, 0xf9, 0xbf, 0x6c, 0x97, 0xcf, 0xa3, 0x8b,
+ 0x1b, 0x74, 0x02, 0x45, 0x10, 0xf4, 0x0d, 0x6c,
+ 0x7b, 0x9d, 0x6c, 0xb9, 0xf9, 0xc9, 0xf5, 0x1a,
+ 0xb9, 0xe4, 0xc9, 0x44, 0xff, 0xaa, 0x20, 0xf2,
+ 0x73, 0xd0, 0x2e, 0xc9, 0xeb, 0xba, 0x19, 0x1a,
+ 0x22, 0xe8, 0x82, 0x3d, 0x15, 0x24, 0xa5, 0x39,
+ 0x9d, 0x9b, 0x1b, 0xf5, 0xb0, 0x4f, 0x06, 0xc0,
+ 0x87, 0x90, 0x8d, 0xcf, 0x19, 0xb5, 0xd5, 0xad,
+ 0xd4, 0x17, 0x9a, 0x94, 0x75, 0x42, 0xa1, 0xf3,
+ 0x35, 0x99, 0x3a, 0x1f, 0x68, 0x1c, 0x40, 0x52,
+ 0x7b, 0x5e, 0x39, 0xd5, 0x76, 0xdd, 0x18, 0x49,
+ 0xfc, 0xf2, 0x3c, 0x9c, 0x0e, 0x44, 0xa5, 0xc1,
+ 0x5a, 0x06, 0x46, 0x90, 0x13, 0x34, 0x04, 0x4f
};
static const unsigned char dh_peer_pub[] = {
- 0x1f, 0xc1, 0xda, 0x34, 0x1d, 0x1a, 0x84, 0x6a,
- 0x96, 0xb7, 0xbe, 0x24, 0x34, 0x0f, 0x87, 0x7d,
- 0xd0, 0x10, 0xaa, 0x03, 0x56, 0xd5, 0xad, 0x58,
- 0xaa, 0xe9, 0xc7, 0xb0, 0x8f, 0x74, 0x9a, 0x32,
- 0x23, 0x51, 0x10, 0xb5, 0xd8, 0x8e, 0xb5, 0xdb,
- 0xfa, 0x97, 0x8d, 0x27, 0xec, 0xc5, 0x30, 0xf0,
- 0x2d, 0x31, 0x14, 0x00, 0x5b, 0x64, 0xb1, 0xc0,
- 0xe0, 0x24, 0xcb, 0x8a, 0xe2, 0x16, 0x98, 0xbc,
- 0xa9, 0xe6, 0x0d, 0x42, 0x80, 0x86, 0x22, 0xf1,
- 0x81, 0xc5, 0x6e, 0x1d, 0xe7, 0xa9, 0x6e, 0x6e,
- 0xfe, 0xe9, 0xd6, 0x65, 0x67, 0xe9, 0x1b, 0x97,
- 0x70, 0x42, 0xc7, 0xe3, 0xd0, 0x44, 0x8f, 0x05,
- 0xfb, 0x77, 0xf5, 0x22, 0xb9, 0xbf, 0xc8, 0xd3,
- 0x3c, 0xc3, 0xc3, 0x1e, 0xd3, 0xb3, 0x1f, 0x0f,
- 0xec, 0xb6, 0xdb, 0x4f, 0x6e, 0xa3, 0x11, 0xe7,
- 0x7a, 0xfd, 0xbc, 0xd4, 0x7a, 0xee, 0x1b, 0xb1,
- 0x50, 0xf2, 0x16, 0x87, 0x35, 0x78, 0xfb, 0x96,
- 0x46, 0x8e, 0x8f, 0x9f, 0x3d, 0xe8, 0xef, 0xbf,
- 0xce, 0x75, 0x62, 0x4b, 0x1d, 0xf0, 0x53, 0x22,
- 0xa3, 0x4f, 0x14, 0x63, 0xe8, 0x39, 0xe8, 0x98,
- 0x4c, 0x4a, 0xd0, 0xa9, 0x6e, 0x1a, 0xc8, 0x42,
- 0xe5, 0x31, 0x8c, 0xc2, 0x3c, 0x06, 0x2a, 0x8c,
- 0xa1, 0x71, 0xb8, 0xd5, 0x75, 0x98, 0x0d, 0xde,
- 0x7f, 0xc5, 0x6f, 0x15, 0x36, 0x52, 0x38, 0x20,
- 0xd4, 0x31, 0x92, 0xbf, 0xd5, 0x1e, 0x8e, 0x22,
- 0x89, 0x78, 0xac, 0xa5, 0xb9, 0x44, 0x72, 0xf3,
- 0x39, 0xca, 0xeb, 0x99, 0x31, 0xb4, 0x2b, 0xe3,
- 0x01, 0x26, 0x8b, 0xc9, 0x97, 0x89, 0xc9, 0xb2,
- 0x55, 0x71, 0xc3, 0xc0, 0xe4, 0xcb, 0x3f, 0x00,
- 0x7f, 0x1a, 0x51, 0x1c, 0xbb, 0x53, 0xc8, 0x51,
- 0x9c, 0xdd, 0x13, 0x02, 0xab, 0xca, 0x6c, 0x0f,
- 0x34, 0xf9, 0x67, 0x39, 0xf1, 0x7f, 0xf4, 0x8b
+ 0x82, 0x32, 0x3a, 0x03, 0x60, 0x05, 0x11, 0xce,
+ 0x4b, 0xb3, 0xb6, 0x69, 0x0a, 0x75, 0x88, 0x73,
+ 0x42, 0x74, 0x8e, 0x54, 0xc9, 0x7c, 0xcf, 0xe9,
+ 0xfd, 0x85, 0x42, 0x33, 0xc1, 0x8a, 0x1b, 0x07,
+ 0x82, 0x26, 0x13, 0x1f, 0xe1, 0x74, 0x8c, 0x10,
+ 0x45, 0x9e, 0xf2, 0x50, 0xdf, 0x39, 0x55, 0x58,
+ 0x0b, 0xea, 0xc9, 0x1f, 0xae, 0x3e, 0xfb, 0xec,
+ 0x52, 0x5c, 0x4e, 0x69, 0x85, 0x83, 0x8d, 0x04,
+ 0x23, 0xaf, 0x6e, 0x33, 0x73, 0x96, 0x5e, 0xf8,
+ 0x05, 0xa3, 0x5b, 0xee, 0xe4, 0xf2, 0x8c, 0x03,
+ 0x59, 0xd2, 0x98, 0x78, 0xb3, 0xe3, 0xf5, 0x44,
+ 0xb6, 0x3d, 0x2a, 0x51, 0xf0, 0xcb, 0x29, 0x29,
+ 0x1b, 0x0e, 0xbc, 0xb1, 0xb4, 0x80, 0x8c, 0xbc,
+ 0xdf, 0x9c, 0x32, 0xcf, 0xbc, 0xe8, 0x18, 0x27,
+ 0xd7, 0x74, 0x9e, 0xa8, 0xed, 0x87, 0xb9, 0x4d,
+ 0x0b, 0x06, 0xad, 0x0e, 0x15, 0x83, 0x71, 0xcd,
+ 0x53, 0xd0, 0x54, 0x86, 0x03, 0xe4, 0x1e, 0x30,
+ 0x49, 0xaf, 0xec, 0x75, 0xe1, 0x6c, 0xa1, 0xad,
+ 0xee, 0x78, 0xf1, 0x4b, 0xf7, 0x70, 0x42, 0xbb,
+ 0x2f, 0xab, 0xc4, 0xa7, 0x31, 0x76, 0x77, 0x07,
+ 0x69, 0x73, 0xc0, 0xb2, 0xbf, 0x9b, 0x8b, 0xad,
+ 0xe7, 0x14, 0xe4, 0x28, 0x75, 0xef, 0x8f, 0x71,
+ 0x09, 0x7d, 0x87, 0xb1, 0x0e, 0x4f, 0xf5, 0xb1,
+ 0xd9, 0xdd, 0xe3, 0xd0, 0xe3, 0xa7, 0x93, 0x2c,
+ 0x81, 0x26, 0x9a, 0x71, 0x6d, 0x29, 0x63, 0x5b,
+ 0x63, 0x5c, 0x36, 0xd9, 0x56, 0x32, 0xfb, 0xaf,
+ 0x49, 0x97, 0x0c, 0xb8, 0x45, 0xa4, 0x40, 0x7d,
+ 0x25, 0x89, 0x9b, 0x71, 0xc2, 0x50, 0x8c, 0x35,
+ 0x63, 0xbc, 0x4f, 0x5c, 0x2f, 0x6d, 0x20, 0x7f,
+ 0xeb, 0x59, 0xce, 0x06, 0x69, 0xcd, 0x25, 0xe8,
+ 0x7b, 0x6e, 0x10, 0x88, 0x14, 0x72, 0x6f, 0x19,
+ 0x11, 0x1e, 0x36, 0xae, 0xaa, 0x54, 0xf9, 0xb4
};
static const unsigned char dh_secret_expected[256] = {
- 0xa0, 0x38, 0x64, 0x37, 0xdf, 0x2d, 0x2c, 0x78,
- 0x49, 0xb9, 0xa7, 0x77, 0xfb, 0xc1, 0x69, 0x94,
- 0x85, 0xc5, 0x5a, 0xbc, 0x8d, 0x43, 0x32, 0x23,
- 0x94, 0xf5, 0xba, 0xb4, 0x5f, 0x22, 0x4b, 0x4e,
- 0xc4, 0xfd, 0x89, 0x41, 0x56, 0x41, 0xe8, 0x9f,
- 0x2d, 0x0d, 0x26, 0x33, 0x60, 0x13, 0x8a, 0x20,
- 0xf1, 0x7e, 0xb3, 0x76, 0x38, 0x03, 0x0e, 0x48,
- 0x4f, 0x27, 0x8c, 0x32, 0xdb, 0x66, 0x5c, 0xbf,
- 0x7f, 0xc7, 0xeb, 0xc6, 0x2d, 0xfd, 0x00, 0x08,
- 0xb0, 0x98, 0x4e, 0xad, 0x68, 0x65, 0xca, 0x9e,
- 0x78, 0xe1, 0xaa, 0xb7, 0x8e, 0x08, 0x4d, 0x67,
- 0xa6, 0x15, 0x16, 0xbb, 0x41, 0xac, 0x15, 0xb5,
- 0x08, 0x92, 0x5d, 0x25, 0x1d, 0x7f, 0xf3, 0x1b,
- 0x5c, 0xea, 0x21, 0x6b, 0xe5, 0x00, 0x4d, 0xb6,
- 0x8e, 0xae, 0x84, 0xb4, 0xee, 0xf7, 0xcc, 0xdd,
- 0x64, 0x19, 0x4e, 0x25, 0xce, 0x37, 0x4f, 0xde,
- 0xb6, 0x21, 0xba, 0xd9, 0xc0, 0x7a, 0x87, 0xc7,
- 0x90, 0x0a, 0x78, 0x8b, 0xdd, 0xbc, 0x68, 0x77,
- 0x2d, 0xa6, 0xdf, 0x4d, 0x2e, 0xca, 0xdc, 0x86,
- 0xb6, 0x1e, 0x54, 0x2b, 0x3a, 0xa9, 0x52, 0x67,
- 0xf3, 0x1a, 0x35, 0xb7, 0x5a, 0xcd, 0x99, 0x59,
- 0xe9, 0x07, 0x6f, 0xd7, 0xd7, 0x96, 0x8a, 0x47,
- 0xdf, 0x9f, 0x51, 0x1b, 0x04, 0xa9, 0x45, 0x30,
- 0x89, 0x8a, 0x3f, 0x7e, 0xca, 0xfc, 0x05, 0x2d,
- 0x18, 0x77, 0x8f, 0x45, 0x25, 0x39, 0xdb, 0xf2,
- 0x13, 0x36, 0x31, 0xdb, 0x50, 0x65, 0x63, 0x4a,
- 0xae, 0x3e, 0xd1, 0x3e, 0xde, 0xc1, 0x32, 0x4b,
- 0x78, 0x19, 0x03, 0x70, 0x0a, 0xc2, 0xa2, 0x6f,
- 0x9b, 0xd4, 0xa6, 0x1d, 0x47, 0xf2, 0xa6, 0x91,
- 0x61, 0x4a, 0x74, 0xf8, 0x70, 0x39, 0x42, 0x72,
- 0xd5, 0x58, 0x7f, 0xcd, 0x16, 0xeb, 0x82, 0x0c,
- 0x2c, 0xf4, 0xd0, 0x95, 0x22, 0xf9, 0xbe, 0x99
+ 0x79, 0x29, 0x11, 0x03, 0x5f, 0x31, 0xbb, 0x8d,
+ 0x6c, 0xeb, 0xc1, 0x46, 0xc7, 0x7d, 0xb9, 0x2b,
+ 0xf7, 0xde, 0x68, 0xb7, 0xd0, 0x2e, 0x18, 0xb9,
+ 0x5e, 0xfb, 0x67, 0x0f, 0x4a, 0x71, 0x9c, 0x33,
+ 0x2b, 0x64, 0xb9, 0x43, 0x1d, 0x5f, 0x9f, 0xb4,
+ 0xa2, 0xa7, 0x1a, 0xa5, 0x49, 0xf5, 0x53, 0x17,
+ 0xcd, 0x28, 0x28, 0x55, 0xe7, 0x85, 0xcb, 0xe4,
+ 0xca, 0x66, 0xe4, 0x8c, 0x55, 0xbc, 0xd7, 0x1c,
+ 0x15, 0xa0, 0xa5, 0xa4, 0x4c, 0xca, 0x2b, 0x37,
+ 0x4a, 0x5c, 0xda, 0xab, 0xc4, 0x1d, 0x8a, 0x78,
+ 0x2f, 0xc5, 0x99, 0xab, 0x13, 0x8a, 0xad, 0xf5,
+ 0xbb, 0x83, 0x45, 0x6d, 0xb4, 0x40, 0x64, 0x2f,
+ 0x6a, 0xeb, 0xf3, 0xc7, 0x6a, 0xf7, 0x35, 0xf5,
+ 0xf7, 0x06, 0xd5, 0x65, 0xf2, 0xe4, 0x93, 0x80,
+ 0xa1, 0x59, 0x79, 0x1f, 0x05, 0x6b, 0x24, 0xf0,
+ 0xbd, 0xcf, 0xa5, 0xa5, 0xcf, 0x43, 0x78, 0xbb,
+ 0x78, 0xb1, 0xed, 0x63, 0x01, 0x85, 0x48, 0x58,
+ 0xd3, 0x9f, 0xd9, 0xdc, 0xc6, 0x4a, 0x10, 0x19,
+ 0x78, 0x94, 0x8a, 0x95, 0x9b, 0xeb, 0xc4, 0x39,
+ 0xa7, 0xe8, 0xbe, 0x21, 0x9e, 0xcc, 0xc6, 0x6e,
+ 0x11, 0xc8, 0x57, 0x96, 0x47, 0xf7, 0x4f, 0xca,
+ 0x50, 0xc9, 0xeb, 0x1a, 0x8f, 0xad, 0xd6, 0x89,
+ 0x3c, 0xf3, 0xc3, 0x16, 0xdd, 0x30, 0x9b, 0xcb,
+ 0xbb, 0x53, 0x1a, 0xbb, 0x22, 0x6f, 0xf0, 0x57,
+ 0x3b, 0x2c, 0x04, 0xb1, 0x1d, 0x5d, 0x0e, 0xbc,
+ 0x2b, 0xec, 0x38, 0xc1, 0x46, 0x89, 0x57, 0x15,
+ 0xfb, 0x89, 0xe0, 0x09, 0xb0, 0x67, 0x58, 0xab,
+ 0x1a, 0x9f, 0x0b, 0x0a, 0x51, 0xc9, 0x8b, 0xdf,
+ 0x42, 0xd5, 0x35, 0xc2, 0x19, 0xc2, 0xb9, 0xcc,
+ 0x66, 0x2f, 0x61, 0x91, 0xbc, 0x42, 0x2d, 0x95,
+ 0xb9, 0x64, 0x29, 0x35, 0x8e, 0xcd, 0xda, 0xa3,
+ 0x8f, 0x85, 0x16, 0x52, 0x78, 0x0f, 0x48, 0xf5
};
static const char dh_ffdhe2048[] = "ffdhe2048";