From: Daniel Stenberg <daniel@haxx.se>
Date: Wed, 25 Mar 2015 08:19:57 +0000 (+0100)
Subject: polarssl: called mbedTLS in 1.3.10 and later
X-Git-Tag: curl-7_42_0~81
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5b58bface3889c13f4f4aeb5a053caa6b747374c;p=thirdparty%2Fcurl.git

polarssl: called mbedTLS in 1.3.10 and later
---

diff --git a/lib/vtls/polarssl.c b/lib/vtls/polarssl.c
index 1828df05c1..066c055e6d 100644
--- a/lib/vtls/polarssl.c
+++ b/lib/vtls/polarssl.c
@@ -587,11 +587,15 @@ void Curl_polarssl_session_free(void *ptr)
   free(ptr);
 }
 
+/* 1.3.10 was the first rebranded version. All new releases (in 1.3 branch and
+   higher) will be mbed TLS branded.. */
+
 size_t Curl_polarssl_version(char *buffer, size_t size)
 {
   unsigned int version = version_get_number();
-  return snprintf(buffer, size, "PolarSSL/%d.%d.%d", version>>24,
-                  (version>>16)&0xff, (version>>8)&0xff);
+  return snprintf(buffer, size, "%s/%d.%d.%d",
+                  version >= 0x01030A00?"mbedTLS":"PolarSSL",
+                  version>>24, (version>>16)&0xff, (version>>8)&0xff);
 }
 
 static CURLcode