1.1 --- a/CpEpEngine.cpp Fri May 01 10:34:16 2015 +0200
1.2 +++ b/CpEpEngine.cpp Fri May 01 11:35:35 2015 +0200
1.3 @@ -329,7 +329,7 @@
1.4 return S_OK;
1.5 }
1.6
1.7 -STDMETHODIMP CpEpEngine::safeword(LONG value, BSTR lang, BSTR * word)
1.8 +STDMETHODIMP CpEpEngine::trustword(LONG value, BSTR lang, BSTR * word)
1.9 {
1.10 assert(value >= 0 && value <= 65535);
1.11 assert(word);
1.12 @@ -358,14 +358,14 @@
1.13 char *_word = NULL;
1.14 size_t _wsize = 0;
1.15
1.16 - PEP_STATUS status = ::safeword(get_session(), _value, _lang.c_str(), &_word, &_wsize);
1.17 + PEP_STATUS status = ::trustword(get_session(), _value, _lang.c_str(), &_word, &_wsize);
1.18 assert(status != PEP_OUT_OF_MEMORY);
1.19 if (status == PEP_OUT_OF_MEMORY)
1.20 return E_OUTOFMEMORY;
1.21
1.22 if (_word == NULL) {
1.23 *word = NULL;
1.24 - return FAIL(L"safeword");
1.25 + return FAIL(L"trustword");
1.26 }
1.27 else {
1.28 *word = utf16_bstr(_word).Detach();
1.29 @@ -374,7 +374,7 @@
1.30 }
1.31 }
1.32
1.33 -STDMETHODIMP CpEpEngine::safewords(BSTR fpr, BSTR lang, LONG max_words, BSTR * words)
1.34 +STDMETHODIMP CpEpEngine::trustwords(BSTR fpr, BSTR lang, LONG max_words, BSTR * words)
1.35 {
1.36 assert(fpr);
1.37 assert(max_words >= 0);
1.38 @@ -413,14 +413,14 @@
1.39 char *_words = NULL;
1.40 size_t _wsize = 0;
1.41
1.42 - PEP_STATUS status = ::safewords(get_session(), _fpr.c_str(), _lang.c_str(), &_words, &_wsize, max_words);
1.43 + PEP_STATUS status = ::trustwords(get_session(), _fpr.c_str(), _lang.c_str(), &_words, &_wsize, max_words);
1.44 assert(status != PEP_OUT_OF_MEMORY);
1.45 if (status == PEP_OUT_OF_MEMORY)
1.46 return E_OUTOFMEMORY;
1.47
1.48 if (_words == NULL) {
1.49 *words = NULL;
1.50 - return FAIL(L"safewords");
1.51 + return FAIL(L"trustwords");
1.52 }
1.53 else {
1.54 *words = utf16_bstr(_words).Detach();
2.1 --- a/CpEpEngine.h Fri May 01 10:34:16 2015 +0200
2.2 +++ b/CpEpEngine.h Fri May 01 11:35:35 2015 +0200
2.3 @@ -122,8 +122,8 @@
2.4 STDMETHOD(decrypt_b)(BSTR ctext, LPSAFEARRAY * ptext, LPSAFEARRAY * key_list, pEp_STATUS * decrypt_status);
2.5 STDMETHOD(encrypt)(SAFEARRAY * key_list, BSTR ptext, BSTR * ctext, pEp_STATUS * status);
2.6 STDMETHOD(encrypt_b)(SAFEARRAY * key_list, SAFEARRAY * ptext, BSTR * ctext, pEp_STATUS * status);
2.7 - STDMETHOD(safeword)(LONG value, BSTR lang, BSTR * word);
2.8 - STDMETHOD(safewords)(BSTR fpr, BSTR lang, LONG max_words, BSTR * words);
2.9 + STDMETHOD(trustword)(LONG value, BSTR lang, BSTR * word);
2.10 + STDMETHOD(trustwords)(BSTR fpr, BSTR lang, LONG max_words, BSTR * words);
2.11 STDMETHOD(get_identity)(BSTR address, pEp_identity_s * ident);
2.12 STDMETHOD(set_identity)(pEp_identity_s * ident);
2.13 STDMETHOD(generate_keypair)(pEp_identity_s * ident, BSTR * fpr);
3.1 --- a/pEpCOMServerAdapter.idl Fri May 01 10:34:16 2015 +0200
3.2 +++ b/pEpCOMServerAdapter.idl Fri May 01 11:35:35 2015 +0200
3.3 @@ -131,8 +131,8 @@
3.4 HRESULT encrypt([in] SAFEARRAY(BSTR) key_list, [in] BSTR ptext, [out] BSTR * ctext, [out, retval] pEp_STATUS * status);
3.5 HRESULT encrypt_b([in] SAFEARRAY(BSTR) key_list, [in] SAFEARRAY(BYTE) ptext, [out] BSTR * ctext, [out, retval] pEp_STATUS * status);
3.6 HRESULT verify([in] BSTR text, [in] BSTR signature, [out] SAFEARRAY(BSTR) * key_list, [out, retval] pEp_STATUS * verify_status);
3.7 - HRESULT safeword([in] LONG value, [in, defaultvalue("en")] BSTR lang, [out, retval] BSTR * word);
3.8 - HRESULT safewords([in] BSTR fpr, [in, defaultvalue("en")] BSTR lang, [in, defaultvalue(0)] LONG max_words, [out, retval] BSTR * words);
3.9 + HRESULT trustword([in] LONG value, [in, defaultvalue("en")] BSTR lang, [out, retval] BSTR * word);
3.10 + HRESULT trustwords([in] BSTR fpr, [in, defaultvalue("en")] BSTR lang, [in, defaultvalue(0)] LONG max_words, [out, retval] BSTR * words);
3.11
3.12 typedef enum _pEp_comm_type {
3.13 pEp_ct_unknown = 0,