This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx-apps.git
The following commit(s) were added to refs/heads/master by this push:
new 71276b618 mbedtls-alt/md5: add md5 alternative implementation
71276b618 is described below
commit 71276b6181023cac121d6cf963a61252422a815d
Author: makejian <[email protected]>
AuthorDate: Sat Sep 9 16:44:08 2023 +0800
mbedtls-alt/md5: add md5 alternative implementation
add md5 alternative implementation via /dev/crypto
Signed-off-by: makejian <[email protected]>
---
crypto/mbedtls/Kconfig | 5 ++
crypto/mbedtls/Makefile | 4 ++
crypto/mbedtls/include/mbedtls/mbedtls_config.h | 7 ++-
crypto/mbedtls/include/md5_alt.h | 31 +++++++++++
crypto/mbedtls/source/md5_alt.c | 74 +++++++++++++++++++++++++
5 files changed, 119 insertions(+), 2 deletions(-)
diff --git a/crypto/mbedtls/Kconfig b/crypto/mbedtls/Kconfig
index 71c716d3f..64a616754 100644
--- a/crypto/mbedtls/Kconfig
+++ b/crypto/mbedtls/Kconfig
@@ -578,6 +578,11 @@ config MBEDTLS_AES_ALT
select MBEDTLS_ALT
default n
+config MBEDTLS_MD5_ALT
+ bool "Enable Mbedt TLS MD5 module alted by nuttx crypto"
+ select MBEDTLS_ALT
+ default n
+
config MBEDTLS_SHA1_ALT
bool "Enable Mbedt TLS SHA1 module alted by nuttx crypto"
select MBEDTLS_ALT
diff --git a/crypto/mbedtls/Makefile b/crypto/mbedtls/Makefile
index f5ebf0f89..791290b58 100644
--- a/crypto/mbedtls/Makefile
+++ b/crypto/mbedtls/Makefile
@@ -116,6 +116,10 @@ ifeq ($(CONFIG_MBEDTLS_AES_ALT),y)
CSRCS += $(APPDIR)/crypto/mbedtls/source/aes_alt.c
endif
+ifeq ($(CONFIG_MBEDTLS_MD5_ALT),y)
+CSRCS += $(APPDIR)/crypto/mbedtls/source/md5_alt.c
+endif
+
ifeq ($(CONFIG_MBEDTLS_SHA1_ALT),y)
CSRCS += $(APPDIR)/crypto/mbedtls/source/sha1_alt.c
endif
diff --git a/crypto/mbedtls/include/mbedtls/mbedtls_config.h
b/crypto/mbedtls/include/mbedtls/mbedtls_config.h
index c12e1e7c9..508b9cb09 100644
--- a/crypto/mbedtls/include/mbedtls/mbedtls_config.h
+++ b/crypto/mbedtls/include/mbedtls/mbedtls_config.h
@@ -367,8 +367,11 @@
* #define MBEDTLS_NIST_KW_ALT
* #define MBEDTLS_MD2_ALT
* #define MBEDTLS_MD4_ALT
- * #define MBEDTLS_MD5_ALT
- * #define MBEDTLS_POLY1305_ALT
+ */
+#ifdef CONFIG_MBEDTLS_MD5_ALT
+#define MBEDTLS_MD5_ALT
+#endif
+/* #define MBEDTLS_POLY1305_ALT
* #define MBEDTLS_RIPEMD160_ALT
* #define MBEDTLS_RSA_ALT
*/
diff --git a/crypto/mbedtls/include/md5_alt.h b/crypto/mbedtls/include/md5_alt.h
new file mode 100644
index 000000000..5c1b93b9a
--- /dev/null
+++ b/crypto/mbedtls/include/md5_alt.h
@@ -0,0 +1,31 @@
+/****************************************************************************
+ * apps/crypto/mbedtls/include/md5_alt.h
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership. The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ ****************************************************************************/
+
+#ifndef __APPS_CRYPTO_MBEDTLS_INCLUDE_MD5_ALT_H
+#define __APPS_CRYPTO_MBEDTLS_INCLUDE_MD5_ALT_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include "dev_alt.h"
+
+#define mbedtls_md5_context cryptodev_context_t
+
+#endif /* __APPS_CRYPTO_MBEDTLS_INCLUDE_MD5_ALT_H */
diff --git a/crypto/mbedtls/source/md5_alt.c b/crypto/mbedtls/source/md5_alt.c
new file mode 100644
index 000000000..7518305e9
--- /dev/null
+++ b/crypto/mbedtls/source/md5_alt.c
@@ -0,0 +1,74 @@
+/****************************************************************************
+ * apps/crypto/mbedtls/source/md5_alt.c
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership. The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include "mbedtls/md5.h"
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+void mbedtls_md5_clone(FAR mbedtls_md5_context *dst,
+ FAR const mbedtls_md5_context *src)
+{
+ cryptodev_clone(dst, src);
+}
+
+void mbedtls_md5_init(FAR mbedtls_md5_context *ctx)
+{
+ cryptodev_init(ctx);
+}
+
+void mbedtls_md5_free(FAR mbedtls_md5_context *ctx)
+{
+ cryptodev_free(ctx);
+}
+
+int mbedtls_md5_starts(FAR mbedtls_md5_context *ctx)
+{
+ ctx->session.mac = CRYPTO_MD5;
+ return cryptodev_get_session(ctx);
+}
+
+int mbedtls_md5_update(FAR mbedtls_md5_context *ctx,
+ FAR const unsigned char *input,
+ size_t ilen)
+{
+ ctx->crypt.op = COP_ENCRYPT;
+ ctx->crypt.flags |= COP_FLAG_UPDATE;
+ ctx->crypt.src = (caddr_t)input;
+ ctx->crypt.len = ilen;
+ return cryptodev_crypt(ctx);
+}
+
+int mbedtls_md5_finish(FAR mbedtls_md5_context *ctx,
+ unsigned char output[16])
+{
+ int ret;
+
+ ctx->crypt.op = COP_ENCRYPT;
+ ctx->crypt.flags = 0;
+ ctx->crypt.mac = (caddr_t)output;
+ ret = cryptodev_crypt(ctx);
+ cryptodev_free_session(ctx);
+ return ret;
+}
