lib/crypto: Adapt mscode_parser to MbedTLS

Previous patch has introduced MbedTLS porting layer for mscode parser,
here to adjust the header and makefiles accordingly.
Adding _LEGACY Kconfig for legacy mscode implementation.

Signed-off-by: Raymond Mao <raymond.mao@linaro.org>

diff --git a/include/crypto/mscode.h b/include/crypto/mscode.h
index 551058b96e60c1a34c77c112679dee970ac1281c..678e69001b9eeaf19fdd59247deac157aed53d68 100644 (file)
--- a/include/crypto/mscode.h
+++ b/include/crypto/mscode.h
@@ -9,6 +9,10 @@
 #ifndef __UBOOT__
 #include <crypto/hash_info.h>
 #endif
+#if CONFIG_IS_ENABLED(MBEDTLS_LIB_X509)
+#include <mbedtls/asn1.h>
+#include <mbedtls/oid.h>
+#endif
 
 struct pefile_context {
 #ifndef __UBOOT__

diff --git a/lib/crypto/Makefile b/lib/crypto/Makefile
index 7129315393fa3204235f371e0c3bb4e6ca42c431..3caa45dc2a8c62f226c6385a8603ec2e8033be86 100644 (file)
--- a/lib/crypto/Makefile
+++ b/lib/crypto/Makefile
@@ -63,7 +63,7 @@ obj-$(CONFIG_$(SPL_)PKCS7_VERIFY) += pkcs7_verify.o
 #
 # Signed PE binary-wrapped key handling
 #
-obj-$(CONFIG_$(SPL_)MSCODE_PARSER) += mscode.o
+obj-$(CONFIG_$(SPL_)MSCODE_PARSER_LEGACY) += mscode.o
 
 mscode-y := \
        mscode_parser.o \

diff --git a/lib/mbedtls/Kconfig b/lib/mbedtls/Kconfig
index fd7263f9616744fb5ec79567fc584f2b533f1e60..efeaed503851d30c6002e1ceb8cf660f48dd1fff 100644 (file)
--- a/lib/mbedtls/Kconfig
+++ b/lib/mbedtls/Kconfig
@@ -120,6 +120,7 @@ config LEGACY_CRYPTO_CERT
                ASYMMETRIC_PUBLIC_KEY_SUBTYPE
        select X509_CERTIFICATE_PARSER_LEGACY if X509_CERTIFICATE_PARSER
        select PKCS7_MESSAGE_PARSER_LEGACY if PKCS7_MESSAGE_PARSER
+       select MSCODE_PARSER_LEGACY if MSCODE_PARSER
        select SPL_ASYMMETRIC_PUBLIC_KEY_LEGACY if \
                SPL_ASYMMETRIC_PUBLIC_KEY_SUBTYPE
        help
@@ -150,6 +151,14 @@ config PKCS7_MESSAGE_PARSER_LEGACY
          This option chooses legacy certificate library for PKCS7 message
          parser.
 
+config MSCODE_PARSER_LEGACY
+       bool "MS authenticode parser with legacy certificate library"
+       depends on LEGACY_CRYPTO_CERT && MSCODE_PARSER
+       select ASN1_DECODER_LEGACY
+       help
+         This option chooses legacy certificate library for MS authenticode
+         parser.
+
 if SPL
 
 config SPL_ASYMMETRIC_PUBLIC_KEY_LEGACY