Browse Source

Track API changes to sequoia.

ENGINE-659-gpg
Neal Walfield 2 years ago
parent
commit
348e69bab7
4 changed files with 332 additions and 331 deletions
  1. +2
    -2
      Makefile.conf
  2. +7
    -7
      src/pEp_internal.h
  3. +322
    -321
      src/pgp_sequoia.c
  4. +1
    -1
      test/Makefile

+ 2
- 2
Makefile.conf View File

@ -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


+ 7
- 7
src/pEp_internal.h View File

@ -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


+ 322
- 321
src/pgp_sequoia.c
File diff suppressed because it is too large
View File


+ 1
- 1
test/Makefile View File

@ -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/*


Loading…
Cancel
Save