Merge pull request #48 from paul-szczepanek-arm/sm-init-error

allow changing database at runtime and add checking for initialisation

Author: pan-

features/FEATURE_BLE/ble/SecurityManager.h

@@ -441,7 +441,7 @@ class SecurityManager {
      *                           support out-of-band exchanges of security data.
      * @param[in]  passkey       To specify a static passkey.
      * @param[in]  signing       Generate and distribute signing key during pairing
-     * @param[in]  dbPath        Path to the folder used to store keys in the filesystem,
+     * @param[in]  dbPath        Path to the file used to store keys in the filesystem,
      *                           if NULL keys will be only stored in memory
      *
      *
@@ -452,17 +452,33 @@ class SecurityManager {
                              SecurityIOCapabilities_t iocaps        = IO_CAPS_NONE,
                              const Passkey_t          passkey       = NULL,
                              bool                     signing       = true,
-                             const char              *dbPath        = NULL) {
+                             const char              *dbFilepath    = NULL) {
         /* Avoid compiler warnings about unused variables. */
         (void)enableBonding;
         (void)requireMITM;
         (void)iocaps;
         (void)passkey;
-        (void)dbPath;
+        (void)dbFilepath;
 
         return BLE_ERROR_NOT_IMPLEMENTED; /* Requesting action from porters: override this API if security is supported. */
     }
 
+    /**
+     * Change the file used for the security database. If path is invalid or a NULL is passed
+     * keys will only be stored in memory.
+     *
+     * @note This operation is only allowed with no active connections.
+     *
+     * @param[in]  dbPath        Path to the file used to store keys in the filesystem,
+     *                           if NULL keys will be only stored in memory
+     *
+     * @return BLE_ERROR_NONE on success.
+     */
+    virtual ble_error_t setDatabaseFilepath(const char *dbFilepath = NULL) {
+        (void)dbFilepath;
+        return BLE_ERROR_NOT_IMPLEMENTED; /* Requesting action from porters: override this API if security is supported. */
+    }
+
     /**
      * Notify all registered onShutdown callbacks that the SecurityManager is
      * about to be shutdown and clear all SecurityManager state of the

features/FEATURE_BLE/ble/generic/GenericSecurityManager.h

@@ -53,6 +53,8 @@ class GenericSecurityManager : public SecurityManager,
         const char* db_path = NULL
     );
 
+    virtual ble_error_t setDatabaseFilepath(const char *db_path = NULL);
+
     virtual ble_error_t reset();
 
     virtual ble_error_t preserveBondingStateOnReset(
@@ -263,6 +265,22 @@ class GenericSecurityManager : public SecurityManager,
     //
 
 private:
+
+    /**
+     * Initialise the database, if database already exists it will close it and open the new one.
+     *
+     * @param db_path path to file to store secure db
+     * @return BLE_ERROR_NONE or appropriate error code indicating the failure reason.
+     */
+    ble_error_t init_database(const char *db_path = NULL);
+
+    /**
+     * Generate identity list based on the database of IRK and apply it to the resolving list.
+     *
+     * @return BLE_ERROR_NONE or appropriate error code indicating the failure reason.
+     */
+    ble_error_t init_resolving_list();
+
     /**
      * Generate the CSRK if needed.
      *