move this to an extra file and make it optional sync
authorVolker Birk <vb@pep-project.org>
Sat, 04 May 2019 01:45:09 +0200
branchsync
changeset 3621fcd469228e71
parent 3615 37782ea8068a
child 3622 b23882c843cd
move this to an extra file and make it optional
src/pEpEngine.h
src/pEp_status_to_string.h
src/pgp_sequoia.c
     1.1 --- a/src/pEpEngine.h	Fri May 03 12:43:21 2019 +0200
     1.2 +++ b/src/pEpEngine.h	Sat May 04 01:45:09 2019 +0200
     1.3 @@ -167,104 +167,6 @@
     1.4  
     1.5  typedef int (*inject_sync_event_t)(SYNC_EVENT ev, void *management);
     1.6  
     1.7 -static inline const char *pep_status_to_string(PEP_STATUS status) {
     1.8 -    switch (status) {
     1.9 -    case PEP_STATUS_OK: return "PEP_STATUS_OK";
    1.10 -
    1.11 -    case PEP_INIT_CANNOT_LOAD_GPGME: return "PEP_INIT_CANNOT_LOAD_GPGME";
    1.12 -    case PEP_INIT_GPGME_INIT_FAILED: return "PEP_INIT_GPGME_INIT_FAILED";
    1.13 -    case PEP_INIT_NO_GPG_HOME: return "PEP_INIT_NO_GPG_HOME";
    1.14 -    case PEP_INIT_NETPGP_INIT_FAILED: return "PEP_INIT_NETPGP_INIT_FAILED";
    1.15 -    case PEP_INIT_CANNOT_DETERMINE_GPG_VERSION: return "PEP_INIT_CANNOT_DETERMINE_GPG_VERSION";
    1.16 -    case PEP_INIT_UNSUPPORTED_GPG_VERSION: return "PEP_INIT_UNSUPPORTED_GPG_VERSION";
    1.17 -    case PEP_INIT_CANNOT_CONFIG_GPG_AGENT: return "PEP_INIT_CANNOT_CONFIG_GPG_AGENT";
    1.18 -    case PEP_INIT_SQLITE3_WITHOUT_MUTEX: return "PEP_INIT_SQLITE3_WITHOUT_MUTEX";
    1.19 -    case PEP_INIT_CANNOT_OPEN_DB: return "PEP_INIT_CANNOT_OPEN_DB";
    1.20 -    case PEP_INIT_CANNOT_OPEN_SYSTEM_DB: return "PEP_INIT_CANNOT_OPEN_SYSTEM_DB";
    1.21 -    case PEP_UNKNOWN_DB_ERROR: return "PEP_UNKNOWN_DB_ERROR";
    1.22 -    case PEP_KEY_NOT_FOUND: return "PEP_KEY_NOT_FOUND";
    1.23 -    case PEP_KEY_HAS_AMBIG_NAME: return "PEP_KEY_HAS_AMBIG_NAME";
    1.24 -    case PEP_GET_KEY_FAILED: return "PEP_GET_KEY_FAILED";
    1.25 -    case PEP_CANNOT_EXPORT_KEY: return "PEP_CANNOT_EXPORT_KEY";
    1.26 -    case PEP_CANNOT_EDIT_KEY: return "PEP_CANNOT_EDIT_KEY";
    1.27 -    case PEP_KEY_UNSUITABLE: return "PEP_KEY_UNSUITABLE";
    1.28 -    case PEP_MALFORMED_KEY_RESET_MSG: return "PEP_MALFORMED_KEY_RESET_MSG";
    1.29 -    case PEP_KEY_NOT_RESET: return "PEP_KEY_NOT_RESET";
    1.30 -
    1.31 -    case PEP_KEY_IMPORTED: return "PEP_KEY_IMPORTED";
    1.32 -    case PEP_NO_KEY_IMPORTED: return "PEP_NO_KEY_IMPORTED";
    1.33 -    case PEP_KEY_IMPORT_STATUS_UNKNOWN: return "PEP_KEY_IMPORT_STATUS_UNKNOWN";
    1.34 -    
    1.35 -    case PEP_CANNOT_FIND_IDENTITY: return "PEP_CANNOT_FIND_IDENTITY";
    1.36 -    case PEP_CANNOT_SET_PERSON: return "PEP_CANNOT_SET_PERSON";
    1.37 -    case PEP_CANNOT_SET_PGP_KEYPAIR: return "PEP_CANNOT_SET_PGP_KEYPAIR";
    1.38 -    case PEP_CANNOT_SET_IDENTITY: return "PEP_CANNOT_SET_IDENTITY";
    1.39 -    case PEP_CANNOT_SET_TRUST: return "PEP_CANNOT_SET_TRUST";
    1.40 -    case PEP_KEY_BLACKLISTED: return "PEP_KEY_BLACKLISTED";
    1.41 -    case PEP_CANNOT_FIND_PERSON: return "PEP_CANNOT_FIND_PERSON";
    1.42 -
    1.43 -    case PEP_CANNOT_FIND_ALIAS: return "PEP_CANNOT_FIND_ALIAS";
    1.44 -    case PEP_CANNOT_SET_ALIAS: return "PEP_CANNOT_SET_ALIAS";
    1.45 -
    1.46 -    case PEP_UNENCRYPTED: return "PEP_UNENCRYPTED";
    1.47 -    case PEP_VERIFIED: return "PEP_VERIFIED";
    1.48 -    case PEP_DECRYPTED: return "PEP_DECRYPTED";
    1.49 -    case PEP_DECRYPTED_AND_VERIFIED: return "PEP_DECRYPTED_AND_VERIFIED";
    1.50 -    case PEP_DECRYPT_WRONG_FORMAT: return "PEP_DECRYPT_WRONG_FORMAT";
    1.51 -    case PEP_DECRYPT_NO_KEY: return "PEP_DECRYPT_NO_KEY";
    1.52 -    case PEP_DECRYPT_SIGNATURE_DOES_NOT_MATCH: return "PEP_DECRYPT_SIGNATURE_DOES_NOT_MATCH";
    1.53 -    case PEP_VERIFY_NO_KEY: return "PEP_VERIFY_NO_KEY";
    1.54 -    case PEP_VERIFIED_AND_TRUSTED: return "PEP_VERIFIED_AND_TRUSTED";
    1.55 -    case PEP_CANNOT_REENCRYPT: return "PEP_CANNOT_REENCRYPT";
    1.56 -    case PEP_CANNOT_DECRYPT_UNKNOWN: return "PEP_CANNOT_DECRYPT_UNKNOWN";
    1.57 -
    1.58 -    case PEP_TRUSTWORD_NOT_FOUND: return "PEP_TRUSTWORD_NOT_FOUND";
    1.59 -    case PEP_TRUSTWORDS_FPR_WRONG_LENGTH: return "PEP_TRUSTWORDS_FPR_WRONG_LENGTH";
    1.60 -    case PEP_TRUSTWORDS_DUPLICATE_FPR: return "PEP_TRUSTWORDS_DUPLICATE_FPR";
    1.61 -
    1.62 -    case PEP_CANNOT_CREATE_KEY: return "PEP_CANNOT_CREATE_KEY";
    1.63 -    case PEP_CANNOT_SEND_KEY: return "PEP_CANNOT_SEND_KEY";
    1.64 -
    1.65 -    case PEP_PHRASE_NOT_FOUND: return "PEP_PHRASE_NOT_FOUND";
    1.66 -
    1.67 -    case PEP_SEND_FUNCTION_NOT_REGISTERED: return "PEP_SEND_FUNCTION_NOT_REGISTERED";
    1.68 -    case PEP_CONTRAINTS_VIOLATED: return "PEP_CONTRAINTS_VIOLATED";
    1.69 -    case PEP_CANNOT_ENCODE: return "PEP_CANNOT_ENCODE";
    1.70 -
    1.71 -    case PEP_SYNC_NO_NOTIFY_CALLBACK: return "PEP_SYNC_NO_NOTIFY_CALLBACK";
    1.72 -    case PEP_SYNC_ILLEGAL_MESSAGE: return "PEP_SYNC_ILLEGAL_MESSAGE";
    1.73 -    case PEP_SYNC_NO_INJECT_CALLBACK: return "PEP_SYNC_NO_INJECT_CALLBACK";
    1.74 -    case PEP_SYNC_NO_CHANNEL: return "PEP_SYNC_NO_CHANNEL";
    1.75 -    case PEP_SYNC_CANNOT_ENCRYPT: return "PEP_SYNC_CANNOT_ENCRYPT";
    1.76 -    case PEP_SYNC_NO_MESSAGE_SEND_CALLBACK: return "PEP_SYNC_NO_MESSAGE_SEND_CALLBACK";
    1.77 -
    1.78 -    case PEP_CANNOT_INCREASE_SEQUENCE: return "PEP_CANNOT_INCREASE_SEQUENCE";
    1.79 -
    1.80 -    case PEP_STATEMACHINE_ERROR: return "PEP_STATEMACHINE_ERROR";
    1.81 -    case PEP_NO_TRUST: return "PEP_NO_TRUST";
    1.82 -    case PEP_STATEMACHINE_INVALID_STATE: return "PEP_STATEMACHINE_INVALID_STATE";
    1.83 -    case PEP_STATEMACHINE_INVALID_EVENT: return "PEP_STATEMACHINE_INVALID_EVENT";
    1.84 -    case PEP_STATEMACHINE_INVALID_CONDITION: return "PEP_STATEMACHINE_INVALID_CONDITION";
    1.85 -    case PEP_STATEMACHINE_INVALID_ACTION: return "PEP_STATEMACHINE_INVALID_ACTION";
    1.86 -    case PEP_STATEMACHINE_INHIBITED_EVENT: return "PEP_STATEMACHINE_INHIBITED_EVENT";
    1.87 -    case PEP_STATEMACHINE_CANNOT_SEND: return "PEP_STATEMACHINE_CANNOT_SEND";
    1.88 -
    1.89 -    case PEP_COMMIT_FAILED: return "PEP_COMMIT_FAILED";
    1.90 -    case PEP_MESSAGE_CONSUME: return "PEP_MESSAGE_CONSUME";
    1.91 -    case PEP_MESSAGE_IGNORE: return "PEP_MESSAGE_IGNORE";
    1.92 -
    1.93 -    case PEP_RECORD_NOT_FOUND: return "PEP_RECORD_NOT_FOUND";
    1.94 -    case PEP_CANNOT_CREATE_TEMP_FILE: return "PEP_CANNOT_CREATE_TEMP_FILE";
    1.95 -    case PEP_ILLEGAL_VALUE: return "PEP_ILLEGAL_VALUE";
    1.96 -    case PEP_BUFFER_TOO_SMALL: return "PEP_BUFFER_TOO_SMALL";
    1.97 -    case PEP_OUT_OF_MEMORY: return "PEP_OUT_OF_MEMORY";
    1.98 -    case PEP_UNKNOWN_ERROR: return "PEP_UNKNOWN_ERROR";
    1.99 -
   1.100 -    case PEP_VERSION_MISMATCH: return "PEP_VERSION_MISMATCH";
   1.101 -
   1.102 -    default: return "unknown status code";
   1.103 -    }
   1.104 -}
   1.105  
   1.106  // INIT_STATUS init() - initialize pEpEngine for a thread
   1.107  //
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/src/pEp_status_to_string.h	Sat May 04 01:45:09 2019 +0200
     2.3 @@ -0,0 +1,109 @@
     2.4 +#pragma once
     2.5 +
     2.6 +#ifdef __cplusplus
     2.7 +"C" {
     2.8 +#endif
     2.9 +
    2.10 +static inline const char *pep_status_to_string(PEP_STATUS status) {
    2.11 +    switch (status) {
    2.12 +    case PEP_STATUS_OK: return "PEP_STATUS_OK";
    2.13 +
    2.14 +    case PEP_INIT_CANNOT_LOAD_GPGME: return "PEP_INIT_CANNOT_LOAD_GPGME";
    2.15 +    case PEP_INIT_GPGME_INIT_FAILED: return "PEP_INIT_GPGME_INIT_FAILED";
    2.16 +    case PEP_INIT_NO_GPG_HOME: return "PEP_INIT_NO_GPG_HOME";
    2.17 +    case PEP_INIT_NETPGP_INIT_FAILED: return "PEP_INIT_NETPGP_INIT_FAILED";
    2.18 +    case PEP_INIT_CANNOT_DETERMINE_GPG_VERSION: return "PEP_INIT_CANNOT_DETERMINE_GPG_VERSION";
    2.19 +    case PEP_INIT_UNSUPPORTED_GPG_VERSION: return "PEP_INIT_UNSUPPORTED_GPG_VERSION";
    2.20 +    case PEP_INIT_CANNOT_CONFIG_GPG_AGENT: return "PEP_INIT_CANNOT_CONFIG_GPG_AGENT";
    2.21 +    case PEP_INIT_SQLITE3_WITHOUT_MUTEX: return "PEP_INIT_SQLITE3_WITHOUT_MUTEX";
    2.22 +    case PEP_INIT_CANNOT_OPEN_DB: return "PEP_INIT_CANNOT_OPEN_DB";
    2.23 +    case PEP_INIT_CANNOT_OPEN_SYSTEM_DB: return "PEP_INIT_CANNOT_OPEN_SYSTEM_DB";
    2.24 +    case PEP_UNKNOWN_DB_ERROR: return "PEP_UNKNOWN_DB_ERROR";
    2.25 +    case PEP_KEY_NOT_FOUND: return "PEP_KEY_NOT_FOUND";
    2.26 +    case PEP_KEY_HAS_AMBIG_NAME: return "PEP_KEY_HAS_AMBIG_NAME";
    2.27 +    case PEP_GET_KEY_FAILED: return "PEP_GET_KEY_FAILED";
    2.28 +    case PEP_CANNOT_EXPORT_KEY: return "PEP_CANNOT_EXPORT_KEY";
    2.29 +    case PEP_CANNOT_EDIT_KEY: return "PEP_CANNOT_EDIT_KEY";
    2.30 +    case PEP_KEY_UNSUITABLE: return "PEP_KEY_UNSUITABLE";
    2.31 +    case PEP_MALFORMED_KEY_RESET_MSG: return "PEP_MALFORMED_KEY_RESET_MSG";
    2.32 +    case PEP_KEY_NOT_RESET: return "PEP_KEY_NOT_RESET";
    2.33 +
    2.34 +    case PEP_KEY_IMPORTED: return "PEP_KEY_IMPORTED";
    2.35 +    case PEP_NO_KEY_IMPORTED: return "PEP_NO_KEY_IMPORTED";
    2.36 +    case PEP_KEY_IMPORT_STATUS_UNKNOWN: return "PEP_KEY_IMPORT_STATUS_UNKNOWN";
    2.37 +    
    2.38 +    case PEP_CANNOT_FIND_IDENTITY: return "PEP_CANNOT_FIND_IDENTITY";
    2.39 +    case PEP_CANNOT_SET_PERSON: return "PEP_CANNOT_SET_PERSON";
    2.40 +    case PEP_CANNOT_SET_PGP_KEYPAIR: return "PEP_CANNOT_SET_PGP_KEYPAIR";
    2.41 +    case PEP_CANNOT_SET_IDENTITY: return "PEP_CANNOT_SET_IDENTITY";
    2.42 +    case PEP_CANNOT_SET_TRUST: return "PEP_CANNOT_SET_TRUST";
    2.43 +    case PEP_KEY_BLACKLISTED: return "PEP_KEY_BLACKLISTED";
    2.44 +    case PEP_CANNOT_FIND_PERSON: return "PEP_CANNOT_FIND_PERSON";
    2.45 +
    2.46 +    case PEP_CANNOT_FIND_ALIAS: return "PEP_CANNOT_FIND_ALIAS";
    2.47 +    case PEP_CANNOT_SET_ALIAS: return "PEP_CANNOT_SET_ALIAS";
    2.48 +
    2.49 +    case PEP_UNENCRYPTED: return "PEP_UNENCRYPTED";
    2.50 +    case PEP_VERIFIED: return "PEP_VERIFIED";
    2.51 +    case PEP_DECRYPTED: return "PEP_DECRYPTED";
    2.52 +    case PEP_DECRYPTED_AND_VERIFIED: return "PEP_DECRYPTED_AND_VERIFIED";
    2.53 +    case PEP_DECRYPT_WRONG_FORMAT: return "PEP_DECRYPT_WRONG_FORMAT";
    2.54 +    case PEP_DECRYPT_NO_KEY: return "PEP_DECRYPT_NO_KEY";
    2.55 +    case PEP_DECRYPT_SIGNATURE_DOES_NOT_MATCH: return "PEP_DECRYPT_SIGNATURE_DOES_NOT_MATCH";
    2.56 +    case PEP_VERIFY_NO_KEY: return "PEP_VERIFY_NO_KEY";
    2.57 +    case PEP_VERIFIED_AND_TRUSTED: return "PEP_VERIFIED_AND_TRUSTED";
    2.58 +    case PEP_CANNOT_REENCRYPT: return "PEP_CANNOT_REENCRYPT";
    2.59 +    case PEP_CANNOT_DECRYPT_UNKNOWN: return "PEP_CANNOT_DECRYPT_UNKNOWN";
    2.60 +
    2.61 +    case PEP_TRUSTWORD_NOT_FOUND: return "PEP_TRUSTWORD_NOT_FOUND";
    2.62 +    case PEP_TRUSTWORDS_FPR_WRONG_LENGTH: return "PEP_TRUSTWORDS_FPR_WRONG_LENGTH";
    2.63 +    case PEP_TRUSTWORDS_DUPLICATE_FPR: return "PEP_TRUSTWORDS_DUPLICATE_FPR";
    2.64 +
    2.65 +    case PEP_CANNOT_CREATE_KEY: return "PEP_CANNOT_CREATE_KEY";
    2.66 +    case PEP_CANNOT_SEND_KEY: return "PEP_CANNOT_SEND_KEY";
    2.67 +
    2.68 +    case PEP_PHRASE_NOT_FOUND: return "PEP_PHRASE_NOT_FOUND";
    2.69 +
    2.70 +    case PEP_SEND_FUNCTION_NOT_REGISTERED: return "PEP_SEND_FUNCTION_NOT_REGISTERED";
    2.71 +    case PEP_CONTRAINTS_VIOLATED: return "PEP_CONTRAINTS_VIOLATED";
    2.72 +    case PEP_CANNOT_ENCODE: return "PEP_CANNOT_ENCODE";
    2.73 +
    2.74 +    case PEP_SYNC_NO_NOTIFY_CALLBACK: return "PEP_SYNC_NO_NOTIFY_CALLBACK";
    2.75 +    case PEP_SYNC_ILLEGAL_MESSAGE: return "PEP_SYNC_ILLEGAL_MESSAGE";
    2.76 +    case PEP_SYNC_NO_INJECT_CALLBACK: return "PEP_SYNC_NO_INJECT_CALLBACK";
    2.77 +    case PEP_SYNC_NO_CHANNEL: return "PEP_SYNC_NO_CHANNEL";
    2.78 +    case PEP_SYNC_CANNOT_ENCRYPT: return "PEP_SYNC_CANNOT_ENCRYPT";
    2.79 +    case PEP_SYNC_NO_MESSAGE_SEND_CALLBACK: return "PEP_SYNC_NO_MESSAGE_SEND_CALLBACK";
    2.80 +
    2.81 +    case PEP_CANNOT_INCREASE_SEQUENCE: return "PEP_CANNOT_INCREASE_SEQUENCE";
    2.82 +
    2.83 +    case PEP_STATEMACHINE_ERROR: return "PEP_STATEMACHINE_ERROR";
    2.84 +    case PEP_NO_TRUST: return "PEP_NO_TRUST";
    2.85 +    case PEP_STATEMACHINE_INVALID_STATE: return "PEP_STATEMACHINE_INVALID_STATE";
    2.86 +    case PEP_STATEMACHINE_INVALID_EVENT: return "PEP_STATEMACHINE_INVALID_EVENT";
    2.87 +    case PEP_STATEMACHINE_INVALID_CONDITION: return "PEP_STATEMACHINE_INVALID_CONDITION";
    2.88 +    case PEP_STATEMACHINE_INVALID_ACTION: return "PEP_STATEMACHINE_INVALID_ACTION";
    2.89 +    case PEP_STATEMACHINE_INHIBITED_EVENT: return "PEP_STATEMACHINE_INHIBITED_EVENT";
    2.90 +    case PEP_STATEMACHINE_CANNOT_SEND: return "PEP_STATEMACHINE_CANNOT_SEND";
    2.91 +
    2.92 +    case PEP_COMMIT_FAILED: return "PEP_COMMIT_FAILED";
    2.93 +    case PEP_MESSAGE_CONSUME: return "PEP_MESSAGE_CONSUME";
    2.94 +    case PEP_MESSAGE_IGNORE: return "PEP_MESSAGE_IGNORE";
    2.95 +
    2.96 +    case PEP_RECORD_NOT_FOUND: return "PEP_RECORD_NOT_FOUND";
    2.97 +    case PEP_CANNOT_CREATE_TEMP_FILE: return "PEP_CANNOT_CREATE_TEMP_FILE";
    2.98 +    case PEP_ILLEGAL_VALUE: return "PEP_ILLEGAL_VALUE";
    2.99 +    case PEP_BUFFER_TOO_SMALL: return "PEP_BUFFER_TOO_SMALL";
   2.100 +    case PEP_OUT_OF_MEMORY: return "PEP_OUT_OF_MEMORY";
   2.101 +    case PEP_UNKNOWN_ERROR: return "PEP_UNKNOWN_ERROR";
   2.102 +
   2.103 +    case PEP_VERSION_MISMATCH: return "PEP_VERSION_MISMATCH";
   2.104 +
   2.105 +    default: return "unknown status code";
   2.106 +    }
   2.107 +}
   2.108 +
   2.109 +#ifdef __cplusplus
   2.110 +} // "C"
   2.111 +#endif
   2.112 +
     3.1 --- a/src/pgp_sequoia.c	Fri May 03 12:43:21 2019 +0200
     3.2 +++ b/src/pgp_sequoia.c	Sat May 04 01:45:09 2019 +0200
     3.3 @@ -26,6 +26,7 @@
     3.4  
     3.5  // enable tracing if in debugging mode
     3.6  #if TRACING
     3.7 +#include "pEp_status_to_string.h"
     3.8  #  define _T(...) do {                          \
     3.9          fprintf(stderr, ##__VA_ARGS__);         \
    3.10      } while (0)
    3.11 @@ -53,7 +54,7 @@
    3.12          _T("Sequoia: %s => ", pgp_error_to_string(__de_err));   \
    3.13          pgp_error_free(__de_err);                               \
    3.14      }                                                           \
    3.15 -    _T("%s\n", pep_status_to_string(__de_status));              \
    3.16 +    _T("%s\n", pEp_status_to_string(__de_status));              \
    3.17  } while(0)
    3.18  
    3.19  // If __ec_status is an error, then disable the error, set 'status' to
    3.20 @@ -401,7 +402,7 @@
    3.21      }
    3.22  
    3.23   out:
    3.24 -    T(" -> %s", pep_status_to_string(status));
    3.25 +    T(" -> %s", pEp_status_to_string(status));
    3.26      return status;
    3.27  }
    3.28  
    3.29 @@ -446,7 +447,7 @@
    3.30          *tpks_countp = tpks_count;
    3.31      }
    3.32  
    3.33 -    T(" -> %s (%d tpks)", pep_status_to_string(status), *tpks_countp);
    3.34 +    T(" -> %s (%d tpks)", pEp_status_to_string(status), *tpks_countp);
    3.35      return status;
    3.36  }
    3.37  
    3.38 @@ -473,7 +474,7 @@
    3.39  
    3.40   out:
    3.41      sqlite3_reset(stmt);
    3.42 -    T("(%s, %d) -> %s", fpr_str, private_only, pep_status_to_string(status));
    3.43 +    T("(%s, %d) -> %s", fpr_str, private_only, pEp_status_to_string(status));
    3.44      free(fpr_str);
    3.45      return status;
    3.46  }
    3.47 @@ -507,7 +508,7 @@
    3.48  
    3.49   out:
    3.50      sqlite3_reset(stmt);
    3.51 -    T("(%s, %d) -> %s", keyid_hex, private_only, pep_status_to_string(status));
    3.52 +    T("(%s, %d) -> %s", keyid_hex, private_only, pEp_status_to_string(status));
    3.53      return status;
    3.54  }
    3.55  
    3.56 @@ -594,7 +595,7 @@
    3.57  
    3.58   out:
    3.59      sqlite3_reset(stmt);
    3.60 -    T("(%s) -> %s (%d results)", pattern, pep_status_to_string(status), *countp);
    3.61 +    T("(%s) -> %s (%d results)", pattern, pEp_status_to_string(status), *countp);
    3.62      return status;
    3.63  }
    3.64  
    3.65 @@ -768,7 +769,7 @@
    3.66                        sqlite3_errmsg(session->key_db));
    3.67      }
    3.68  
    3.69 -    T("(%s) -> %s", fpr, pep_status_to_string(status));
    3.70 +    T("(%s) -> %s", fpr, pEp_status_to_string(status));
    3.71  
    3.72      if (user_id_iter)
    3.73          pgp_user_id_binding_iter_free(user_id_iter);
    3.74 @@ -1170,7 +1171,7 @@
    3.75      if (writer)
    3.76          pgp_writer_free(writer);
    3.77  
    3.78 -    T("-> %s", pep_status_to_string(status));
    3.79 +    T("-> %s", pEp_status_to_string(status));
    3.80      return status;
    3.81  }
    3.82  
    3.83 @@ -1259,7 +1260,7 @@
    3.84      if (dsig_reader)
    3.85          pgp_reader_free(dsig_reader);
    3.86  
    3.87 -    T("-> %s", pep_status_to_string(status));
    3.88 +    T("-> %s", pEp_status_to_string(status));
    3.89      return status;
    3.90  }
    3.91  
    3.92 @@ -1350,7 +1351,7 @@
    3.93      if (signer_tpk)
    3.94          pgp_tpk_free(signer_tpk);
    3.95  
    3.96 -    T("(%s)-> %s", fpr, pep_status_to_string(status));
    3.97 +    T("(%s)-> %s", fpr, pEp_status_to_string(status));
    3.98      return status;
    3.99  }
   3.100  
   3.101 @@ -1474,7 +1475,7 @@
   3.102          pgp_tpk_free(keys[i]);
   3.103      free(keys);
   3.104  
   3.105 -    T("-> %s", pep_status_to_string(status));
   3.106 +    T("-> %s", pEp_status_to_string(status));
   3.107      return status;
   3.108  }
   3.109  
   3.110 @@ -1555,7 +1556,7 @@
   3.111          pgp_tpk_free(tpk);
   3.112      free(userid);
   3.113  
   3.114 -    T("-> %s", pep_status_to_string(status));
   3.115 +    T("-> %s", pEp_status_to_string(status));
   3.116      return status;
   3.117  }
   3.118  
   3.119 @@ -1643,7 +1644,7 @@
   3.120      }
   3.121  
   3.122   out:
   3.123 -    T("-> %s", pep_status_to_string(status));
   3.124 +    T("-> %s", pEp_status_to_string(status));
   3.125      return status;
   3.126  }
   3.127  
   3.128 @@ -1698,7 +1699,7 @@
   3.129      if (tpk)
   3.130          pgp_tpk_free(tpk);
   3.131  
   3.132 -    T("(%s) -> %s", fpr, pep_status_to_string(status));
   3.133 +    T("(%s) -> %s", fpr, pEp_status_to_string(status));
   3.134      return status;
   3.135  }
   3.136  
   3.137 @@ -1883,7 +1884,7 @@
   3.138          len = stringlist_length(*keylist);
   3.139      else if (keyinfo_list)
   3.140          len = stringpair_list_length(*keyinfo_list);
   3.141 -    T("(%s) -> %s (%d keys)", pattern, pep_status_to_string(status), len);
   3.142 +    T("(%s) -> %s (%d keys)", pattern, pEp_status_to_string(status), len);
   3.143      return status;
   3.144  }
   3.145  
   3.146 @@ -2074,7 +2075,7 @@
   3.147      if (tpk)
   3.148          pgp_tpk_free(tpk);
   3.149  
   3.150 -    T("(%s) -> %s", fpr, pep_status_to_string(status));
   3.151 +    T("(%s) -> %s", fpr, pEp_status_to_string(status));
   3.152      return status;
   3.153  }
   3.154  
   3.155 @@ -2135,7 +2136,7 @@
   3.156      if (tpk)
   3.157          pgp_tpk_free(tpk);
   3.158  
   3.159 -    T("(%s) -> %s", fpr, pep_status_to_string(status));
   3.160 +    T("(%s) -> %s", fpr, pEp_status_to_string(status));
   3.161      return status;
   3.162  }
   3.163  
   3.164 @@ -2192,7 +2193,7 @@
   3.165   out:
   3.166      if (tpk)
   3.167          pgp_tpk_free(tpk);
   3.168 -    T("(%s) -> %s", fpr, pep_status_to_string(status));
   3.169 +    T("(%s) -> %s", fpr, pEp_status_to_string(status));
   3.170      return status;
   3.171  }
   3.172  
   3.173 @@ -2220,7 +2221,7 @@
   3.174      pgp_tpk_free(tpk);
   3.175  
   3.176   out:
   3.177 -    T("(%s) -> %s", fpr, pep_status_to_string(status));
   3.178 +    T("(%s) -> %s", fpr, pEp_status_to_string(status));
   3.179      return status;
   3.180  }
   3.181  
   3.182 @@ -2242,7 +2243,7 @@
   3.183      pgp_tpk_free(tpk);
   3.184  
   3.185   out:
   3.186 -    T("(%s) -> %s", fpr, pep_status_to_string(status));
   3.187 +    T("(%s) -> %s", fpr, pEp_status_to_string(status));
   3.188      return status;
   3.189  }
   3.190  
   3.191 @@ -2266,6 +2267,6 @@
   3.192          status = PEP_STATUS_OK;
   3.193      }
   3.194      T("(%s) -> %s, %s",
   3.195 -      fpr, *has_private ? "priv" : "pub", pep_status_to_string(status));
   3.196 +      fpr, *has_private ? "priv" : "pub", pEp_status_to_string(status));
   3.197      return status;
   3.198  }