mirror of
https://github.com/openwrt/packages.git
synced 2025-12-21 19:14:30 +04:00
1e1f368659
updated various function calling as new version needed Signed-off-by: Seo Suchan <tjtncks@gmail.com>
95 lines
2.9 KiB
Diff
95 lines
2.9 KiB
Diff
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>
|
|
---
|
|
common.c | 30 ++++++++++++++++++++++++++----
|
|
player.c | 1 -
|
|
player.h | 1 -
|
|
3 files changed, 26 insertions(+), 6 deletions(-)
|
|
|
|
--- a/common.c
|
|
+++ b/common.c
|
|
@@ -100,6 +100,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
|
|
@@ -910,8 +916,14 @@ uint8_t *rsa_apply(uint8_t *input, int i
|
|
|
|
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);
|
|
|
|
@@ -921,18 +933,28 @@ uint8_t *rsa_apply(uint8_t *input, int i
|
|
switch (mode) {
|
|
case RSA_MODE_AUTH:
|
|
mbedtls_rsa_set_padding(trsa, MBEDTLS_RSA_PKCS_V15, MBEDTLS_MD_NONE);
|
|
- outbuf = malloc(trsa->len);
|
|
+ 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;
|
|
--- a/player.c
|
|
+++ b/player.c
|
|
@@ -48,7 +48,6 @@
|
|
|
|
#ifdef CONFIG_MBEDTLS
|
|
#include <mbedtls/aes.h>
|
|
-#include <mbedtls/havege.h>
|
|
#endif
|
|
|
|
#ifdef CONFIG_POLARSSL
|
|
--- 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
|