changeset 1002:e9ff3107b885

Fix windows build of force-ciphersuites patch
author Andre Heinecke <andre.heinecke@intevation.de>
date Tue, 02 Sep 2014 10:46:13 +0200
parents 0b7bb4f68f5a
children db7e7156c824
files patches/0003-Add-possibility-to-force-polarssl-ciphersuites.patch
diffstat 1 files changed, 16 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/patches/0003-Add-possibility-to-force-polarssl-ciphersuites.patch	Tue Sep 02 10:43:51 2014 +0200
+++ b/patches/0003-Add-possibility-to-force-polarssl-ciphersuites.patch	Tue Sep 02 10:46:13 2014 +0200
@@ -1,17 +1,25 @@
-From 7b70a13b983979ccf7a672c0065c232cd7dc0c37 Mon Sep 17 00:00:00 2001
+From a36ec2b65e81109c151759b282c221daf91b83ee Mon Sep 17 00:00:00 2001
 From: Andre Heinecke <aheinecke@intevation.de>
-Date: Tue, 2 Sep 2014 09:48:01 +0200
+Date: Tue, 2 Sep 2014 09:58:44 +0200
 Subject: [PATCH] Add possibility to force polarssl ciphersuites.
 
 ---
- lib/vtls/polarssl.c | 40 ++++++++++++++++++++++++++++++++++++++--
- 1 file changed, 38 insertions(+), 2 deletions(-)
+ lib/vtls/polarssl.c | 41 +++++++++++++++++++++++++++++++++++++++--
+ 1 file changed, 39 insertions(+), 2 deletions(-)
 
 diff --git a/lib/vtls/polarssl.c b/lib/vtls/polarssl.c
-index 2c40e36..e0cfb90 100644
+index 2c40e36..c3f1b8e 100644
 --- a/lib/vtls/polarssl.c
 +++ b/lib/vtls/polarssl.c
-@@ -67,6 +67,8 @@
+@@ -55,6 +55,7 @@
+ #include "select.h"
+ #include "rawstr.h"
+ #include "polarssl_threadlock.h"
++#include "strtok.h"
+ 
+ #define _MPRINTF_REPLACE /* use our functions only */
+ #include <curl/mprintf.h>
+@@ -67,6 +68,8 @@
  #define THREADING_SUPPORT
  #endif
  
@@ -20,7 +28,7 @@
  #if defined(THREADING_SUPPORT)
  static entropy_context entropy;
  
-@@ -129,7 +131,7 @@ static void polarssl_debug(void *context, int level, const char *line)
+@@ -129,7 +132,7 @@ static void polarssl_debug(void *context, int level, const char *line)
  
  static Curl_recv polarssl_recv;
  static Curl_send polarssl_send;
@@ -29,7 +37,7 @@
  
  static CURLcode
  polarssl_connect_step1(struct connectdata *conn,
-@@ -300,7 +302,41 @@ polarssl_connect_step1(struct connectdata *conn,
+@@ -300,7 +303,41 @@ polarssl_connect_step1(struct connectdata *conn,
                net_recv, &conn->sock[sockindex],
                net_send, &conn->sock[sockindex]);
  

http://wald.intevation.org/projects/trustbridge/