yuzu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2025-05-09 19:22:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Up min size of DHM params to 1024 bits on client

Browse source
This commit is contained in:
Manuel Pégourié-Gonnard 2015-06-29 15:27:52 +02:00
parent 6c3ccf5fd0
commit 9ea1b23cc4
4 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -2,9 +2,17 @@ mbed TLS ChangeLog (Sorted per branch, date)
= mbed TLS 1.3.12 released 2015-07-?? = mbed TLS 1.3.12 released 2015-07-??
Security
* Increase the minimum size of Diffie-Hellman parameters accepted by the
client to 1024 bits, to protect against Logjam attack.
Bugfix Bugfix
* Fix thread-safety issue in SSL debug module (found by Edwin van Vliet). * Fix thread-safety issue in SSL debug module (found by Edwin van Vliet).
Changes
* Add SSL_MIN_DHM_BYTES configuration parameter in config.h to choose the
minimum size of Diffie-Hellman parameters accepted by the client.
= mbed TLS 1.3.11 released 2015-06-04 = mbed TLS 1.3.11 released 2015-06-04
Security Security

1
include/polarssl/config.h
View file

@ -2328,6 +2328,7 @@
/* SSL options */ /* SSL options */
//#define SSL_MAX_CONTENT_LEN 16384 /**< Size of the input / output buffer */ //#define SSL_MAX_CONTENT_LEN 16384 /**< Size of the input / output buffer */
//#define SSL_MIN_DHM_BYTES 128 /**< Min size of the Diffie-Hellman prime */
//#define SSL_DEFAULT_TICKET_LIFETIME 86400 /**< Lifetime of session tickets (if enabled) */ //#define SSL_DEFAULT_TICKET_LIFETIME 86400 /**< Lifetime of session tickets (if enabled) */
//#define POLARSSL_PSK_MAX_LEN 32 /**< Max size of TLS pre-shared keys, in bytes (default 256 bits) */ //#define POLARSSL_PSK_MAX_LEN 32 /**< Max size of TLS pre-shared keys, in bytes (default 256 bits) */

6
include/polarssl/ssl.h
View file

@ -282,6 +282,12 @@
#define SSL_MAX_CONTENT_LEN 16384 /**< Size of the input / output buffer */ #define SSL_MAX_CONTENT_LEN 16384 /**< Size of the input / output buffer */
#endif #endif
/*
* Minimum size of the Diffie-Hellman parameters to accept from a server.
* The default is 1024 bits (128 bytes) for compatibility reasons.
* From a purely security perspective, 2048 bits would be better.
*/
#define SSL_MIN_DHM_BYTES 128 /**< Min size of the Diffie-Hellman prime */
/* \} name SECTION: Module settings */ /* \} name SECTION: Module settings */
/* /*

2
library/ssl_cli.c
View file

@ -1445,7 +1445,7 @@ static int ssl_parse_server_dh_params( ssl_context *ssl, unsigned char **p,
return( ret ); return( ret );
} }
if( ssl->handshake->dhm_ctx.len < 64 || if( ssl->handshake->dhm_ctx.len < SSL_MIN_DHM_BYTES ||
ssl->handshake->dhm_ctx.len > 512 ) ssl->handshake->dhm_ctx.len > 512 )
{ {
SSL_DEBUG_MSG( 1, ( "bad server key exchange message (DHM length)" ) ); SSL_DEBUG_MSG( 1, ( "bad server key exchange message (DHM length)" ) );