Commit 61d31a3c authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

polarssl: havege_rand is not present in version 1.1.0 

... it is now named havege_random!

Reported by: Robert Schumann
Bug: http://curl.haxx.se/mail/lib-2012-01/0178.html
parent 4b9af77d

lib/polarssl.c

+10 −1
Original line number Original line Diff line number Diff line
@@ -65,6 +65,15 @@ 
/* The last #include file should be: */

/* The last #include file should be: */

#include "memdebug.h"

#include "memdebug.h"





/* version dependent differences */

#if POLARSSL_VERSION_NUMBER < 0x01010000

/* the old way */

#define HAVEGE_RANDOM havege_rand

#else

/* from 1.1.0 */

#define HAVEGE_RANDOM havege_random

#endif



/* Define this to enable lots of debugging for PolarSSL */

/* Define this to enable lots of debugging for PolarSSL */

#undef POLARSSL_DEBUG

#undef POLARSSL_DEBUG
@@ -189,7 +198,7 @@ Curl_polarssl_connect(struct connectdata *conn, 
  ssl_set_endpoint(&conn->ssl[sockindex].ssl, SSL_IS_CLIENT);

  ssl_set_endpoint(&conn->ssl[sockindex].ssl, SSL_IS_CLIENT);

  ssl_set_authmode(&conn->ssl[sockindex].ssl, SSL_VERIFY_OPTIONAL);

  ssl_set_authmode(&conn->ssl[sockindex].ssl, SSL_VERIFY_OPTIONAL);





  ssl_set_rng(&conn->ssl[sockindex].ssl, havege_rand,

  ssl_set_rng(&conn->ssl[sockindex].ssl, HAVEGE_RANDOM,

              &conn->ssl[sockindex].hs);

              &conn->ssl[sockindex].hs);

  ssl_set_bio(&conn->ssl[sockindex].ssl,

  ssl_set_bio(&conn->ssl[sockindex].ssl,

              net_recv, &conn->sock[sockindex],

              net_recv, &conn->sock[sockindex],