lib/crypto: Adapt x509_cert_parser to MbedTLS
Previous patch has introduced MbedTLS porting layer for x509 cert parser, here to adjust the header and makefiles accordingly. Signed-off-by: Raymond Mao <raymond.mao@linaro.org>
This commit is contained in:
@@ -11,8 +11,35 @@
|
||||
#include <linux/time.h>
|
||||
#include <crypto/public_key.h>
|
||||
#include <keys/asymmetric-type.h>
|
||||
#if CONFIG_IS_ENABLED(MBEDTLS_LIB_X509)
|
||||
#include <image.h>
|
||||
#include <mbedtls/error.h>
|
||||
#include <mbedtls/asn1.h>
|
||||
#endif
|
||||
|
||||
#if CONFIG_IS_ENABLED(MBEDTLS_LIB_X509)
|
||||
struct x509_cert_mbedtls_ctx {
|
||||
void *tbs; /* Signed data */
|
||||
void *raw_serial; /* Raw serial number in ASN.1 */
|
||||
void *raw_issuer; /* Raw issuer name in ASN.1 */
|
||||
void *raw_subject; /* Raw subject name in ASN.1 */
|
||||
void *raw_skid; /* Raw subjectKeyId in ASN.1 */
|
||||
};
|
||||
#endif
|
||||
|
||||
/*
|
||||
* MbedTLS integration Notes:
|
||||
*
|
||||
* Fields we don't need to populate from MbedTLS context:
|
||||
* 'raw_sig' and 'raw_sig_size' are buffer for x509_parse_context,
|
||||
* not needed for MbedTLS.
|
||||
* 'signer' and 'seen' are used internally by pkcs7_verify.
|
||||
* 'verified' is not in use.
|
||||
*/
|
||||
struct x509_certificate {
|
||||
#if CONFIG_IS_ENABLED(MBEDTLS_LIB_X509)
|
||||
struct x509_cert_mbedtls_ctx *mbedtls_ctx;
|
||||
#endif
|
||||
struct x509_certificate *next;
|
||||
struct x509_certificate *signer; /* Certificate that signed this one */
|
||||
struct public_key *pub; /* Public key details */
|
||||
@@ -48,6 +75,32 @@ struct x509_certificate {
|
||||
* x509_cert_parser.c
|
||||
*/
|
||||
extern void x509_free_certificate(struct x509_certificate *cert);
|
||||
#if CONFIG_IS_ENABLED(MBEDTLS_LIB_X509)
|
||||
/**
|
||||
* x509_populate_pubkey() - Populate public key from MbedTLS context
|
||||
*
|
||||
* @cert: Pointer to MbedTLS X509 cert
|
||||
* @pub_key: Pointer to the populated public key handle
|
||||
* Return: 0 on succcess, error code on failure
|
||||
*/
|
||||
int x509_populate_pubkey(mbedtls_x509_crt *cert, struct public_key **pub_key);
|
||||
/**
|
||||
* x509_populate_cert() - Populate X509 cert from MbedTLS context
|
||||
*
|
||||
* @mbedtls_cert: Pointer to MbedTLS X509 cert
|
||||
* @pcert: Pointer to the populated X509 cert handle
|
||||
* Return: 0 on succcess, error code on failure
|
||||
*/
|
||||
int x509_populate_cert(mbedtls_x509_crt *mbedtls_cert,
|
||||
struct x509_certificate **pcert);
|
||||
/**
|
||||
* x509_get_timestamp() - Translate timestamp from MbedTLS context
|
||||
*
|
||||
* @x509_time: Pointer to MbedTLS time
|
||||
* Return: Time in time64_t format
|
||||
*/
|
||||
time64_t x509_get_timestamp(const mbedtls_x509_time *x509_time);
|
||||
#endif
|
||||
extern struct x509_certificate *x509_cert_parse(const void *data, size_t datalen);
|
||||
extern int x509_decode_time(time64_t *_t, size_t hdrlen,
|
||||
unsigned char tag,
|
||||
@@ -56,6 +109,8 @@ extern int x509_decode_time(time64_t *_t, size_t hdrlen,
|
||||
/*
|
||||
* x509_public_key.c
|
||||
*/
|
||||
#if !CONFIG_IS_ENABLED(MBEDTLS_LIB_X509)
|
||||
extern int x509_get_sig_params(struct x509_certificate *cert);
|
||||
#endif
|
||||
extern int x509_check_for_self_signed(struct x509_certificate *cert);
|
||||
#endif /* _X509_PARSER_H */
|
||||
|
@@ -32,11 +32,11 @@ endif
|
||||
# X.509 Certificate handling
|
||||
#
|
||||
obj-$(CONFIG_$(SPL_)X509_CERTIFICATE_PARSER) += x509_key_parser.o
|
||||
x509_key_parser-y := \
|
||||
x509_key_parser-y := x509_helper.o
|
||||
x509_key_parser-$(CONFIG_$(SPL_)X509_CERTIFICATE_PARSER_LEGACY) += \
|
||||
x509.asn1.o \
|
||||
x509_akid.asn1.o \
|
||||
x509_cert_parser.o \
|
||||
x509_helper.o \
|
||||
x509_public_key.o
|
||||
|
||||
$(obj)/x509_cert_parser.o: \
|
||||
|
@@ -30,6 +30,8 @@
|
||||
#include "x509_parser.h"
|
||||
#endif
|
||||
|
||||
#if !CONFIG_IS_ENABLED(MBEDTLS_LIB_X509)
|
||||
|
||||
/*
|
||||
* Set up the signature parameters in an X.509 certificate. This involves
|
||||
* digesting the signed data and extracting the signature.
|
||||
|
Reference in New Issue
Block a user