From: Daniel Stenberg <daniel@haxx.se>
Date: Wed, 18 Jan 2012 22:19:37 +0000 (+0100)
Subject: polarssl: show cipher suite name correctly with 1.1.0
X-Git-Tag: curl-7_24_0~16
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d1becc3231ae570be19858491c5c9f2fe48c1fd7;p=thirdparty%2Fcurl.git

polarssl: show cipher suite name correctly with 1.1.0

Apparently ssl_get_ciphersuite() is needed to get the name of the used
cipher suite.
---

diff --git a/lib/polarssl.c b/lib/polarssl.c
index 07c0bf4363..f24c7839b0 100644
--- a/lib/polarssl.c
+++ b/lib/polarssl.c
@@ -276,10 +276,13 @@ Curl_polarssl_connect(struct connectdata *conn,
 
   infof(data, "PolarSSL: Handshake complete, cipher is %s\n",
 #if POLARSSL_VERSION_NUMBER<0x01000000
-        ssl_get_cipher(&conn->ssl[sockindex].ssl));
+        ssl_get_cipher(&conn->ssl[sockindex].ssl)
+#elif POLARSSL_VERSION_NUMBER >= 0x01010000
+        ssl_get_ciphersuite(&conn->ssl[sockindex].ssl)
 #else
-        ssl_get_ciphersuite_name(&conn->ssl[sockindex].ssl));
+        ssl_get_ciphersuite_name(&conn->ssl[sockindex].ssl)
 #endif
+    );
 
   ret = ssl_get_verify_result(&conn->ssl[sockindex].ssl);