From f989dbe6d8b2f355303f1aaff5644b11349a18ca Mon Sep 17 00:00:00 2001
From: Gilles Peskine <Gilles.Peskine@arm.com>
Date: Wed, 26 Jun 2019 18:18:12 +0200
Subject: [PATCH] SE driver lookup functions

Expose the type of an entry in the SE driver table as an opaque type
to other library modules. Soon, driver table entries will have state,
and callers will need to be able to access this state through
functions using this opaque type.

Provide functions to look up a driver by its lifetime and to retrieve
the method table from an entry.
---
 library/psa_crypto_se.c | 52 ++++++++++++++++++++++++++++++++++++++---
 library/psa_crypto_se.h | 38 ++++++++++++++++++++++++++++++
 2 files changed, 87 insertions(+), 3 deletions(-)

diff --git a/library/psa_crypto_se.c b/library/psa_crypto_se.c
index 688d4e7c8e..70e3a16802 100644
--- a/library/psa_crypto_se.c
+++ b/library/psa_crypto_se.c
@@ -32,13 +32,53 @@
 
 #include "psa_crypto_se.h"
 
-typedef struct
+/****************************************************************/
+/* Driver lookup */
+/****************************************************************/
+
+typedef struct psa_se_drv_table_entry_s
 {
     psa_key_lifetime_t lifetime;
     const psa_drv_se_t *methods;
-} method_table_entry_t;
+} psa_se_drv_table_entry_t;
 
-static method_table_entry_t driver_table[PSA_MAX_SE_DRIVERS];
+static psa_se_drv_table_entry_t driver_table[PSA_MAX_SE_DRIVERS];
+
+const psa_se_drv_table_entry_t *psa_get_se_driver_entry(
+    psa_key_lifetime_t lifetime )
+{
+    size_t i;
+    if( lifetime == 0 )
+        return( NULL );
+    for( i = 0; i < PSA_MAX_SE_DRIVERS; i++ )
+    {
+        if( driver_table[i].lifetime == lifetime )
+            return( &driver_table[i] );
+    }
+    return( NULL );
+}
+
+const psa_drv_se_t *psa_get_se_driver_methods(
+    const psa_se_drv_table_entry_t *drv )
+{
+    return( drv->methods );
+}
+
+const psa_drv_se_t *psa_get_se_driver( psa_key_lifetime_t lifetime )
+{
+    const psa_se_drv_table_entry_t *drv = psa_get_se_driver_entry( lifetime );
+    if( drv == NULL )
+        return( NULL );
+    else
+        return( drv->methods );
+}
+
+
+
+
+/****************************************************************/
+/* Driver registration */
+/****************************************************************/
 
 psa_status_t psa_register_se_driver(
     psa_key_lifetime_t lifetime,
@@ -83,4 +123,10 @@ void psa_unregister_all_se_drivers( void )
     memset( driver_table, 0, sizeof( driver_table ) );
 }
 
+
+
+/****************************************************************/
+/* The end */
+/****************************************************************/
+
 #endif /* MBEDTLS_PSA_CRYPTO_SE_C */
diff --git a/library/psa_crypto_se.h b/library/psa_crypto_se.h
index e99bd25763..88b0127c68 100644
--- a/library/psa_crypto_se.h
+++ b/library/psa_crypto_se.h
@@ -42,4 +42,42 @@
  */
 void psa_unregister_all_se_drivers( void );
 
+/** A structure that describes a registered secure element driver.
+ *
+ * A secure element driver table entry contains a pointer to the
+ * driver's method table and a pointer to the driver's slot usage
+ * structure.
+ */
+typedef struct psa_se_drv_table_entry_s psa_se_drv_table_entry_t;
+
+/** Return the secure element driver table entry for a lifetime value.
+ *
+ * \param lifetime      The lifetime value to query.
+ *
+ * \return The driver table entry for \p lifetime, or
+ *         \p NULL if \p lifetime does not correspond to a registered driver.
+ */
+const psa_se_drv_table_entry_t *psa_get_se_driver_entry(
+    psa_key_lifetime_t lifetime );
+
+/** Return the method table for a secure element driver.
+ *
+ * \param[in] drv       The driver table entry to access.
+ *
+ * \return The driver table entry for \p lifetime, or
+ *         \p NULL if \p lifetime does not correspond to a registered driver.
+ */
+const psa_drv_se_t *psa_get_se_driver_methods(
+    const psa_se_drv_table_entry_t *drv );
+
+/** Return the secure element driver method table for a lifetime value.
+ *
+ * \param lifetime      The lifetime value to query.
+ *
+ * \return The driver method table for \p lifetime, or
+ *         \p NULL if \p lifetime does not correspond to a registered driver.
+ */
+const psa_drv_se_t *psa_get_se_driver(
+    psa_key_lifetime_t lifetime );
+
 #endif /* PSA_CRYPTO_SE_H */