From: Mike Brady <mikebrady@eircom.net>
Date: Sat, 2 Feb 2019 15:03:27 +0000 (+0000)
Subject: allow for updated or old mbedtls library
X-Git-Tag: 3.3RC0~66^2~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4fb88a3aa56e02f8b0b3a98e83d3473788e4ff97;p=thirdparty%2Fshairport-sync.git

allow for updated or old mbedtls library
---

diff --git a/metadata_hub.c b/metadata_hub.c
index 015327f0..3ec7a414 100644
--- a/metadata_hub.c
+++ b/metadata_hub.c
@@ -227,10 +227,17 @@ char *metadata_write_image_file(const char *buf, int len) {
 #endif
 
 #ifdef CONFIG_MBEDTLS
-  mbedtls_md5_context tctx;
-  mbedtls_md5_starts_ret(&tctx);
-  mbedtls_md5_update_ret(&tctx, (const unsigned char *)buf, len);
-  mbedtls_md5_finish_ret(&tctx, img_md5);
+  #if MBEDTLS_VERSION_MINOR >= 7
+    mbedtls_md5_context tctx;
+    mbedtls_md5_starts_ret(&tctx);
+    mbedtls_md5_update_ret(&tctx, (const unsigned char *)buf, len);
+    mbedtls_md5_finish_ret(&tctx, img_md5);
+  #else
+    mbedtls_md5_context tctx;
+    mbedtls_md5_starts(&tctx);
+    mbedtls_md5_update(&tctx, (const unsigned char *)buf, len);
+    mbedtls_md5_finish(&tctx, img_md5);
+  #endif
 #endif
 
 #ifdef CONFIG_POLARSSL
diff --git a/rtsp.c b/rtsp.c
index 3143dba5..fb66d4c3 100644
--- a/rtsp.c
+++ b/rtsp.c
@@ -2038,6 +2038,7 @@ static int rtsp_auth(char **nonce, rtsp_message *req, rtsp_message *resp) {
 #endif
 
 #ifdef CONFIG_MBEDTLS
+  #if MBEDTLS_VERSION_MINOR >= 7
   mbedtls_md5_context tctx;
   mbedtls_md5_starts_ret(&tctx);
   mbedtls_md5_update_ret(&tctx, (const unsigned char *)username, strlen(username));
@@ -2051,6 +2052,21 @@ static int rtsp_auth(char **nonce, rtsp_message *req, rtsp_message *resp) {
   mbedtls_md5_update_ret(&tctx, (unsigned char *)":", 1);
   mbedtls_md5_update_ret(&tctx, (const unsigned char *)uri, strlen(uri));
   mbedtls_md5_finish_ret(&tctx, digest_mu);
+  #else
+  mbedtls_md5_context tctx;
+  mbedtls_md5_starts(&tctx);
+  mbedtls_md5_update(&tctx, (const unsigned char *)username, strlen(username));
+  mbedtls_md5_update(&tctx, (unsigned char *)":", 1);
+  mbedtls_md5_update(&tctx, (const unsigned char *)realm, strlen(realm));
+  mbedtls_md5_update(&tctx, (unsigned char *)":", 1);
+  mbedtls_md5_update(&tctx, (const unsigned char *)config.password, strlen(config.password));
+  mbedtls_md5_finish(&tctx, digest_urp);
+  mbedtls_md5_starts(&tctx);
+  mbedtls_md5_update(&tctx, (const unsigned char *)req->method, strlen(req->method));
+  mbedtls_md5_update(&tctx, (unsigned char *)":", 1);
+  mbedtls_md5_update(&tctx, (const unsigned char *)uri, strlen(uri));
+  mbedtls_md5_finish(&tctx, digest_mu);
+  #endif
 #endif
 
 #ifdef CONFIG_POLARSSL
@@ -2089,6 +2105,7 @@ static int rtsp_auth(char **nonce, rtsp_message *req, rtsp_message *resp) {
 #endif
 
 #ifdef CONFIG_MBEDTLS
+  #if MBEDTLS_VERSION_MINOR >= 7
   mbedtls_md5_starts_ret(&tctx);
   mbedtls_md5_update_ret(&tctx, buf, 32);
   mbedtls_md5_update_ret(&tctx, (unsigned char *)":", 1);
@@ -2098,6 +2115,17 @@ static int rtsp_auth(char **nonce, rtsp_message *req, rtsp_message *resp) {
     snprintf((char *)buf + 2 * i, 3, "%02x", digest_mu[i]);
   mbedtls_md5_update_ret(&tctx, buf, 32);
   mbedtls_md5_finish_ret(&tctx, digest_total);
+  #else
+  mbedtls_md5_starts(&tctx);
+  mbedtls_md5_update(&tctx, buf, 32);
+  mbedtls_md5_update(&tctx, (unsigned char *)":", 1);
+  mbedtls_md5_update(&tctx, (const unsigned char *)*nonce, strlen(*nonce));
+  mbedtls_md5_update(&tctx, (unsigned char *)":", 1);
+  for (i = 0; i < 16; i++)
+    snprintf((char *)buf + 2 * i, 3, "%02x", digest_mu[i]);
+  mbedtls_md5_update(&tctx, buf, 32);
+  mbedtls_md5_finish(&tctx, digest_total);
+  #endif
 #endif
 
 #ifdef CONFIG_POLARSSL
diff --git a/shairport.c b/shairport.c
index 9a26a368..617e9009 100644
--- a/shairport.c
+++ b/shairport.c
@@ -1609,10 +1609,17 @@ int main(int argc, char **argv) {
 #endif
 
 #ifdef CONFIG_MBEDTLS
-  mbedtls_md5_context tctx;
-  mbedtls_md5_starts_ret(&tctx);
-  mbedtls_md5_update_ret(&tctx, (unsigned char *)config.service_name, strlen(config.service_name));
-  mbedtls_md5_finish_ret(&tctx, ap_md5);
+  #if MBEDTLS_VERSION_MINOR >= 7
+    mbedtls_md5_context tctx;
+    mbedtls_md5_starts_ret(&tctx);
+    mbedtls_md5_update_ret(&tctx, (unsigned char *)config.service_name, strlen(config.service_name));
+    mbedtls_md5_finish_ret(&tctx, ap_md5);
+  #else
+    mbedtls_md5_context tctx;
+    mbedtls_md5_starts(&tctx);
+    mbedtls_md5_update(&tctx, (unsigned char *)config.service_name, strlen(config.service_name));
+    mbedtls_md5_finish(&tctx, ap_md5);
+  #endif
 #endif
 
 #ifdef CONFIG_POLARSSL