feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Fixes from review

Browse Source
This commit is contained in:
Sean Parkinson
2017-05-22 09:09:31 +10:00
parent 5ef977aa3d
commit 8920cd89e4
2 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
examples/client/client.c
View File

@@ -628,10 +628,10 @@ static void Usage(void)
#ifdef HAVE_ECC #ifdef HAVE_ECC
printf("-Y Key Share with ECC named groups only\n"); printf("-Y Key Share with ECC named groups only\n");
#endif #endif
#endif /* WOLFSSL_TLS13 */
#ifdef HAVE_CURVE25519 #ifdef HAVE_CURVE25519
printf("-t Use X25519 for key exchange\n"); printf("-t Use X25519 for key exchange\n");
#endif #endif
#endif /* WOLFSSL_TLS13 */
} }
THREAD_RETURN WOLFSSL_THREAD client_test(void* args) THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
@@ -1458,6 +1458,18 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
err_sys("DisableExtendedMasterSecret failed"); err_sys("DisableExtendedMasterSecret failed");
} }
#endif #endif
#ifdef HAVE_CURVE25519
if (useX25519) {
if (wolfSSL_CTX_UseSupportedCurve(ctx, WOLFSSL_ECC_X25519)
!= SSL_SUCCESS) {
err_sys("unable to support X25519");
}
if (wolfSSL_CTX_UseSupportedCurve(ctx, WOLFSSL_ECC_SECP256R1)
!= SSL_SUCCESS) {
err_sys("unable to support secp256r1");
}
}
#endif
if (benchmark) { if (benchmark) {
((func_args*)args)->return_code = ((func_args*)args)->return_code =
@@ -1505,11 +1517,6 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
wolfSSL_KeepArrays(ssl); wolfSSL_KeepArrays(ssl);
#endif #endif
#ifdef HAVE_CURVE25519
if (useX25519)
wolfSSL_UseSupportedCurve(ssl, WOLFSSL_ECC_X25519);
#endif
#ifdef WOLFSSL_TLS13 #ifdef WOLFSSL_TLS13
if (!helloRetry) { if (!helloRetry) {
if (onlyKeyShare == 0 || onlyKeyShare == 2) { if (onlyKeyShare == 0 || onlyKeyShare == 2) {
@@ -1943,11 +1950,6 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
(void*)"resumed session"); (void*)"resumed session");
#endif #endif
#ifdef HAVE_CURVE25519
if (useX25519)
wolfSSL_UseSupportedCurve(sslResume, WOLFSSL_ECC_X25519);
#endif
#ifdef WOLFSSL_TLS13 #ifdef WOLFSSL_TLS13
if (useX25519) { if (useX25519) {
if (wolfSSL_UseKeyShare(ssl, WOLFSSL_ECC_X25519) != SSL_SUCCESS) { if (wolfSSL_UseKeyShare(ssl, WOLFSSL_ECC_X25519) != SSL_SUCCESS) {

1
src/ssl.c
View File

@@ -1642,6 +1642,7 @@ int wolfSSL_CTX_UseSupportedCurve(WOLFSSL_CTX* ctx, word16 name)
case WOLFSSL_ECC_BRAINPOOLP256R1: case WOLFSSL_ECC_BRAINPOOLP256R1:
case WOLFSSL_ECC_BRAINPOOLP384R1: case WOLFSSL_ECC_BRAINPOOLP384R1:
case WOLFSSL_ECC_BRAINPOOLP512R1: case WOLFSSL_ECC_BRAINPOOLP512R1:
case WOLFSSL_ECC_X25519:
break; break;
#ifdef WOLFSSL_TLS13 #ifdef WOLFSSL_TLS13