jeltz
/
hostap
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

TLS testing: Add new test cases for RSA-DHE primes 

test-tls-4: Short 511-bit RSA-DHE prime
test-tls-5: Short 767-bit RSA-DHE prime
test-tls-6: Bogus RSA-DHE "prime" 15
test-tls-7: Very short 58-bit RSA-DHE prime in a long container
test-tls-8: Non-prime as RSA-DHE prime

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2014-03-16 12:28:49 +02:00
parent f5bbb2f284
commit 47bd94a09f
6 changed files with 184 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/crypto/tls.h
View File

@ -544,6 +544,11 @@ void tls_connection_set_log_cb(struct tls_connection *conn,
#define TLS_BREAK_VERIFY_DATA BIT(0)
#define TLS_BREAK_SRV_KEY_X_HASH BIT(1)
#define TLS_BREAK_SRV_KEY_X_SIGNATURE BIT(2)
#define TLS_DHE_PRIME_511B BIT(3)
#define TLS_DHE_PRIME_767B BIT(4)
#define TLS_DHE_PRIME_15 BIT(5)
#define TLS_DHE_PRIME_58B BIT(6)
#define TLS_DHE_NON_PRIME BIT(7)
void tls_connection_set_test_flags(struct tls_connection *conn, u32 flags);

20
src/radius/radius_server.c
View File

@ -554,6 +554,26 @@ static void radius_server_testing_options_tls(struct radius_session *sess,
srv_log(sess, "TLS test - break ServerKeyExchange ServerParams Signature");
eap_conf->tls_test_flags = TLS_BREAK_SRV_KEY_X_SIGNATURE;
break;
case 4:
srv_log(sess, "TLS test - RSA-DHE using a short 511-bit prime");
eap_conf->tls_test_flags = TLS_DHE_PRIME_511B;
break;
case 5:
srv_log(sess, "TLS test - RSA-DHE using a short 767-bit prime");
eap_conf->tls_test_flags = TLS_DHE_PRIME_767B;
break;
case 6:
srv_log(sess, "TLS test - RSA-DHE using a bogus 15 \"prime\"");
eap_conf->tls_test_flags = TLS_DHE_PRIME_15;
break;
case 7:
srv_log(sess, "TLS test - RSA-DHE using a short 58-bit prime in long container");
eap_conf->tls_test_flags = TLS_DHE_PRIME_58B;
break;
case 8:
srv_log(sess, "TLS test - RSA-DHE using a non-prime");
eap_conf->tls_test_flags = TLS_DHE_NON_PRIME;
break;
default:
srv_log(sess, "Unrecognized TLS test");
break;

106
src/tls/tlsv1_server.c
View File

@ -673,4 +673,110 @@ void tlsv1_server_set_test_flags(struct tlsv1_server *conn, u32 flags)
{
conn->test_flags = flags;
}
static const u8 test_tls_prime15[1] = {
15
};
static const u8 test_tls_prime511b[64] = {
0x50, 0xfb, 0xf1, 0xae, 0x01, 0xf1, 0xfe, 0xe6,
0xe1, 0xae, 0xdc, 0x1e, 0xbe, 0xfb, 0x9e, 0x58,
0x9a, 0xd7, 0x54, 0x9d, 0x6b, 0xb3, 0x78, 0xe2,
0x39, 0x7f, 0x30, 0x01, 0x25, 0xa1, 0xf9, 0x7c,
0x55, 0x0e, 0xa1, 0x15, 0xcc, 0x36, 0x34, 0xbb,
0x6c, 0x8b, 0x64, 0x45, 0x15, 0x7f, 0xd3, 0xe7,
0x31, 0xc8, 0x8e, 0x56, 0x8e, 0x95, 0xdc, 0xea,
0x9e, 0xdf, 0xf7, 0x56, 0xdd, 0xb0, 0x34, 0xdb
};
static const u8 test_tls_prime767b[96] = {
0x4c, 0xdc, 0xb8, 0x21, 0x20, 0x9d, 0xe8, 0xa3,
0x53, 0xd9, 0x1c, 0x18, 0xc1, 0x3a, 0x58, 0x67,
0xa7, 0x85, 0xf9, 0x28, 0x9b, 0xce, 0xc0, 0xd1,
0x05, 0x84, 0x61, 0x97, 0xb2, 0x86, 0x1c, 0xd0,
0xd1, 0x96, 0x23, 0x29, 0x8c, 0xc5, 0x30, 0x68,
0x3e, 0xf9, 0x05, 0xba, 0x60, 0xeb, 0xdb, 0xee,
0x2d, 0xdf, 0x84, 0x65, 0x49, 0x87, 0x90, 0x2a,
0xc9, 0x8e, 0x34, 0x63, 0x6d, 0x9a, 0x2d, 0x32,
0x1c, 0x46, 0xd5, 0x4e, 0x20, 0x20, 0x90, 0xac,
0xd5, 0x48, 0x79, 0x99, 0x0c, 0xe6, 0xed, 0xbf,
0x79, 0xc2, 0x47, 0x50, 0x95, 0x38, 0x38, 0xbc,
0xde, 0xb0, 0xd2, 0xe8, 0x97, 0xcb, 0x22, 0xbb
};
static const u8 test_tls_prime58[128] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x03, 0xc1, 0xba, 0xc8, 0x25, 0xbe, 0x2d, 0xf3
};
static const u8 test_tls_non_prime[] = {
/*
* This is not a prime and the value has the following factors:
* 13736783488716579923 * 16254860191773456563 * 18229434976173670763 *
* 11112313018289079419 * 10260802278580253339 * 12394009491575311499 *
* 12419059668711064739 * 14317973192687985827 * 10498605410533203179 *
* 16338688760390249003 * 11128963991123878883 * 12990532258280301419 *
* 3
*/
0x0C, 0x8C, 0x36, 0x9C, 0x6F, 0x71, 0x2E, 0xA7,
0xAB, 0x32, 0xD3, 0x0F, 0x68, 0x3D, 0xB2, 0x6D,
0x81, 0xDD, 0xC4, 0x84, 0x0D, 0x9C, 0x6E, 0x36,
0x29, 0x70, 0xF3, 0x1E, 0x9A, 0x42, 0x0B, 0x67,
0x82, 0x6B, 0xB1, 0xF2, 0xAF, 0x55, 0x28, 0xE7,
0xDB, 0x67, 0x6C, 0xF7, 0x6B, 0xAC, 0xAC, 0xE5,
0xF7, 0x9F, 0xD4, 0x63, 0x55, 0x70, 0x32, 0x7C,
0x70, 0xFB, 0xAF, 0xB8, 0xEB, 0x37, 0xCF, 0x3F,
0xFE, 0x94, 0x73, 0xF9, 0x7A, 0xC7, 0x12, 0x2E,
0x9B, 0xB4, 0x7D, 0x08, 0x60, 0x83, 0x43, 0x52,
0x83, 0x1E, 0xA5, 0xFC, 0xFA, 0x87, 0x12, 0xF4,
0x64, 0xE2, 0xCE, 0x71, 0x17, 0x72, 0xB6, 0xAB
};
#endif /* CONFIG_TESTING_OPTIONS */
void tlsv1_server_get_dh_p(struct tlsv1_server *conn, const u8 **dh_p,
size_t *dh_p_len)
{
*dh_p = conn->cred->dh_p;
*dh_p_len = conn->cred->dh_p_len;
#ifdef CONFIG_TESTING_OPTIONS
if (conn->test_flags & TLS_DHE_PRIME_511B) {
tlsv1_server_log(conn, "TESTING: Use short 511-bit prime with DHE");
*dh_p = test_tls_prime511b;
*dh_p_len = sizeof(test_tls_prime511b);
} else if (conn->test_flags & TLS_DHE_PRIME_767B) {
tlsv1_server_log(conn, "TESTING: Use short 767-bit prime with DHE");
*dh_p = test_tls_prime767b;
*dh_p_len = sizeof(test_tls_prime767b);
} else if (conn->test_flags & TLS_DHE_PRIME_15) {
tlsv1_server_log(conn, "TESTING: Use bogus 15 \"prime\" with DHE");
*dh_p = test_tls_prime15;
*dh_p_len = sizeof(test_tls_prime15);
} else if (conn->test_flags & TLS_DHE_PRIME_58B) {
tlsv1_server_log(conn, "TESTING: Use short 58-bit prime in long container with DHE");
*dh_p = test_tls_prime58;
*dh_p_len = sizeof(test_tls_prime58);
} else if (conn->test_flags & TLS_DHE_NON_PRIME) {
tlsv1_server_log(conn, "TESTING: Use claim non-prime as the DHE prime");
*dh_p = test_tls_non_prime;
*dh_p_len = sizeof(test_tls_non_prime);
}
#endif /* CONFIG_TESTING_OPTIONS */
}

2
src/tls/tlsv1_server_i.h
View File

@ -78,5 +78,7 @@ u8 * tlsv1_server_send_alert(struct tlsv1_server *conn, u8 level,
u8 description, size_t *out_len);
int tlsv1_server_process_handshake(struct tlsv1_server *conn, u8 ct,
const u8 *buf, size_t *len);
void tlsv1_server_get_dh_p(struct tlsv1_server *conn, const u8 **dh_p,
size_t *dh_p_len);
#endif /* TLSV1_SERVER_I_H */

43
src/tls/tlsv1_server_read.c
View File

@ -31,7 +31,9 @@ static int testing_cipher_suite_filter(struct tlsv1_server *conn, u16 suite)
{
#ifdef CONFIG_TESTING_OPTIONS
if ((conn->test_flags &
(TLS_BREAK_SRV_KEY_X_HASH | TLS_BREAK_SRV_KEY_X_SIGNATURE)) &&
(TLS_BREAK_SRV_KEY_X_HASH | TLS_BREAK_SRV_KEY_X_SIGNATURE |
TLS_DHE_PRIME_511B | TLS_DHE_PRIME_767B | TLS_DHE_PRIME_15 |
TLS_DHE_PRIME_58B | TLS_DHE_NON_PRIME)) &&
suite != TLS_DHE_RSA_WITH_AES_256_CBC_SHA256 &&
suite != TLS_DHE_RSA_WITH_AES_256_CBC_SHA &&
suite != TLS_DHE_RSA_WITH_AES_128_CBC_SHA256 &&
@ -590,6 +592,8 @@ static int tls_process_client_key_exchange_dh(
u8 *shared;
size_t shared_len;
int res;
const u8 *dh_p;
size_t dh_p_len;
/*
* struct {
@ -641,7 +645,9 @@ static int tls_process_client_key_exchange_dh(
return -1;
}
shared_len = conn->cred->dh_p_len;
tlsv1_server_get_dh_p(conn, &dh_p, &dh_p_len);
shared_len = dh_p_len;
shared = os_malloc(shared_len);
if (shared == NULL) {
wpa_printf(MSG_DEBUG, "TLSv1: Could not allocate memory for "
@ -653,8 +659,7 @@ static int tls_process_client_key_exchange_dh(
/* shared = Yc^secret mod p */
if (crypto_mod_exp(dh_yc, dh_yc_len, conn->dh_secret,
conn->dh_secret_len,
conn->cred->dh_p, conn->cred->dh_p_len,
conn->dh_secret_len, dh_p, dh_p_len,
shared, &shared_len)) {
os_free(shared);
tlsv1_server_alert(conn, TLS_ALERT_LEVEL_FATAL,
@ -994,6 +999,36 @@ static int tls_process_client_finished(struct tlsv1_server *conn, u8 ct,
tlsv1_server_log(conn, "TEST-FAILURE: Client Finished received after invalid ServerKeyExchange");
conn->test_failure_reported = 1;
}
if ((conn->test_flags & TLS_DHE_PRIME_15) &&
!conn->test_failure_reported) {
tlsv1_server_log(conn, "TEST-FAILURE: Client Finished received after bogus DHE \"prime\" 15");
conn->test_failure_reported = 1;
}
if ((conn->test_flags & TLS_DHE_PRIME_58B) &&
!conn->test_failure_reported) {
tlsv1_server_log(conn, "TEST-FAILURE: Client Finished received after short 58-bit DHE prime in long container");
conn->test_failure_reported = 1;
}
if ((conn->test_flags & TLS_DHE_PRIME_511B) &&
!conn->test_failure_reported) {
tlsv1_server_log(conn, "TEST-WARNING: Client Finished received after short 511-bit DHE prime (insecure)");
conn->test_failure_reported = 1;
}
if ((conn->test_flags & TLS_DHE_PRIME_767B) &&
!conn->test_failure_reported) {
tlsv1_server_log(conn, "TEST-NOTE: Client Finished received after 767-bit DHE prime (relatively insecure)");
conn->test_failure_reported = 1;
}
if ((conn->test_flags & TLS_DHE_NON_PRIME) &&
!conn->test_failure_reported) {
tlsv1_server_log(conn, "TEST-NOTE: Client Finished received after non-prime claimed as DHE prime");
conn->test_failure_reported = 1;
}
#endif /* CONFIG_TESTING_OPTIONS */
if (ct != TLS_CONTENT_TYPE_HANDSHAKE) {

22
src/tls/tlsv1_server_write.c
View File

@ -248,6 +248,8 @@ static int tls_write_server_key_exchange(struct tlsv1_server *conn,
size_t rlen;
u8 *dh_ys;
size_t dh_ys_len;
const u8 *dh_p;
size_t dh_p_len;
suite = tls_get_cipher_suite(conn->rl.cipher_suite);
if (suite == NULL)
@ -273,8 +275,10 @@ static int tls_write_server_key_exchange(struct tlsv1_server *conn,
return -1;
}
tlsv1_server_get_dh_p(conn, &dh_p, &dh_p_len);
os_free(conn->dh_secret);
conn->dh_secret_len = conn->cred->dh_p_len;
conn->dh_secret_len = dh_p_len;
conn->dh_secret = os_malloc(conn->dh_secret_len);
if (conn->dh_secret == NULL) {
wpa_printf(MSG_DEBUG, "TLSv1: Failed to allocate "
@ -293,8 +297,7 @@ static int tls_write_server_key_exchange(struct tlsv1_server *conn,
return -1;
}
if (os_memcmp(conn->dh_secret, conn->cred->dh_p, conn->dh_secret_len) >
0)
if (os_memcmp(conn->dh_secret, dh_p, conn->dh_secret_len) > 0)
conn->dh_secret[0] = 0; /* make sure secret < p */
pos = conn->dh_secret;
@ -309,7 +312,7 @@ static int tls_write_server_key_exchange(struct tlsv1_server *conn,
conn->dh_secret, conn->dh_secret_len);
/* Ys = g^secret mod p */
dh_ys_len = conn->cred->dh_p_len;
dh_ys_len = dh_p_len;
dh_ys = os_malloc(dh_ys_len);
if (dh_ys == NULL) {
wpa_printf(MSG_DEBUG, "TLSv1: Failed to allocate memory for "
@ -320,8 +323,7 @@ static int tls_write_server_key_exchange(struct tlsv1_server *conn,
}
if (crypto_mod_exp(conn->cred->dh_g, conn->cred->dh_g_len,
conn->dh_secret, conn->dh_secret_len,
conn->cred->dh_p, conn->cred->dh_p_len,
dh_ys, &dh_ys_len)) {
dh_p, dh_p_len, dh_ys, &dh_ys_len)) {
tlsv1_server_alert(conn, TLS_ALERT_LEVEL_FATAL,
TLS_ALERT_INTERNAL_ERROR);
os_free(dh_ys);
@ -369,7 +371,7 @@ static int tls_write_server_key_exchange(struct tlsv1_server *conn,
/* body - ServerDHParams */
server_params = pos;
/* dh_p */
if (pos + 2 + conn->cred->dh_p_len > end) {
if (pos + 2 + dh_p_len > end) {
wpa_printf(MSG_DEBUG, "TLSv1: Not enough buffer space for "
"dh_p");
tlsv1_server_alert(conn, TLS_ALERT_LEVEL_FATAL,
@ -377,10 +379,10 @@ static int tls_write_server_key_exchange(struct tlsv1_server *conn,
os_free(dh_ys);
return -1;
}
WPA_PUT_BE16(pos, conn->cred->dh_p_len);
WPA_PUT_BE16(pos, dh_p_len);
pos += 2;
os_memcpy(pos, conn->cred->dh_p, conn->cred->dh_p_len);
pos += conn->cred->dh_p_len;
os_memcpy(pos, dh_p, dh_p_len);
pos += dh_p_len;
/* dh_g */
if (pos + 2 + conn->cred->dh_g_len > end) {