| Message ID | 20240702182325.2904421-19-raymond.mao@linaro.org |
|---|---|
| State | Changes Requested |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | Integrate MbedTLS v3.6 LTS with U-Boot | expand |
On Tue, 2 Jul 2024 at 21:31, Raymond Mao <raymond.mao@linaro.org> wrote: > > Previous patch has introduced MbedTLS porting layer for public key, > here to adjust the header and makefiles accordingly. > > Signed-off-by: Raymond Mao <raymond.mao@linaro.org> > --- > Changes in v2 > - Move the porting layer to MbedTLS dir. > Changes in v3 > - Update commit message. > Changes in v4 > - Control building legacy library via '_LEGACY' Kconfig. > - Minor fix of the include directories. > > include/crypto/public_key.h | 6 ++++++ > lib/crypto/Makefile | 5 ++--- > lib/crypto/asymmetric_type.c | 2 +- > 3 files changed, 9 insertions(+), 4 deletions(-) > > diff --git a/include/crypto/public_key.h b/include/crypto/public_key.h > index 3ba90fcc348..25cfb68adce 100644 > --- a/include/crypto/public_key.h > +++ b/include/crypto/public_key.h > @@ -12,6 +12,12 @@ > > #ifdef __UBOOT__ > #include <linux/types.h> > +#if CONFIG_IS_ENABLED(MBEDTLS_LIB_X509) > +#include <library/common.h> > +#include <mbedtls/pk.h> > +#include <mbedtls/x509_crt.h> > +#include <mbedtls/md.h> > +#endif > #else > #include <linux/keyctl.h> > #endif > diff --git a/lib/crypto/Makefile b/lib/crypto/Makefile > index 16059088f26..228ae443a27 100644 > --- a/lib/crypto/Makefile > +++ b/lib/crypto/Makefile > @@ -7,9 +7,8 @@ obj-$(CONFIG_$(SPL_)ASYMMETRIC_KEY_TYPE) += asymmetric_keys.o > > asymmetric_keys-y := asymmetric_type.o > > -obj-$(CONFIG_$(SPL_)ASYMMETRIC_PUBLIC_KEY_SUBTYPE) += \ > - public_key_helper.o \ > - public_key.o > +obj-$(CONFIG_$(SPL_)ASYMMETRIC_PUBLIC_KEY_SUBTYPE) += public_key_helper.o > +obj-$(CONFIG_$(SPL_)ASYMMETRIC_PUBLIC_KEY_SUBTYPE_LEGACY) += public_key.o > > # > # RSA public key parser > diff --git a/lib/crypto/asymmetric_type.c b/lib/crypto/asymmetric_type.c > index 24c2d15ef97..95b82cd8e84 100644 > --- a/lib/crypto/asymmetric_type.c > +++ b/lib/crypto/asymmetric_type.c > @@ -12,7 +12,6 @@ > #include <keys/asymmetric-subtype.h> > #include <keys/asymmetric-parser.h> > #endif > -#include <crypto/public_key.h> > #ifdef __UBOOT__ > #include <linux/bug.h> > #include <linux/compat.h> > @@ -26,6 +25,7 @@ > #include <linux/slab.h> > #include <linux/ctype.h> > #endif > +#include <crypto/public_key.h> > #ifdef __UBOOT__ > #include <keys/asymmetric-type.h> > #else > -- > 2.25.1 > Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
diff --git a/include/crypto/public_key.h b/include/crypto/public_key.h index 3ba90fcc348..25cfb68adce 100644 --- a/include/crypto/public_key.h +++ b/include/crypto/public_key.h @@ -12,6 +12,12 @@ #ifdef __UBOOT__ #include <linux/types.h> +#if CONFIG_IS_ENABLED(MBEDTLS_LIB_X509) +#include <library/common.h> +#include <mbedtls/pk.h> +#include <mbedtls/x509_crt.h> +#include <mbedtls/md.h> +#endif #else #include <linux/keyctl.h> #endif diff --git a/lib/crypto/Makefile b/lib/crypto/Makefile index 16059088f26..228ae443a27 100644 --- a/lib/crypto/Makefile +++ b/lib/crypto/Makefile @@ -7,9 +7,8 @@ obj-$(CONFIG_$(SPL_)ASYMMETRIC_KEY_TYPE) += asymmetric_keys.o asymmetric_keys-y := asymmetric_type.o -obj-$(CONFIG_$(SPL_)ASYMMETRIC_PUBLIC_KEY_SUBTYPE) += \ - public_key_helper.o \ - public_key.o +obj-$(CONFIG_$(SPL_)ASYMMETRIC_PUBLIC_KEY_SUBTYPE) += public_key_helper.o +obj-$(CONFIG_$(SPL_)ASYMMETRIC_PUBLIC_KEY_SUBTYPE_LEGACY) += public_key.o # # RSA public key parser diff --git a/lib/crypto/asymmetric_type.c b/lib/crypto/asymmetric_type.c index 24c2d15ef97..95b82cd8e84 100644 --- a/lib/crypto/asymmetric_type.c +++ b/lib/crypto/asymmetric_type.c @@ -12,7 +12,6 @@ #include <keys/asymmetric-subtype.h> #include <keys/asymmetric-parser.h> #endif -#include <crypto/public_key.h> #ifdef __UBOOT__ #include <linux/bug.h> #include <linux/compat.h> @@ -26,6 +25,7 @@ #include <linux/slab.h> #include <linux/ctype.h> #endif +#include <crypto/public_key.h> #ifdef __UBOOT__ #include <keys/asymmetric-type.h> #else
Previous patch has introduced MbedTLS porting layer for public key, here to adjust the header and makefiles accordingly. Signed-off-by: Raymond Mao <raymond.mao@linaro.org> --- Changes in v2 - Move the porting layer to MbedTLS dir. Changes in v3 - Update commit message. Changes in v4 - Control building legacy library via '_LEGACY' Kconfig. - Minor fix of the include directories. include/crypto/public_key.h | 6 ++++++ lib/crypto/Makefile | 5 ++--- lib/crypto/asymmetric_type.c | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-)