commit 8df68632e838539730556f13ee8e06121fe986e5
author Manuel Pégourié-Gonnard <mpg@elzevir.fr> Mon Jun 23 17:56:08 2014 +0200
committer Paul Bakker <p.j.bakker@polarssl.org> Wed Jun 25 11:26:14 2014 +0200
tree f5b5202f095018750d343cbf761f1badf8a47634
parent 5c1f0326531102ec20f936408cc12233bf61ee32

Fix bug in DHE-PSK PMS computation

library/ssl_tls.c

diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index b081284..3de7f7c 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -913,14 +913,16 @@
         if( end - p < 2 + (int) len )
             return( POLARSSL_ERR_SSL_BAD_INPUT_DATA );
 
-        *(p++) = (unsigned char)( len >> 8 );
-        *(p++) = (unsigned char)( len );
+        /* Write length only when we know the actual value */
         if( ( ret = dhm_calc_secret( &ssl->handshake->dhm_ctx,
-                                      p, &len, ssl->f_rng, ssl->p_rng ) ) != 0 )
+                                      p + 2, &len,
+                                      ssl->f_rng, ssl->p_rng ) ) != 0 )
         {
             SSL_DEBUG_RET( 1, "dhm_calc_secret", ret );
             return( ret );
         }
+        *(p++) = (unsigned char)( len >> 8 );
+        *(p++) = (unsigned char)( len );
         p += len;
 
         SSL_DEBUG_MPI( 3, "DHM: K ", &ssl->handshake->dhm_ctx.K  );