diff --git a/src/wp_dh_exch.c b/src/wp_dh_exch.c index 05ea777f..3a09faba 100644 --- a/src/wp_dh_exch.c +++ b/src/wp_dh_exch.c @@ -708,4 +708,3 @@ const OSSL_DISPATCH wp_dh_keyexch_functions[] = { }; #endif /* WP_HAVE_DH */ - diff --git a/test/test_dh.c b/test/test_dh.c index da5baf82..fc84c6c1 100644 --- a/test/test_dh.c +++ b/test/test_dh.c @@ -20,6 +20,7 @@ #include "unit.h" #include +#include #include #include #include @@ -1735,4 +1736,486 @@ int test_dh_pgen_min_bits(void *data) return err; } +/* Explicit FFC group with p - 1 = 2 * q * 3 * m, so it has a subgroup of + * order 3 that the [2, p-2] range check does not exclude. */ +static const unsigned char dh_ss_p[] = { + 0x80, 0x70, 0x7d, 0xf7, 0x10, 0xdf, 0x1f, 0x53, + 0x7e, 0x35, 0xda, 0x18, 0xa9, 0x67, 0xb9, 0x2a, + 0xe1, 0x2a, 0x10, 0x6f, 0x74, 0x38, 0x52, 0x92, + 0x8d, 0xce, 0xa3, 0x3a, 0x13, 0x21, 0xbc, 0x6d, + 0x6a, 0x89, 0x3f, 0x92, 0x76, 0x2a, 0xe6, 0xf1, + 0x0e, 0x7c, 0x70, 0xd5, 0x69, 0x18, 0x53, 0xf9, + 0xf6, 0x1b, 0x81, 0xfb, 0x5d, 0x23, 0x9c, 0x2b, + 0xc4, 0x6e, 0x3e, 0x4a, 0x44, 0xba, 0x7a, 0x74, + 0x28, 0x2f, 0x1c, 0x08, 0x06, 0xdb, 0x33, 0x95, + 0xae, 0x3a, 0x53, 0xa0, 0xad, 0x9d, 0x36, 0xad, + 0x80, 0x94, 0x53, 0xd7, 0xb6, 0x4a, 0xb3, 0x5f, + 0xcb, 0x45, 0x78, 0xff, 0xdb, 0x78, 0xd8, 0x2f, + 0xdd, 0x5a, 0xbe, 0xd8, 0xaa, 0xde, 0x1d, 0x46, + 0x82, 0xf3, 0x14, 0x54, 0x09, 0x0e, 0xe1, 0xbe, + 0xd1, 0x7e, 0x47, 0xd1, 0xc5, 0x30, 0xdd, 0xcd, + 0x04, 0x77, 0xe8, 0xcd, 0x3f, 0x5b, 0xeb, 0x2b, + 0xf8, 0xa5, 0x12, 0x58, 0x0f, 0x7a, 0xdb, 0xd4, + 0xb3, 0x18, 0x88, 0x10, 0xd6, 0x11, 0x06, 0x60, + 0x56, 0xe3, 0xf4, 0xf9, 0x58, 0xf2, 0xd6, 0xec, + 0x26, 0x90, 0x2e, 0x0b, 0x68, 0x41, 0x31, 0x57, + 0xb0, 0x98, 0x22, 0x20, 0x79, 0xc0, 0x13, 0x98, + 0x52, 0xe0, 0x96, 0x79, 0x7b, 0xe6, 0x31, 0xcf, + 0x02, 0xe9, 0xde, 0x4d, 0xa7, 0xd7, 0xc5, 0x29, + 0xf9, 0x70, 0x61, 0x28, 0x15, 0xc4, 0x06, 0x0a, + 0x9e, 0x2c, 0xc3, 0x3f, 0xe2, 0x66, 0x41, 0x94, + 0x5f, 0x98, 0x53, 0xac, 0x27, 0x89, 0xfa, 0x0e, + 0x0c, 0x3f, 0xb5, 0x0e, 0x1f, 0x05, 0x26, 0xb8, + 0x0d, 0x3e, 0x5d, 0x00, 0x3d, 0x57, 0x8d, 0xb0, + 0xfb, 0x88, 0x78, 0xac, 0xf3, 0xae, 0x24, 0xd2, + 0x09, 0x55, 0xc7, 0x15, 0x97, 0x17, 0xac, 0x1d, + 0x55, 0xbd, 0x8e, 0xfc, 0x46, 0x3b, 0x9e, 0x43, + 0xcc, 0x62, 0x48, 0xf7, 0xf5, 0xa9, 0x11, 0x5f +}; + +static const unsigned char dh_ss_q[] = { + 0xfe, 0x04, 0xbd, 0x98, 0x3c, 0x4f, 0x98, 0x54, + 0xcd, 0x2b, 0x4b, 0xcb, 0x79, 0x15, 0x35, 0xf5, + 0xe5, 0xfc, 0x1f, 0xb0, 0x2b, 0x5f, 0x9d, 0x1a, + 0xc7, 0x24, 0x63, 0xf6, 0x93, 0x50, 0xdd, 0x8d +}; + +static const unsigned char dh_ss_g[] = { + 0x3c, 0xaf, 0x82, 0x6a, 0xe6, 0xea, 0xdf, 0x77, + 0x23, 0xa5, 0x6e, 0x59, 0xb3, 0xbd, 0x5b, 0xd1, + 0xfb, 0x65, 0xd5, 0x94, 0xcb, 0x8e, 0xc2, 0xd0, + 0x22, 0x80, 0x33, 0x20, 0xc2, 0x86, 0xfa, 0x07, + 0x9e, 0xef, 0x66, 0x75, 0x96, 0x9d, 0x31, 0x76, + 0xcc, 0x55, 0xf3, 0x3b, 0x48, 0xc6, 0xe1, 0x2e, + 0x8e, 0xf7, 0xcd, 0x41, 0x72, 0x5c, 0x27, 0x79, + 0xfd, 0x75, 0xc2, 0xa5, 0x30, 0xcd, 0x33, 0x49, + 0x6a, 0x7f, 0x35, 0xc7, 0xf8, 0xa8, 0x8d, 0xe1, + 0x99, 0xae, 0xce, 0x36, 0x34, 0xdc, 0xd4, 0x90, + 0xe9, 0xaa, 0xf7, 0xdd, 0x2a, 0x66, 0x87, 0x17, + 0x63, 0x40, 0xeb, 0x2d, 0x7e, 0x37, 0xca, 0xd5, + 0xfa, 0x13, 0x31, 0x03, 0x13, 0x73, 0x5e, 0x51, + 0xa0, 0xdf, 0xeb, 0xdb, 0x87, 0x4f, 0xf9, 0x89, + 0x81, 0xff, 0x15, 0x6f, 0x9d, 0xfe, 0x8c, 0x56, + 0x6c, 0xb7, 0x2c, 0x3b, 0x08, 0x62, 0xc0, 0xe5, + 0x0e, 0xf8, 0xd7, 0xcb, 0x1a, 0x4a, 0xe8, 0xdd, + 0x5d, 0xea, 0xfd, 0xa1, 0xe8, 0x74, 0x7f, 0x65, + 0xb2, 0x9d, 0x7c, 0x34, 0x01, 0xbb, 0xd8, 0x5e, + 0x86, 0x13, 0x8a, 0x4c, 0x12, 0xf6, 0xa7, 0x42, + 0xa0, 0xaf, 0x5e, 0x16, 0x35, 0x0b, 0x32, 0x61, + 0x94, 0x1e, 0x41, 0xf3, 0xfd, 0x74, 0x6d, 0x36, + 0x59, 0xd6, 0x86, 0x41, 0xc2, 0x51, 0xe8, 0x54, + 0xd5, 0xed, 0xf1, 0xea, 0x5b, 0xaa, 0xe7, 0xe1, + 0x5f, 0x42, 0x37, 0x9f, 0xc7, 0x38, 0x95, 0xcc, + 0x59, 0x79, 0x8a, 0xbf, 0xf2, 0x56, 0xb6, 0x62, + 0x1c, 0x9b, 0x33, 0x26, 0x30, 0x34, 0xdf, 0x2e, + 0x55, 0x9a, 0x13, 0x63, 0x2e, 0xdb, 0x41, 0x6e, + 0x2c, 0x90, 0x71, 0xb4, 0xe1, 0x93, 0xce, 0x57, + 0x5c, 0x35, 0x53, 0x28, 0xd6, 0x2f, 0x8b, 0x48, + 0xcb, 0x46, 0xa8, 0x85, 0x9c, 0x1b, 0x56, 0x6d, + 0x0e, 0xb2, 0xae, 0xa1, 0x3e, 0x4e, 0x28, 0xfd +}; + +static const unsigned char dh_ss_priv[] = { + 0x62, 0x66, 0x25, 0x39, 0xb9, 0x7c, 0x43, 0xd3, + 0xaf, 0x13, 0xc3, 0xd8, 0xfd, 0x52, 0x7d, 0x0c, + 0x6a, 0x0d, 0x90, 0x80, 0xa8, 0x45, 0x13, 0x4a, + 0x81, 0xd3, 0xf0, 0x5d, 0xe7, 0xab, 0x47, 0x88 +}; + +static const unsigned char dh_ss_pub[] = { + 0x0e, 0xcb, 0x9b, 0x6d, 0x1f, 0x50, 0xf5, 0x9d, + 0xdc, 0x05, 0x44, 0x5c, 0xab, 0x99, 0x15, 0x55, + 0x3a, 0x4e, 0x5f, 0xf1, 0xc9, 0xf8, 0x6e, 0x28, + 0x21, 0x62, 0x48, 0xa2, 0x54, 0x17, 0xde, 0x5b, + 0x38, 0x1a, 0xe1, 0x06, 0xeb, 0x4b, 0xbf, 0xe9, + 0x8f, 0x10, 0x34, 0xe8, 0x33, 0x78, 0xe2, 0xef, + 0xdd, 0xc9, 0xc1, 0x4f, 0x2a, 0xbc, 0xb1, 0xeb, + 0x4e, 0xcb, 0xe4, 0x08, 0xa1, 0xda, 0x2f, 0xc0, + 0xf1, 0xc4, 0x87, 0x21, 0x80, 0x9a, 0x78, 0x92, + 0x66, 0xce, 0x22, 0x4e, 0xec, 0xd2, 0xd8, 0x43, + 0xe8, 0x52, 0xea, 0x37, 0x0d, 0x86, 0x95, 0x1c, + 0x3b, 0x74, 0xc1, 0x8a, 0x53, 0x34, 0x4f, 0x20, + 0x63, 0x66, 0x1d, 0xc2, 0x5b, 0xc6, 0x02, 0xe3, + 0xb9, 0xbf, 0x01, 0x11, 0xc1, 0x24, 0xa8, 0x15, + 0x8f, 0x3c, 0x85, 0x6a, 0x92, 0x80, 0x4c, 0xf4, + 0x96, 0x58, 0x59, 0x24, 0x82, 0x05, 0xa5, 0xea, + 0x64, 0x23, 0x03, 0xa6, 0xc2, 0x6f, 0xb5, 0x07, + 0x74, 0x50, 0x02, 0x35, 0x29, 0xc0, 0x2c, 0xa9, + 0x9d, 0x37, 0xa0, 0x86, 0x7c, 0x2e, 0xcc, 0x2a, + 0x2d, 0xa9, 0xd5, 0x6e, 0x97, 0x7f, 0xd8, 0xfd, + 0x42, 0x78, 0x59, 0x74, 0xf8, 0x08, 0x81, 0x9f, + 0x77, 0xb8, 0x6d, 0x10, 0x54, 0xd7, 0x1c, 0x1b, + 0xa1, 0xdf, 0x1c, 0x5c, 0x64, 0xbd, 0x14, 0x2f, + 0xe3, 0x3d, 0xaa, 0x17, 0x1e, 0x78, 0xb2, 0x3b, + 0x6d, 0x45, 0xfd, 0x73, 0x14, 0x3e, 0x68, 0x43, + 0x3a, 0x69, 0x70, 0xb3, 0x16, 0xbe, 0xb9, 0x7d, + 0x61, 0xe2, 0x6d, 0xcc, 0x1a, 0x2f, 0x91, 0x20, + 0x67, 0xbf, 0x82, 0x23, 0x51, 0xdd, 0x5f, 0xfd, + 0xa7, 0x05, 0xfd, 0xe2, 0xe8, 0x19, 0x43, 0xd1, + 0xe6, 0xfd, 0xce, 0x92, 0x41, 0x06, 0x64, 0xc3, + 0x82, 0x37, 0x81, 0x9a, 0x50, 0x78, 0xfb, 0x4d, + 0x43, 0xa3, 0xce, 0x9b, 0x8f, 0x3d, 0xcb, 0x73 +}; + +static const unsigned char dh_ss_peer_pub[] = { + 0x73, 0x3f, 0x1c, 0x4d, 0x73, 0x6f, 0x2d, 0x48, + 0x39, 0xee, 0x9b, 0x59, 0x76, 0x18, 0xec, 0x1b, + 0x1f, 0x08, 0x35, 0x71, 0xc6, 0x9a, 0xdc, 0x4f, + 0x55, 0x16, 0xeb, 0xe6, 0x34, 0x53, 0x8b, 0x1e, + 0xf8, 0xbd, 0x8d, 0x2f, 0x19, 0x3a, 0x8d, 0xad, + 0x9d, 0xc1, 0x07, 0x83, 0x34, 0x4e, 0x47, 0xc8, + 0x9c, 0x30, 0x42, 0xa0, 0x1c, 0x8d, 0x51, 0xff, + 0x17, 0x64, 0xbb, 0x73, 0x4f, 0x64, 0x93, 0xc8, + 0x7e, 0xcc, 0xfe, 0x2e, 0x85, 0xf9, 0xa3, 0x91, + 0x20, 0xdc, 0x93, 0x47, 0xdf, 0xae, 0x9a, 0x0a, + 0x8a, 0x6f, 0x69, 0xf1, 0x47, 0x9b, 0xc3, 0x3d, + 0x7b, 0xcf, 0x2f, 0xe7, 0xdf, 0x6c, 0xe9, 0xc8, + 0xb9, 0x6c, 0x6f, 0xfd, 0xfb, 0x0a, 0x02, 0x3a, + 0x4a, 0xff, 0xb7, 0xfd, 0x83, 0x20, 0xc9, 0x7d, + 0xdd, 0x7e, 0x72, 0xe3, 0xa5, 0x97, 0x21, 0xd2, + 0x85, 0xf8, 0x77, 0x52, 0xdb, 0xb9, 0x95, 0x0b, + 0x0d, 0x77, 0x38, 0x4e, 0xd9, 0x97, 0x5b, 0x4d, + 0x18, 0xc0, 0x4c, 0x4a, 0x3b, 0xd0, 0x83, 0x54, + 0xf6, 0x77, 0xce, 0xe5, 0x8f, 0x45, 0xb9, 0x13, + 0x53, 0x9a, 0x30, 0x99, 0x6c, 0x2e, 0xf5, 0x5a, + 0xd5, 0x59, 0x14, 0xb0, 0x1f, 0x1d, 0xae, 0xaa, + 0xa7, 0xab, 0x26, 0x0e, 0x87, 0x6b, 0x9b, 0x39, + 0xe0, 0xd7, 0xf2, 0x09, 0x58, 0xcd, 0xe2, 0x63, + 0xd8, 0x9c, 0x44, 0x24, 0x45, 0x97, 0x5e, 0xdd, + 0x86, 0x5c, 0x57, 0x30, 0x42, 0x3e, 0x66, 0x5b, + 0x41, 0xc3, 0xeb, 0x31, 0x7c, 0x46, 0x3f, 0x86, + 0xab, 0x13, 0x02, 0xff, 0x5e, 0x41, 0xea, 0x30, + 0xd8, 0x9a, 0x51, 0x1d, 0x9c, 0x24, 0x8a, 0x8a, + 0xb4, 0x46, 0x64, 0x4e, 0xe5, 0xd9, 0xbf, 0xa1, + 0x6f, 0x4e, 0x39, 0xd3, 0x7f, 0x1d, 0x27, 0xf0, + 0x9d, 0xa6, 0xd0, 0x60, 0xd4, 0xbe, 0x13, 0x1a, + 0x07, 0xcf, 0x6b, 0x48, 0xf9, 0xf3, 0xa0, 0xb7 +}; + +static const unsigned char dh_ss_secret[] = { + 0x25, 0x34, 0x4A, 0xF2, 0x34, 0x06, 0x1B, 0x3A, + 0x44, 0xB8, 0xE7, 0xBE, 0x19, 0x4B, 0x71, 0xA5, + 0x2D, 0xE2, 0xC7, 0xAF, 0x69, 0xD2, 0xC1, 0xE7, + 0x8B, 0xE3, 0x9C, 0x99, 0x1E, 0xDA, 0x53, 0xD4, + 0x26, 0xCA, 0xF8, 0xE3, 0x75, 0xDE, 0x4A, 0xC1, + 0x7A, 0x7D, 0xBF, 0x05, 0xB4, 0x8A, 0xE3, 0xD7, + 0x0A, 0x4A, 0x44, 0xCD, 0x8F, 0x9F, 0xC5, 0x4F, + 0x09, 0x8C, 0xB2, 0xBB, 0xAE, 0x4C, 0x8C, 0x48, + 0x34, 0x11, 0x60, 0xA8, 0x12, 0xB9, 0x0E, 0x78, + 0xBE, 0x29, 0xDA, 0xA3, 0x1B, 0xEC, 0xAF, 0x0F, + 0x1B, 0xF5, 0x26, 0xFD, 0xE0, 0x78, 0xC8, 0x5D, + 0x52, 0x9E, 0x81, 0x1C, 0x1D, 0xC7, 0xDE, 0x12, + 0x6A, 0x08, 0x17, 0xFE, 0x82, 0x72, 0x06, 0xCA, + 0x4A, 0x65, 0x92, 0x57, 0xC2, 0xEE, 0xAF, 0x51, + 0xFD, 0x03, 0xB8, 0x8B, 0x55, 0x4B, 0x3F, 0x27, + 0x90, 0x1F, 0x0E, 0x1B, 0x4F, 0xCC, 0x84, 0x70, + 0x13, 0xBF, 0x08, 0x3F, 0x63, 0xC4, 0x55, 0xFC, + 0x47, 0x7A, 0x5F, 0xA5, 0x2F, 0x37, 0xA8, 0x6D, + 0x3F, 0xAE, 0x58, 0x03, 0xBE, 0xF4, 0xD3, 0xAA, + 0x6D, 0xA4, 0x99, 0x5F, 0xB7, 0x08, 0x00, 0x22, + 0x94, 0x2B, 0xD5, 0x8B, 0x49, 0x41, 0x71, 0x04, + 0x81, 0x1E, 0x79, 0x34, 0x7D, 0xC7, 0x50, 0x1B, + 0x2F, 0x17, 0xB8, 0x71, 0x97, 0xA3, 0x90, 0xAA, + 0x26, 0xAF, 0x16, 0x49, 0x24, 0x85, 0xC2, 0x4D, + 0x04, 0x8C, 0xC1, 0x59, 0x97, 0xEF, 0xA7, 0x1D, + 0x4C, 0x69, 0x4D, 0x35, 0x8D, 0xB3, 0x3F, 0xBA, + 0xD9, 0x4F, 0xDA, 0xC9, 0xBE, 0x0A, 0x04, 0xB2, + 0xD8, 0x55, 0x22, 0x44, 0x10, 0xD6, 0x95, 0x79, + 0x20, 0xB0, 0x6B, 0xD4, 0xD0, 0x1D, 0xE0, 0x40, + 0x41, 0xB4, 0xE7, 0x82, 0xA8, 0xEA, 0x70, 0x3E, + 0xD8, 0x25, 0x7C, 0x24, 0xE4, 0x41, 0xF2, 0xB6, + 0x98, 0x4D, 0xEE, 0xC9, 0x01, 0x82, 0xE5, 0x43 +}; + +/* Element of order 3: g^((p-1)/3). Deriving with it reveals our private key + * modulo 3. */ +static const unsigned char dh_ss_small_pub[] = { + 0x77, 0x0a, 0x99, 0x74, 0x12, 0x63, 0xc4, 0x99, + 0xfa, 0xac, 0xed, 0x42, 0xe5, 0x5c, 0x53, 0x13, + 0x1e, 0x58, 0x20, 0x25, 0x81, 0xa2, 0x1c, 0x30, + 0xf9, 0x74, 0x12, 0x8a, 0x76, 0x0f, 0x02, 0x30, + 0xc8, 0xaf, 0xaf, 0x29, 0x35, 0x92, 0xcf, 0x3f, + 0x4f, 0xa5, 0x56, 0xc6, 0xc2, 0x8f, 0x48, 0x1a, + 0xf0, 0xeb, 0x43, 0x96, 0x09, 0xf7, 0xb4, 0xa3, + 0x5d, 0xef, 0x08, 0x60, 0x72, 0x77, 0xc6, 0x32, + 0x04, 0x12, 0x6a, 0xad, 0x09, 0x6b, 0xfd, 0x56, + 0x4e, 0xf8, 0xea, 0x7e, 0x5f, 0x20, 0x6c, 0xe8, + 0xb1, 0x10, 0xee, 0x89, 0x5a, 0xc4, 0xf0, 0x00, + 0x13, 0x30, 0x70, 0x05, 0x67, 0x35, 0x24, 0x8f, + 0xbb, 0xb9, 0xc1, 0x3d, 0x6e, 0xce, 0x27, 0x83, + 0x85, 0xa8, 0x91, 0x37, 0x5a, 0x4f, 0xf8, 0x3e, + 0xd9, 0xb2, 0xd1, 0xcd, 0x6f, 0xb8, 0x55, 0x21, + 0xe8, 0x49, 0xa4, 0x4a, 0x3a, 0x10, 0xc9, 0x65, + 0x67, 0xb9, 0x25, 0x78, 0x84, 0x69, 0x3e, 0xa3, + 0xec, 0xbd, 0xe8, 0xf8, 0xc8, 0xdb, 0xfc, 0xf3, + 0x9a, 0x9f, 0xa6, 0x4b, 0xba, 0xbb, 0x32, 0x92, + 0x54, 0x38, 0x0e, 0xa3, 0x78, 0x2c, 0x55, 0x49, + 0xc6, 0x82, 0x4d, 0x4f, 0x0d, 0xe0, 0xd3, 0x2c, + 0x75, 0x0c, 0xfe, 0x49, 0x52, 0x30, 0xf9, 0x8b, + 0x25, 0x31, 0x67, 0x91, 0x52, 0x0c, 0xa6, 0xdb, + 0x9b, 0x48, 0x29, 0xad, 0x2b, 0xf9, 0x5c, 0x72, + 0xbc, 0x5b, 0x8d, 0x47, 0x0a, 0x87, 0xea, 0xd0, + 0xe8, 0x89, 0xbd, 0x5d, 0xa3, 0x37, 0x6e, 0xdf, + 0xeb, 0x3a, 0xc0, 0xc4, 0x42, 0xd3, 0x69, 0x06, + 0xf6, 0xbc, 0xc7, 0xd1, 0x47, 0x96, 0x34, 0xd8, + 0x18, 0x2d, 0x28, 0xf2, 0x39, 0xed, 0xd7, 0xdd, + 0x82, 0x8e, 0x6a, 0x37, 0xd5, 0x8f, 0x63, 0x9e, + 0xc5, 0xb4, 0x1f, 0xe3, 0xc1, 0x97, 0xaf, 0xf6, + 0xe7, 0x27, 0x9b, 0x86, 0x98, 0xac, 0x42, 0xfc +}; + +/* Build a DHX key on the dh_ss group. A NULL priv gives a public only key. */ +static int test_dh_ss_key(EVP_PKEY **pkey, const unsigned char *pub, + size_t pubLen, const unsigned char *priv, size_t privLen, int withQ) +{ + int err = 0; + EVP_PKEY_CTX *ctx = NULL; + OSSL_PARAM_BLD *bld = NULL; + OSSL_PARAM *params = NULL; + BIGNUM *p = NULL; + BIGNUM *q = NULL; + BIGNUM *g = NULL; + BIGNUM *pubBn = NULL; + BIGNUM *privBn = NULL; + int selection; + + p = BN_bin2bn(dh_ss_p, (int)sizeof(dh_ss_p), NULL); + if (withQ) { + q = BN_bin2bn(dh_ss_q, (int)sizeof(dh_ss_q), NULL); + } + g = BN_bin2bn(dh_ss_g, (int)sizeof(dh_ss_g), NULL); + pubBn = BN_bin2bn(pub, (int)pubLen, NULL); + err = (p == NULL) || (g == NULL) || (pubBn == NULL) || + (withQ && (q == NULL)); + if ((err == 0) && (priv != NULL)) { + privBn = BN_bin2bn(priv, (int)privLen, NULL); + err = privBn == NULL; + } + if (err == 0) { + bld = OSSL_PARAM_BLD_new(); + err = bld == NULL; + } + if (err == 0) { + err = OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_FFC_P, p) != 1; + } + if ((err == 0) && withQ) { + err = OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_FFC_Q, q) != 1; + } + if (err == 0) { + err = OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_FFC_G, g) != 1; + } + if (err == 0) { + err = OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_PUB_KEY, pubBn) != 1; + } + if ((err == 0) && (privBn != NULL)) { + err = OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_PRIV_KEY, privBn) + != 1; + } + if (err == 0) { + params = OSSL_PARAM_BLD_to_param(bld); + err = params == NULL; + } + if (err == 0) { + ctx = EVP_PKEY_CTX_new_from_name(wpLibCtx, "DHX", NULL); + err = ctx == NULL; + } + if (err == 0) { + err = EVP_PKEY_fromdata_init(ctx) != 1; + } + if (err == 0) { + selection = (priv != NULL) ? EVP_PKEY_KEYPAIR : EVP_PKEY_PUBLIC_KEY; + err = EVP_PKEY_fromdata(ctx, pkey, selection, params) != 1; + } + + OSSL_PARAM_free(params); + OSSL_PARAM_BLD_free(bld); + BN_clear_free(privBn); + BN_free(pubBn); + BN_free(g); + BN_free(q); + BN_free(p); + EVP_PKEY_CTX_free(ctx); + return err; +} + +/* + * A peer public key confined to a small subgroup must not be used for key + * agreement. Without the y^q mod p test the range check alone accepts it and + * the resulting secret leaks our private key modulo the subgroup order. + */ +int test_dh_small_subgroup_peer(void *data) +{ + int err = 0; + EVP_PKEY *key = NULL; + EVP_PKEY *peer = NULL; + EVP_PKEY *small = NULL; + EVP_PKEY *plain = NULL; + EVP_PKEY *one = NULL; + EVP_PKEY *pMinusOne = NULL; + EVP_PKEY_CTX *ctx = NULL; + BIGNUM *p = NULL; + BIGNUM *oneBn = NULL; + BIGNUM *pMinusOneBn = NULL; + unsigned char secret[sizeof(dh_ss_p)]; + unsigned char onePub[sizeof(dh_ss_p)]; + unsigned char pMinusOnePub[sizeof(dh_ss_p)]; + size_t secretLen; + int rc; + + (void)data; + + PRINT_MSG("Testing DH derive rejects a small subgroup peer key"); + + err = test_dh_ss_key(&key, dh_ss_pub, sizeof(dh_ss_pub), dh_ss_priv, + sizeof(dh_ss_priv), 1); + if (err != 0) { + PRINT_ERR_MSG("failed to create DH key"); + } + if (err == 0) { + err = test_dh_ss_key(&peer, dh_ss_peer_pub, sizeof(dh_ss_peer_pub), + NULL, 0, 1); + if (err != 0) { + PRINT_ERR_MSG("failed to create DH peer key"); + } + } + if (err == 0) { + err = test_dh_ss_key(&small, dh_ss_small_pub, sizeof(dh_ss_small_pub), + NULL, 0, 1); + if (err != 0) { + PRINT_ERR_MSG("failed to create small subgroup key"); + } + } + + /* A peer key in the order q subgroup must still derive. */ + if (err == 0) { + ctx = EVP_PKEY_CTX_new_from_pkey(wpLibCtx, key, NULL); + err = ctx == NULL; + } + if (err == 0) { + err = EVP_PKEY_derive_init(ctx) != 1; + } + if (err == 0) { + err = EVP_PKEY_derive_set_peer(ctx, peer) != 1; + if (err != 0) { + PRINT_ERR_MSG("set_peer failed with a valid peer key"); + } + } + if (err == 0) { + secretLen = sizeof(secret); + err = EVP_PKEY_derive(ctx, secret, &secretLen) != 1; + if (err != 0) { + PRINT_ERR_MSG("derive failed with a valid peer key"); + } + else if ((secretLen != sizeof(dh_ss_secret)) || + (XMEMCMP(secret, dh_ss_secret, sizeof(dh_ss_secret)) != 0)) { + PRINT_BUFFER("derived secret", secret, secretLen); + PRINT_ERR_MSG("derive returned the wrong shared secret"); + err = 1; + } + } + EVP_PKEY_CTX_free(ctx); + ctx = NULL; + + if (err == 0) { + ctx = EVP_PKEY_CTX_new_from_pkey(wpLibCtx, key, NULL); + err = ctx == NULL; + } + if (err == 0) { + err = EVP_PKEY_derive_init(ctx) != 1; + } + if (err == 0) { + rc = EVP_PKEY_derive_set_peer(ctx, small); + if (rc == 1) { + secretLen = sizeof(secret); + if (EVP_PKEY_derive(ctx, secret, &secretLen) == 1) { + PRINT_ERR_MSG("derive accepted a small subgroup peer key"); + err = 1; + } + } + } + + /* Exercise the q-less path with the two DH boundary values. */ + if (err == 0) { + p = BN_bin2bn(dh_ss_p, (int)sizeof(dh_ss_p), NULL); + oneBn = BN_new(); + pMinusOneBn = BN_dup(p); + err = (p == NULL) || (oneBn == NULL) || (pMinusOneBn == NULL) || + (BN_one(oneBn) != 1) || (BN_sub_word(pMinusOneBn, 1) != 1) || + (BN_bn2binpad(oneBn, onePub, sizeof(onePub)) != + (int)sizeof(onePub)) || + (BN_bn2binpad(pMinusOneBn, pMinusOnePub, sizeof(pMinusOnePub)) != + (int)sizeof(pMinusOnePub)); + } + if (err == 0) { + err = test_dh_ss_key(&plain, dh_ss_pub, sizeof(dh_ss_pub), + dh_ss_priv, sizeof(dh_ss_priv), 0); + if (err != 0) { + PRINT_ERR_MSG("failed to create q-less DH key"); + } + } + if (err == 0) { + err = test_dh_ss_key(&one, onePub, sizeof(onePub), NULL, 0, 0); + if (err != 0) { + PRINT_ERR_MSG("failed to create q-less DH peer key 1"); + } + } + if (err == 0) { + err = test_dh_ss_key(&pMinusOne, pMinusOnePub, + sizeof(pMinusOnePub), NULL, 0, 0); + if (err != 0) { + PRINT_ERR_MSG("failed to create q-less DH peer key p-1"); + } + } + if (err == 0) { + EVP_PKEY_CTX_free(ctx); + ctx = EVP_PKEY_CTX_new_from_pkey(wpLibCtx, plain, NULL); + err = ctx == NULL; + } + if (err == 0) { + err = EVP_PKEY_derive_init(ctx) != 1; + } + if (err == 0) { + rc = EVP_PKEY_derive_set_peer_ex(ctx, one, 0); + err = rc != 1; + } + if (err == 0) { + secretLen = sizeof(secret); + if (EVP_PKEY_derive(ctx, secret, &secretLen) == 1) { + PRINT_ERR_MSG("q-less DH accepted peer public key 1"); + err = 1; + } + } + if (err == 0) { + EVP_PKEY_CTX_free(ctx); + ctx = EVP_PKEY_CTX_new_from_pkey(wpLibCtx, plain, NULL); + err = ctx == NULL; + } + if (err == 0) { + err = EVP_PKEY_derive_init(ctx) != 1; + } + if (err == 0) { + rc = EVP_PKEY_derive_set_peer_ex(ctx, pMinusOne, 0); + err = rc != 1; + } + if (err == 0) { + secretLen = sizeof(secret); + if (EVP_PKEY_derive(ctx, secret, &secretLen) == 1) { + PRINT_ERR_MSG("q-less DH accepted peer public key p-1"); + err = 1; + } + } + + EVP_PKEY_CTX_free(ctx); + EVP_PKEY_free(small); + EVP_PKEY_free(pMinusOne); + EVP_PKEY_free(one); + EVP_PKEY_free(plain); + EVP_PKEY_free(peer); + EVP_PKEY_free(key); + BN_free(pMinusOneBn); + BN_free(oneBn); + BN_free(p); + return err; +} + #endif /* WP_HAVE_DH */ diff --git a/test/unit.c b/test/unit.c index 24692402..75acbbeb 100644 --- a/test/unit.c +++ b/test/unit.c @@ -343,6 +343,7 @@ TEST_CASE test_case[] = { TEST_DECL(test_dh_param_check_explicit, NULL), TEST_DECL(test_dh_import_group_no_nul, NULL), TEST_DECL(test_dh_pgen_min_bits, NULL), + TEST_DECL(test_dh_small_subgroup_peer, NULL), #ifndef WOLFPROV_QUICKTEST TEST_DECL(test_dh_get_params, NULL), #endif diff --git a/test/unit.h b/test/unit.h index e7829d29..c794097a 100644 --- a/test/unit.h +++ b/test/unit.h @@ -382,6 +382,7 @@ int test_dh_fromdata_oversize(void *data); int test_dh_param_check_explicit(void *data); int test_dh_import_group_no_nul(void *data); int test_dh_pgen_min_bits(void *data); +int test_dh_small_subgroup_peer(void *data); #endif /* WP_HAVE_DH */ #ifdef WP_HAVE_ECC