Track API changes to sequoia.

Makefile.conf

@@ -93,7 +93,7 @@ else ifeq ($(BUILD_FOR),Darwin)
 endif
 
 ifeq ($(BUILD_FOR),Linux)
-    CFLAGS=-fPIC -fstrict-aliasing -fdiagnostics-color=always
+    CFLAGS=-fPIC -fstrict-aliasing -fdiagnostics-color=auto
 else ifeq ($(BUILD_FOR),Darwin)
     CFLAGS=-pthread -fPIC -fstrict-aliasing -fcolor-diagnostics
 endif
@@ -148,7 +148,7 @@ endif
 # The flag -DNDEBUG will always be removed from CXXFLAGS for compiling tests.
 # The tests do not work properly, if compiled with -DNDEBUG
 ifeq ($(BUILD_FOR),Linux)
-    CXXFLAGS=-fdiagnostics-color=always -I../src -I../asn.1 $(ETPAN_INC)
+    CXXFLAGS=-fdiagnostics-color=auto -I../src -I../asn.1 $(ETPAN_INC)
     ifdef WARN
         CXXFLAGS+=
     else

src/pEp_internal.h

@@ -143,17 +143,17 @@ struct _pEpSession {
         sqlite3_stmt *begin_transaction;
         sqlite3_stmt *commit_transaction;
         sqlite3_stmt *rollback_transaction;
-        sqlite3_stmt *tpk_find;
+        sqlite3_stmt *cert_find;
         sqlite3_stmt *tsk_find;
-        sqlite3_stmt *tpk_find_by_keyid;
+        sqlite3_stmt *cert_find_by_keyid;
         sqlite3_stmt *tsk_find_by_keyid;
-        sqlite3_stmt *tpk_find_by_email;
+        sqlite3_stmt *cert_find_by_email;
         sqlite3_stmt *tsk_find_by_email;
-        sqlite3_stmt *tpk_all;
+        sqlite3_stmt *cert_all;
         sqlite3_stmt *tsk_all;
-        sqlite3_stmt *tpk_save_insert_primary;
-        sqlite3_stmt *tpk_save_insert_subkeys;
-        sqlite3_stmt *tpk_save_insert_userids;
+        sqlite3_stmt *cert_save_insert_primary;
+        sqlite3_stmt *cert_save_insert_subkeys;
+        sqlite3_stmt *cert_save_insert_userids;
         sqlite3_stmt *delete_keypair;
     } sq_sql;
 #endif

test/Makefile

@@ -113,7 +113,7 @@ $(TARGET): $(OBJS)
 
 test: all
 	$(RM) -rf ./pEp_test_home/*
-	$(TEST_CMD_PFX) $(TEST_DEBUGGER) python3 $(GTEST_PL) ./$(TARGET)
+	$(TEST_CMD_PFX) $(TEST_DEBUGGER) GTEST_COLOR=no python3 $(GTEST_PL) --gtest_color=no ./$(TARGET)
 clean:
 	$(RM) $(TARGET) $(TARGET).o $(TARGET).d $(OBJS) $(notdir $(basename $(OBJS))) $(DEPS)
 	$(RM) -rf ./pEp_test_home/*