Added field mapping for the certificates table

2 files changed, 39 insertions, 27 deletions

diff --git a/database/eurephiadb_mapping.h b/database/eurephiadb_mapping.h
index c9db782..2f18248 100644
--- a/database/eurephiadb_mapping.h
+++ b/database/eurephiadb_mapping.h
@@ -48,30 +48,31 @@ extern const char *SESSION_STATUS[];
 #define TABLE_ATTEMPTS      0x04
 #define TABLE_BLACKLIST     0x05
 
-#define FIELD_NONE        0x00000
-#define FIELD_RECID       0x00001  // Primary keys
-#define FIELD_UID         0x00002
-#define FIELD_CERTID      0x00004
-#define FIELD_UNAME       0x00008
-#define FIELD_ACTIVATED   0x00010
-#define FIELD_DEACTIVATED 0x00020
-#define FIELD_LASTACCESS  0x00040
-
-#define FIELD_CERTDEPTH   0x00080
-#define FIELD_CNAME       0x00100
-#define FIELD_EMAIL       0x00200
-#define FIELD_ORG         0x00400
-#define FIELD_REGISTERED  0x00800
-
-#define FIELD_REMOTEIP    0x01000
-#define FIELD_VPNIP       0x02000
-#define FIELD_ATTEMPTS    0x04000
-#define FIELD_LASTATTEMPT 0x08000
-
-#define FIELD_SESSTATUS   0x10000
-#define FIELD_LOGIN       0x20000
-#define FIELD_LOGOUT      0x40000
-#define FIELD_PASSWD      0x80000
+#define FIELD_NONE        0x000000
+#define FIELD_RECID       0x000001  // Primary keys
+#define FIELD_UID         0x000002
+#define FIELD_CERTID      0x000004
+#define FIELD_UNAME       0x000008
+#define FIELD_ACTIVATED   0x000010
+#define FIELD_DEACTIVATED 0x000020
+#define FIELD_LASTACCESS  0x000040
+
+#define FIELD_CERTDEPTH   0x000080
+#define FIELD_CNAME       0x000100
+#define FIELD_EMAIL       0x000200
+#define FIELD_ORG         0x000400
+#define FIELD_REGISTERED  0x000800
+
+#define FIELD_REMOTEIP    0x001000
+#define FIELD_VPNIP       0x002000
+#define FIELD_ATTEMPTS    0x004000
+#define FIELD_LASTATTEMPT 0x008000
+
+#define FIELD_SESSTATUS   0x010000
+#define FIELD_LOGIN       0x020000
+#define FIELD_LOGOUT      0x040000
+#define FIELD_PASSWD      0x080000
+#define FIELD_CERTDIGEST  0x100000
 
 #ifdef EUREPHIADB_MAPPING_C
 
@@ -86,10 +87,10 @@ static eDBfieldMap eTblMap_user[] = {
 };
 
 static eDBfieldMap eTblMap_certificates[] = {
-        {TABLE_CERTS, NULL, FIELD_RECID,       ft_INT,      "id"},
-        {TABLE_CERTS, NULL, FIELD_CERTID,      ft_INT,      "certid"},
+        {TABLE_CERTS, NULL, FIELD_RECID,       ft_INT,      "certid"},
         {TABLE_CERTS, NULL, FIELD_CERTDEPTH,   ft_INT,      "depth"},
-        {TABLE_CERTS, NULL, FIELD_CNAME,       ft_STRING,   "name"},
+        {TABLE_CERTS, NULL, FIELD_CERTDIGEST,  ft_STRING,   "digest"},
+        {TABLE_CERTS, NULL, FIELD_CNAME,       ft_STRING,   "common_name"},
         {TABLE_CERTS, NULL, FIELD_ORG,         ft_STRING,   "org"},
         {TABLE_CERTS, NULL, FIELD_EMAIL,       ft_STRING,   "email"},
         {TABLE_CERTS, NULL, FIELD_REGISTERED,  ft_DATETIME, "registered"},
diff --git a/database/sqlite/fieldmapping.h b/database/sqlite/fieldmapping.h
index e1b9d3a..c08ecac 100644
--- a/database/sqlite/fieldmapping.h
+++ b/database/sqlite/fieldmapping.h
@@ -32,4 +32,15 @@ static eDBfieldMap tbl_sqlite_users[] = {
         {0, NULL, FIELD_NONE, ft_UNDEF, NULL, NULL, NULL}
 };
 
+static eDBfieldMap tbl_sqlite_certs[] = {
+        {TABLE_CERTS, NULL, FIELD_RECID,       ft_INT,      "certid",        NULL, NULL},
+        {TABLE_CERTS, NULL, FIELD_CERTDEPTH,   ft_INT,      "depth",         NULL, NULL},
+        {TABLE_CERTS, NULL, FIELD_CERTDIGEST,  ft_STRING,   "digest",        NULL, NULL},
+        {TABLE_CERTS, NULL, FIELD_CNAME,       ft_STRING,   "common_name",   NULL, NULL},
+        {TABLE_CERTS, NULL, FIELD_ORG,         ft_STRING,   "organisation",  NULL, NULL},
+        {TABLE_CERTS, NULL, FIELD_EMAIL,       ft_STRING,   "email",         NULL, NULL},
+        {TABLE_CERTS, NULL, FIELD_REGISTERED,  ft_DATETIME, "registered",    NULL, NULL},
+        {0, NULL, FIELD_NONE, ft_UNDEF, NULL, NULL, NULL}
+};
+
 #endif 	    /* !FIELDMAPPING_H_ */