From b5d35fcd673c1720f8d8c2951f717c9bbce96e6a Mon Sep 17 00:00:00 2001 From: heck Date: Tue, 4 Apr 2023 15:38:59 +0200 Subject: [PATCH] Fix: Function 'import_key' has incorrect name (has been changed to use import_key_with_fpr_return. So 1) the actual func 'import_key' is gone, and 2) the new func has to be called 'import_key_with_fpr_return' --- src/pEp/_pEp/basic_api.cc | 2 +- src/pEp/_pEp/basic_api.hh | 2 +- src/pEp/_pEp/pEpmodule.cc | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/pEp/_pEp/basic_api.cc b/src/pEp/_pEp/basic_api.cc index 4543aac..989e3f5 100644 --- a/src/pEp/_pEp/basic_api.cc +++ b/src/pEp/_pEp/basic_api.cc @@ -110,7 +110,7 @@ namespace pEp { } - boost::python::tuple import_key(string key_data) + boost::python::tuple import_key_with_fpr_return(string key_data) { ::identity_list *private_keys = NULL; ::stringlist_t *imported_keys = NULL; diff --git a/src/pEp/_pEp/basic_api.hh b/src/pEp/_pEp/basic_api.hh index ffd9abe..542d079 100644 --- a/src/pEp/_pEp/basic_api.hh +++ b/src/pEp/_pEp/basic_api.hh @@ -23,7 +23,7 @@ namespace pEp { void key_reset_trust(Identity ident); - boost::python::tuple import_key(string key_data); + boost::python::tuple import_key_with_fpr_return(string key_data); string export_key(Identity ident); diff --git a/src/pEp/_pEp/pEpmodule.cc b/src/pEp/_pEp/pEpmodule.cc index 51770f5..f6ae881 100644 --- a/src/pEp/_pEp/pEpmodule.cc +++ b/src/pEp/_pEp/pEpmodule.cc @@ -624,9 +624,9 @@ namespace pEp { "reset trust bit or explicitly mistrusted status for an identity and " "its accompanying key/user_id pair\n"); - def("import_key", - &import_key, - "imported_keys, affected_own_identities = import_key(key_data)\n" + def("import_key_with_fpr_return", + &import_key_with_fpr_return, + "imported_keys, affected_own_identities = import_key_with_fpr_return(key_data)\n" "\n" "import key(s) from key_data\n");