commit 169087482f8fb06275eecbb225c4d0350a4392b7
author Gilles Peskine <Gilles.Peskine@arm.com> Wed Feb 26 19:52:07 2020 +0100
committer Ronald Cron <ronald.cron@arm.com> Thu Mar 19 14:23:45 2020 +0100
tree e774e4b0d66170aeb7f50c0c7f745f7e887bce79
parent 3a67150bf290f637e0daadbbdac24cadd7745024

Revert "pkey: Remove dependency on X.509"

This reverts commit bf564c77fa97e67ac577d28258918ba29cde6af3.

programs/pkey/key_app.c

diff --git a/programs/pkey/key_app.c b/programs/pkey/key_app.c
index 19dcdfe..7939309 100644
--- a/programs/pkey/key_app.c
+++ b/programs/pkey/key_app.c
@@ -40,7 +40,7 @@
     defined(MBEDTLS_PK_PARSE_C) && defined(MBEDTLS_FS_IO)
 #include "mbedtls/error.h"
 #include "mbedtls/rsa.h"
-#include "mbedtls/pk.h"
+#include "mbedtls/x509.h"
 
 #include <string.h>
 #endif

programs/pkey/rsa_genkey.c

diff --git a/programs/pkey/rsa_genkey.c b/programs/pkey/rsa_genkey.c
index f2b7b50..4e42e70 100644
--- a/programs/pkey/rsa_genkey.c
+++ b/programs/pkey/rsa_genkey.c
@@ -42,6 +42,7 @@
 #include "mbedtls/entropy.h"
 #include "mbedtls/ctr_drbg.h"
 #include "mbedtls/bignum.h"
+#include "mbedtls/x509.h"
 #include "mbedtls/rsa.h"
 
 #include <stdio.h>

programs/pkey/rsa_sign_pss.c

diff --git a/programs/pkey/rsa_sign_pss.c b/programs/pkey/rsa_sign_pss.c
index 5019f28..42209e2 100644
--- a/programs/pkey/rsa_sign_pss.c
+++ b/programs/pkey/rsa_sign_pss.c
@@ -55,7 +55,7 @@
 #include "mbedtls/ctr_drbg.h"
 #include "mbedtls/md.h"
 #include "mbedtls/rsa.h"
-#include "mbedtls/pk.h"
+#include "mbedtls/x509.h"
 
 #include <stdio.h>
 #include <string.h>

programs/pkey/rsa_verify_pss.c

diff --git a/programs/pkey/rsa_verify_pss.c b/programs/pkey/rsa_verify_pss.c
index de28337..148cd51 100644
--- a/programs/pkey/rsa_verify_pss.c
+++ b/programs/pkey/rsa_verify_pss.c
@@ -55,6 +55,7 @@
 #include "mbedtls/pem.h"
 #include "mbedtls/pk.h"
 #include "mbedtls/md.h"
+#include "mbedtls/x509.h"
 
 #include <stdio.h>
 #include <string.h>