|
@@ -0,0 +1,105 @@
|
|
|
+From d73b585c6f6d9136ae7a04243a54d734fa57d779 Mon Sep 17 00:00:00 2001
|
|
|
+From: Seo Suchan <tjtncks@gmail.com>
|
|
|
+Date: Thu, 9 May 2024 19:10:59 +0900
|
|
|
+Subject: [PATCH] mbedtls: add support to mbedtls3
|
|
|
+
|
|
|
+Signed-off-by: Seo Suchan <tjtncks@gmail.com>
|
|
|
+Upstream: https://github.com/mikebrady/shairport-sync/commit/d73b585c6f6d9136ae7a04243a54d734fa57d779
|
|
|
+[thomas: backport the line numbers]
|
|
|
+Signed-off-by: Thomas Perale <thomas.perale@mind.be>
|
|
|
+---
|
|
|
+ common.c | 30 ++++++++++++++++++++++++++----
|
|
|
+ player.c | 1 -
|
|
|
+ player.h | 1 -
|
|
|
+ 3 files changed, 26 insertions(+), 6 deletions(-)
|
|
|
+
|
|
|
+diff --git a/common.c b/common.c
|
|
|
+index 4dc75bc7f..0e2a07243 100644
|
|
|
+--- a/common.c
|
|
|
++++ b/common.c
|
|
|
+@@ -77,6 +77,12 @@
|
|
|
+ #include <mbedtls/md.h>
|
|
|
+ #include <mbedtls/version.h>
|
|
|
+ #include <mbedtls/x509.h>
|
|
|
++
|
|
|
++#if MBEDTLS_VERSION_MAJOR == 3
|
|
|
++#define MBEDTLS_PRIVATE_V3_ONLY(_q) MBEDTLS_PRIVATE(_q)
|
|
|
++#else
|
|
|
++#define MBEDTLS_PRIVATE_V3_ONLY(_q) _q
|
|
|
++#endif
|
|
|
+ #endif
|
|
|
+
|
|
|
+ #ifdef CONFIG_LIBDAEMON
|
|
|
+@@ -691,8 +697,14 @@ uint8_t *rsa_apply(uint8_t *input, int inlen, int *outlen, int mode) {
|
|
|
+
|
|
|
+ mbedtls_pk_init(&pkctx);
|
|
|
+
|
|
|
++#if MBEDTLS_VERSION_MAJOR == 3
|
|
|
+ rc = mbedtls_pk_parse_key(&pkctx, (unsigned char *)super_secret_key, sizeof(super_secret_key),
|
|
|
++ NULL, 0, mbedtls_ctr_drbg_random, &ctr_drbg);
|
|
|
++#else
|
|
|
++ rc = mbedtls_pk_parse_key(&pkctx, (unsigned char *)super_secret_key, sizeof(super_secret_key),
|
|
|
+ NULL, 0);
|
|
|
++
|
|
|
++#endif
|
|
|
+ if (rc != 0)
|
|
|
+ debug(1, "Error %d reading the private key.", rc);
|
|
|
+
|
|
|
+@@ -701,19 +713,29 @@ uint8_t *rsa_apply(uint8_t *input, int inlen, int *outlen, int mode) {
|
|
|
+
|
|
|
+ switch (mode) {
|
|
|
+ case RSA_MODE_AUTH:
|
|
|
+- mbedtls_rsa_set_padding(trsa, MBEDTLS_RSA_PKCS_V15, MBEDTLS_MD_NONE);
|
|
|
+- outbuf = malloc(trsa->len);
|
|
|
++ mbedtls_rsa_set_padding(trsa, MBEDTLS_RSA_PKCS_V15, MBEDTLS_MD_NONE);
|
|
|
++ outbuf = malloc(trsa->MBEDTLS_PRIVATE_V3_ONLY(len));
|
|
|
++#if MBEDTLS_VERSION_MAJOR == 3
|
|
|
++ rc = mbedtls_rsa_pkcs1_encrypt(trsa, mbedtls_ctr_drbg_random, &ctr_drbg,
|
|
|
++ inlen, input, outbuf);
|
|
|
++#else
|
|
|
+ rc = mbedtls_rsa_pkcs1_encrypt(trsa, mbedtls_ctr_drbg_random, &ctr_drbg, MBEDTLS_RSA_PRIVATE,
|
|
|
+ inlen, input, outbuf);
|
|
|
++#endif
|
|
|
+ if (rc != 0)
|
|
|
+ debug(1, "mbedtls_pk_encrypt error %d.", rc);
|
|
|
+- *outlen = trsa->len;
|
|
|
++ *outlen = trsa->MBEDTLS_PRIVATE_V3_ONLY(len);
|
|
|
+ break;
|
|
|
+ case RSA_MODE_KEY:
|
|
|
+ mbedtls_rsa_set_padding(trsa, MBEDTLS_RSA_PKCS_V21, MBEDTLS_MD_SHA1);
|
|
|
+- outbuf = malloc(trsa->len);
|
|
|
++ outbuf = malloc(trsa->MBEDTLS_PRIVATE_V3_ONLY(len));
|
|
|
++#if MBEDTLS_VERSION_MAJOR == 3
|
|
|
++ rc = mbedtls_rsa_pkcs1_decrypt(trsa, mbedtls_ctr_drbg_random, &ctr_drbg,
|
|
|
++ &olen, input, outbuf, trsa->MBEDTLS_PRIVATE_V3_ONLY(len));
|
|
|
++#else
|
|
|
+ rc = mbedtls_rsa_pkcs1_decrypt(trsa, mbedtls_ctr_drbg_random, &ctr_drbg, MBEDTLS_RSA_PRIVATE,
|
|
|
+ &olen, input, outbuf, trsa->len);
|
|
|
++#endif
|
|
|
+ if (rc != 0)
|
|
|
+ debug(1, "mbedtls_pk_decrypt error %d.", rc);
|
|
|
+ *outlen = olen;
|
|
|
+diff --git a/player.c b/player.c
|
|
|
+index 8c1752722..d023d269c 100644
|
|
|
+--- a/player.c
|
|
|
++++ b/player.c
|
|
|
+@@ -47,7 +47,6 @@
|
|
|
+
|
|
|
+ #ifdef CONFIG_MBEDTLS
|
|
|
+ #include <mbedtls/aes.h>
|
|
|
+-#include <mbedtls/havege.h>
|
|
|
+ #endif
|
|
|
+
|
|
|
+ #ifdef CONFIG_POLARSSL
|
|
|
+diff --git a/player.h b/player.h
|
|
|
+index 11435bf91..b35eb7652 100644
|
|
|
+--- a/player.h
|
|
|
++++ b/player.h
|
|
|
+@@ -9,7 +9,6 @@
|
|
|
+
|
|
|
+ #ifdef CONFIG_MBEDTLS
|
|
|
+ #include <mbedtls/aes.h>
|
|
|
+-#include <mbedtls/havege.h>
|
|
|
+ #endif
|
|
|
+
|
|
|
+ #ifdef CONFIG_POLARSSL
|