Browse Source

Oops. ENGINE-911: forgot to add files.

pull/27/head
Krista Bennett 1 year ago
parent
commit
ce6bc5822d
5 changed files with 9 additions and 255 deletions
  1. +1
    -0
      src/keymanagement.c
  2. +0
    -165
      src/keymanagement.h
  3. +2
    -0
      src/message_api.c
  4. +0
    -88
      src/message_api.h
  5. +6
    -2
      src/pEp_internal.h

+ 1
- 0
src/keymanagement.c View File

@ -15,6 +15,7 @@
#include "pEp_internal.h"
#include "keymanagement.h"
#include "keymanagement_internal.h"
#include "KeySync_fsm.h"
#include "blacklist.h"


+ 0
- 165
src/keymanagement.h View File

@ -126,30 +126,6 @@ DYNAMIC_API PEP_STATUS update_identity(
DYNAMIC_API PEP_STATUS myself(PEP_SESSION session, pEp_identity * identity);
/**
* <!-- _myself() -->
*
* @brief TODO
*
* @param[in] session session handle
* @param[in] identity pEp_identity*
* @param[in] do_keygen bool
* @param[in] do_renew bool
* @param[in] ignore_flags bool
* @param[in] read_only bool
*
* @retval PEP_STATUS_OK if identity could be completed or was already complete,
* @retval PEP_ILLEGAL_VALUE illegal parameter values
* @retval PEP_OUT_OF_MEMORY out of memory
* @retval any other value on error
*/
PEP_STATUS _myself(PEP_SESSION session,
pEp_identity * identity,
bool do_keygen,
bool do_renew,
bool ignore_flags,
bool read_only);
/**
* <!-- retrieve_next_identity() -->
*
@ -423,22 +399,6 @@ DYNAMIC_API PEP_STATUS own_identities_retrieve(
identity_list **own_identities
);
/**
* <!-- contains_priv_key() -->
*
* @brief TODO
*
* @param[in] session session handle
* @param[in] fpr const char*
* @param[in] has_private bool*
*
* @retval PEP_STATUS_OK
* @retval PEP_ILLEGAL_VALUE illegal parameter values
* @retval any other value on error
*/
PEP_STATUS contains_priv_key(PEP_SESSION session, const char *fpr,
bool *has_private);
/**
* <!-- _own_keys_retrieve() -->
*
@ -593,131 +553,6 @@ DYNAMIC_API PEP_STATUS set_own_imported_key(
*/
DYNAMIC_API PEP_STATUS clean_own_key_defaults(PEP_SESSION session);
/**
* <!-- get_all_keys_for_user() -->
*
* @brief TODO
*
* @param[in] session session handle
* @param[in] user_id const char*
* @param[in] keys stringlist_t**
*
*
* @retval PEP_STATUS_OK
* @retval PEP_KEY_NOT_FOUND
* @retval PEP_ILLEGAL_VALUE illegal parameter values
* @retval any other value on error
*/
PEP_STATUS get_all_keys_for_user(PEP_SESSION session,
const char* user_id,
stringlist_t** keys);
//PEP_STATUS _myself(PEP_SESSION session, pEp_identity * identity, bool do_keygen, bool ignore_flags);
/**
* <!-- add_mistrusted_key() -->
*
* @brief TODO
*
* @param[in] session session handle
* @param[in] fpr const char*
*
* @retval PEP_STATUS_OK
* @retval PEP_ILLEGAL_VALUE illegal parameter values
* @retval PEP_CANNOT_SET_PGP_KEYPAIR
*/
PEP_STATUS add_mistrusted_key(PEP_SESSION session, const char* fpr);
/**
* <!-- delete_mistrusted_key() -->
*
* @brief TODO
*
* @param[in] session session handle
* @param[in] fpr const char*
*
* @retval PEP_STATUS_OK
* @retval PEP_ILLEGAL_VALUE illegal parameter values
* @retval PEP_UNKNOWN_ERROR
*/
PEP_STATUS delete_mistrusted_key(PEP_SESSION session, const char* fpr);
/**
* <!-- is_mistrusted_key() -->
*
* @brief TODO
*
* @param[in] session session handle
* @param[in] fpr const char*
* @param[in] mistrusted bool*
*
* @retval PEP_STATUS_OK
* @retval PEP_ILLEGAL_VALUE illegal parameter values
* @retval PEP_UNKNOWN_ERROR
*/
PEP_STATUS is_mistrusted_key(PEP_SESSION session, const char* fpr, bool* mistrusted);
/**
* <!-- get_user_default_key() -->
*
* @brief TODO
*
* @param[in] session session handle
* @param[in] user_id const char*
* @param[in] default_key char**
*
* @retval PEP_STATUS_OK
* @retval PEP_ILLEGAL_VALUE illegal parameter values
* @retval PEP_GET_KEY_FAILED
*/
PEP_STATUS get_user_default_key(PEP_SESSION session, const char* user_id,
char** default_key);
// Only call on retrieval of previously stored identity!
// Also, we presume that if the stored_identity was sent in
// without an fpr, there wasn't one in the trust DB for this
// identity.
/**
* <!-- get_valid_pubkey() -->
*
* @brief TODO
*
* @param[in] session session handle
* @param[in] stored_identity pEp_identity*
* @param[in] is_identity_default bool*
* @param[in] is_user_default bool*
* @param[in] is_address_default bool*
* @param[in] check_blacklist bool
*
* @retval PEP_STATUS_OK
* @retval PEP_ILLEGAL_VALUE illegal parameter values
* @retval any other value on error
*/
PEP_STATUS get_valid_pubkey(PEP_SESSION session,
pEp_identity* stored_identity,
bool* is_identity_default,
bool* is_user_default,
bool* is_address_default,
bool check_blacklist);
/**
* <!-- get_key_sticky_bit_for_user() -->
*
* @brief Get value of sticky bit for this user and key
*
* @param[in] session PEP_SESSION
* @param[in] user_id user_id of key owner to get the sticky bit for
* @param[in] fpr fingerprint of user's key to consider
* @param[out] is_sticky (by reference) true if sticky bit is set for this user and fpr,
* else false
*
*/
PEP_STATUS get_key_sticky_bit_for_user(PEP_SESSION session,
const char* user_id,
const char* fpr,
bool* is_sticky);
#ifdef __cplusplus
}
#endif


+ 2
- 0
src/message_api.c View File

@ -19,6 +19,8 @@
#include "sync_codec.h"
#include "distribution_codec.h"
#include "keymanagement_internal.h"
#include "group.h"
#include "group_internal.h"


+ 0
- 88
src/message_api.h View File

@ -17,59 +17,6 @@
extern "C" {
#endif
/**
* <!-- import_attached_keys() -->
*
* @brief TODO
*
* @param[in] session session handle
* @param[in] msg message*
* @param[in] private_idents identity_list**
* @param[in] imported_keys stringlist_t**
* @param[in] changed_keys uint64_t*
*
* @retval bool
*/
bool import_attached_keys(
PEP_SESSION session,
message *msg,
identity_list **private_idents,
stringlist_t** imported_keys,
uint64_t* changed_keys
);
/**
* <!-- attach_own_key() -->
*
* @brief TODO
*
* @param[in] session session handle
* @param[in] msg message*
*
*/
void attach_own_key(PEP_SESSION session, message *msg);
/**
* <!-- determine_encryption_format() -->
*
* @brief TODO
*
* @param[in] msg message*
*
*/
PEP_cryptotech determine_encryption_format(message *msg);
/**
* <!-- add_opt_field() -->
*
* @brief TODO
*
* @param[in] msg message*
* @param[in] name const char*
* @param[in] value const char*
*
*/
void add_opt_field(message *msg, const char *name, const char *value);
/**
* @enum PEP_encrypt_flags
@ -692,41 +639,6 @@ DYNAMIC_API PEP_STATUS get_key_rating_for_user(
DYNAMIC_API PEP_rating rating_from_comm_type(PEP_comm_type ct);
/**
* @internal
*
* <!-- try_encrypt_message() -->
*
* @brief This is the internal version of encrypt_message()
* to be used by asynchronous network protocol
* implementations. This function is calls messageToSend(NULL)
* in case there is a missing or wrong passphrase.
*
* @param[in] session ession handle
* @param[in] src message*
* @param[in] extra stringlist_t*
* @param[in] dst message**
* @param[in] enc_format PEP_enc_format
* @param[in] flags PEP_encrypt_flags_t
*
* @retval PEP_STATUS_OK
* @retval PEP_ILLEGAL_VALUE illegal parameter values
* @retval PEP_OUT_OF_MEMORY out of memory
* @retval PEP_SYNC_NO_CHANNEL
* @retval any other value on error
*
* @warning Do NOT use this function in adapters.
*
* @todo KB: line up with the try_base_blahblah docs
*/
PEP_STATUS try_encrypt_message(
PEP_SESSION session,
message *src,
stringlist_t *extra,
message **dst,
PEP_enc_format enc_format,
PEP_encrypt_flags_t flags
);
#ifdef __cplusplus


+ 6
- 2
src/pEp_internal.h View File

@ -96,7 +96,13 @@
#endif
#include "pEpEngine.h"
#include "key_reset.h"
#include "pEpEngine_internal.h"
#include "key_reset_internal.h"
#include "group_internal.h"
#include "keymanagement_internal.h"
#include "message_api_internal.h"
// If not specified, build for Sequoia
#ifndef USE_SEQUOIA
@ -116,8 +122,6 @@
#include "sync_api.h"
#include "Sync_func.h"
#include "key_reset.h"
#include "key_reset_internal.h"
#define NOT_IMPLEMENTED assert(0); return PEP_UNKNOWN_ERROR;


Loading…
Cancel
Save