Compare commits

...

4 Commits

  1. 1
      Makefile.conf
  2. 8
      src/message_cache.cc
  3. 2
      src/message_cache.hh
  4. 1
      src/pEpSQLite.cc
  5. 4
      test/framework/framework.cc

1
Makefile.conf

@ -18,6 +18,7 @@ PREFIX?=$(HOME)
# Constants # Constants
CXXFLAGS+=-std=c++11 -fPIC CXXFLAGS+=-std=c++11 -fPIC
CXXFLAGS+=-I$(PREFIX)/include CXXFLAGS+=-I$(PREFIX)/include
CFLAGS+=-fPIC
LDFLAGS+=-L$(PREFIX)/lib LDFLAGS+=-L$(PREFIX)/lib
ifneq (,$(findstring g++,$(CXX))) ifneq (,$(findstring g++,$(CXX)))

8
src/message_cache.cc

@ -24,10 +24,9 @@ namespace pEp {
message *src, message *src,
message **dst, message **dst,
stringlist_t **keylist, stringlist_t **keylist,
PEP_rating *rating,
PEP_decrypt_flags_t *flags) PEP_decrypt_flags_t *flags)
{ {
return message_cache.decrypt_message(session, src, dst, keylist, rating, flags); return message_cache.decrypt_message(session, src, dst, keylist, flags);
} }
PEP_STATUS MessageCache::cache_mime_encode_message( PEP_STATUS MessageCache::cache_mime_encode_message(
@ -269,6 +268,8 @@ namespace pEp {
dst->opt_fields->next = dup(src->opt_fields); dst->opt_fields->next = dup(src->opt_fields);
} }
dst->rating = src->rating;
return dst; return dst;
} }
@ -314,7 +315,6 @@ namespace pEp {
message *src, message *src,
message **dst, message **dst,
stringlist_t **keylist, stringlist_t **keylist,
PEP_rating *rating,
PEP_decrypt_flags_t *flags) PEP_decrypt_flags_t *flags)
{ {
if (!src || cacheID(src) == "") if (!src || cacheID(src) == "")
@ -332,7 +332,7 @@ namespace pEp {
correctAttachmentsOrder(src->attachments); correctAttachmentsOrder(src->attachments);
::message *_dst = nullptr; ::message *_dst = nullptr;
PEP_STATUS status = ::decrypt_message(session, src, &_dst, keylist, rating, flags); PEP_STATUS status = ::decrypt_message(session, src, &_dst, keylist, flags);
*dst = empty_message_copy(_dst, _id, true); *dst = empty_message_copy(_dst, _id, true);
{ {

2
src/message_cache.hh

@ -53,7 +53,6 @@ namespace pEp {
message *src, message *src,
message **dst, message **dst,
stringlist_t **keylist, stringlist_t **keylist,
PEP_rating *rating,
PEP_decrypt_flags_t *flags); PEP_decrypt_flags_t *flags);
static PEP_STATUS cache_encrypt_message( static PEP_STATUS cache_encrypt_message(
@ -98,7 +97,6 @@ namespace pEp {
message *src, message *src,
message **dst, message **dst,
stringlist_t **keylist, stringlist_t **keylist,
PEP_rating *rating,
PEP_decrypt_flags_t *flags); PEP_decrypt_flags_t *flags);
PEP_STATUS encrypt_message( PEP_STATUS encrypt_message(

1
src/pEpSQLite.cc

@ -4,6 +4,7 @@
#include <cstdio> #include <cstdio>
#include <stdexcept> #include <stdexcept>
#include <string> #include <string>
#include <string.h>
using namespace std; using namespace std;

4
test/framework/framework.cc

@ -133,9 +133,8 @@ namespace pEp {
::message *_dst; ::message *_dst;
stringlist_t *keylist; stringlist_t *keylist;
::PEP_rating rating;
::PEP_decrypt_flags_t flags = 0; ::PEP_decrypt_flags_t flags = 0;
::PEP_STATUS status = ::decrypt_message(Adapter::session(), msg.get(), &_dst, &keylist, &rating, &flags); ::PEP_STATUS status = ::decrypt_message(Adapter::session(), msg.get(), &_dst, &keylist, &flags);
throw_status(status); throw_status(status);
Message dst; Message dst;
@ -143,6 +142,7 @@ namespace pEp {
dst = make_message(_dst); dst = make_message(_dst);
else else
dst = msg; dst = msg;
::PEP_rating rating = dst.get()->rating;
if (dst.get()->attachments) { if (dst.get()->attachments) {
for (auto a = dst.get()->attachments; a && a->value; a = a->next) { for (auto a = dst.get()->attachments; a && a->value; a = a->next) {

Loading…
Cancel
Save