Enable side-by-side storages. The "all" mode can now build and use both

pubkey and symkey storages alongside each other.

It is assumed that the correct storage is passed to the relevant
e4c_protect / e4c_unprotect implementation, and there is (currently) no
way to type check this.

Author: diagprov

include/e4/e4.h

@@ -21,7 +21,7 @@
 
 #ifdef __cplusplus
 extern "C" {
-#endif
+#endif /* C++ */
 
 #include <stddef.h>
 #include <stdint.h>
@@ -113,14 +113,14 @@ message.
 
     #define e4c_protect_message e4c_pubkey_protect_message
     #define e4c_unprotect_message e4c_pubkey_unprotect_message
-#endif
+#endif /* E4_MODE_PUBKEY */
 
 #ifdef E4_MODE_SYMKEY
     #include "e4/e4symkey.h"
 
     #define e4c_protect_message e4c_symkey_protect_message
     #define e4c_unprotect_message e4c_symkey_unprotect_message
-#endif
+#endif /* E4_MODE_SYMKEY */
 
 #ifdef E4_MODE_ALL
 /* include forward declarations for specific implementations. 
@@ -129,12 +129,12 @@ message.
  */
 #include "e4/e4pubkey.h"
 #include "e4/e4symkey.h"
-#endif
+#endif /* E4_MODE_ALL */
 
 
 
 #ifdef __cplusplus
 }
-#endif
+#endif /* C++ */
 
-#endif
+#endif /* include guard */

include/e4/e4pubkey.h

@@ -8,7 +8,7 @@ int e4c_pubkey_protect_message(uint8_t *ciphertext,
                         const uint8_t *message,
                         size_t message_len,
                         const char *topic_name,
-                        e4storage *storage,
+                        void* storage,
                         const uint32_t proto_opts);
 
 int e4c_pubkey_unprotect_message(uint8_t *message,
@@ -17,9 +17,9 @@ int e4c_pubkey_unprotect_message(uint8_t *message,
                           const uint8_t *ciphertext,
                           size_t ciphertext_len,
                           const char *topic_name,
-                          e4storage *storage,
+                          void* storage,
                           const uint32_t proto_opts);
 
-int e4c_pubkey_c2sharedsecret_derivestore(e4storage* storage);
+int e4c_pubkey_c2sharedsecret_derivestore(void* storage);
 
-#endif
+#endif /* include guard */

include/e4/e4symkey.h

@@ -8,7 +8,7 @@ int e4c_symkey_protect_message(uint8_t *ciphertext,
                         const uint8_t *message,
                         size_t message_len,
                         const char *topic_name,
-                        e4storage *storage,
+                        void* storage,
                         const uint32_t proto_opts);
 
 int e4c_symkey_unprotect_message(uint8_t *message,
@@ -17,7 +17,7 @@ int e4c_symkey_unprotect_message(uint8_t *message,
                           const uint8_t *ciphertext,
                           size_t ciphertext_len,
                           const char *topic_name,
-                          e4storage *storage,
+                          void* storage,
                           const uint32_t proto_opts);
 
-#endif
+#endif /* include guard */

include/e4/error.h

@@ -36,4 +36,4 @@
 /* Incompatible storage type */
 #define E4_ERROR_PERSISTENCE_INCOMPATIBLE -113
 
-#endif
+#endif /* include guard */

include/e4/internal/e4c_store_mem.h include/e4/internal/e4c_common_storage.h

@@ -16,39 +16,14 @@
  * limitations under the License.
  */
 
-#include <fcntl.h>
-#ifndef _E4C_STORE_MEM_H_
-#define _E4C_STORE_MEM_H_
+#ifndef _E4C_STORE_COMMON_H_
+#define _E4C_STORE_COMMON_H_
 
-#include <stddef.h>
-#include <stdint.h>
-
-#ifndef E4_TOPICS_MAX
-#define E4_TOPICS_MAX 100
-#endif
-
-#define E4_MAX_PATH 255
-
-/* In memory structures that represent the file. */
-
-typedef struct
+typedef struct _e4_topic_key
 {
     uint8_t topic[E4_TOPICHASH_LEN];
     uint8_t key[E4_KEY_LEN];
 } topic_key;
 
-
-struct _e4storage
-{
-    /* These fields are persisted by the sync command */
-    uint8_t id[E4_ID_LEN];
-    uint8_t key[E4_KEY_LEN];
-    uint16_t topiccount;
-    topic_key topics[E4_TOPICS_MAX];
-
-    /* These fields are set at run time only */
-    char filepath[E4_MAX_PATH + 1];
-    uint8_t ctrltopic[E4_TOPICHASH_LEN];
-};
-
 #endif
+

include/e4/internal/e4c_pk_store_file.h

@@ -16,13 +16,12 @@
  * limitations under the License.
  */
 
-#include <fcntl.h>
-
 #ifndef _E4C_STORE_PK_FILE_H_
 #define _E4C_STORE_PK_FILE_H_
 
 #include <stddef.h>
 #include <stdint.h>
+#include <fcntl.h>
 
 #ifndef E4_DEVICES_MAX
 #define E4_DEVICES_MAX 100
@@ -36,19 +35,15 @@
 
 /* In memory structures that represent the file. */
 
-typedef struct _e4_topic_key
-{
-    uint8_t topic[E4_TOPICHASH_LEN];
-    uint8_t key[E4_KEY_LEN];
-} topic_key;
+#include "e4c_common_storage.h"
 
 typedef struct _e4_device_key
 {
     uint8_t id[E4_ID_LEN];
     uint8_t pubkey[E4_PK_EDDSA_PUBKEY_LEN];
 } device_key;
 
-struct _e4storage
+typedef struct _e4storage_pubkey
 {
     /* These fields are persisted by the sync command */
     uint8_t id[E4_ID_LEN];
@@ -67,6 +62,6 @@ struct _e4storage
     /* These fields are set at run time only */
     char filepath[E4_MAX_PATH + 1];
     uint8_t ctrltopic[E4_TOPICHASH_LEN];
-};
+} e4storage_pubkey;
 
 #endif

include/e4/internal/e4c_pk_store_mem.h

@@ -16,13 +16,14 @@
  * limitations under the License.
  */
 
-#include <fcntl.h>
+
 
 #ifndef _E4C_STORE_FILE_H_
 #define _E4C_STORE_FILE_H_
 
 #include <stddef.h>
 #include <stdint.h>
+#include <fcntl.h>
 
 #ifndef E4_TOPICS_MAX
 #define E4_TOPICS_MAX 100
@@ -31,15 +32,9 @@
 #define E4_MAX_PATH 255
 
 /* In memory structures that represent the file. */
+#include "e4c_common_storage.h"
 
-typedef struct
-{
-    uint8_t topic[E4_TOPICHASH_LEN];
-    uint8_t key[E4_KEY_LEN];
-} topic_key;
-
-
-struct _e4storage
+typedef struct _e4storage_symkey
 {
     /* These fields are persisted by the sync command */
     uint8_t id[E4_ID_LEN];
@@ -50,6 +45,6 @@ struct _e4storage
     /* These fields are set at run time only */
     char filepath[E4_MAX_PATH + 1];
     uint8_t ctrltopic[E4_TOPICHASH_LEN];
-};
+} e4storage_symkey;
 
 #endif