Browse Source

...

async_key_management
vb 7 years ago
parent
commit
b08bf8548e
6 changed files with 12 additions and 11 deletions
  1. +2
    -2
      src/Makefile
  2. +2
    -1
      src/message_api.c
  3. +1
    -1
      src/pEpEngine.c
  4. +2
    -2
      src/pgp_gpg.c
  5. +1
    -3
      src/transport.c
  6. +4
    -2
      src/transport.h

+ 2
- 2
src/Makefile View File

@ -9,10 +9,10 @@ GPGME_IN=$(HOME)
LIBGPGME=libgpgme-pthread.dylib
CC?=clang -std=c99 -pthread
LD?=clang
CFLAGS?=-I$(GPGME_IN)/include -I/opt/local/include $(OPTIMIZE) -pedantic \
CFLAGS?=-I$(GPGME_IN)/include -I$(HOME)/include -I/opt/local/include $(OPTIMIZE) -pedantic \
-DSYSTEM_DB=\"$(SYSTEM_DB)\" -DLIBGPGME=\"$(LIBGPGME)\"
LDFLAGS?=-lc -shared -arch x86_64 \
-L/opt/local/lib -letpan -lgpgme-pthread -lsqlite3
-L$(HOME)/lib -L/opt/local/lib -letpan -lgpgme-pthread -lsqlite3
else
$(error don't know how to make for $(BUILD_FOR) on $(BUILD_ON))


+ 2
- 1
src/message_api.c View File

@ -6,7 +6,7 @@
#include <string.h>
#include <stdlib.h>
#define NOT_IMPLEMENTED assert(0);
#define NOT_IMPLEMENTED assert(0); return PEP_UNKNOWN_ERROR;
static char * combine_short_and_long(const message * src)
{
@ -287,6 +287,7 @@ DYNAMIC_API PEP_STATUS decrypt_message(
*dst = NULL;
// msg = new_message(src->dir, from, to, NULL);
NOT_IMPLEMENTED
*dst = msg;
return PEP_STATUS_OK;


+ 1
- 1
src/pEpEngine.c View File

@ -319,7 +319,7 @@ DYNAMIC_API stringlist_t *stringlist_dup(const stringlist_t *src)
if (src->next) {
dst->next = stringlist_dup(src->next);
if (dst->next == NULL) {
free(dst);
free_stringlist(dst);
return NULL;
}
}


+ 2
- 2
src/pgp_gpg.c View File

@ -5,8 +5,8 @@
#define _GPGERR(X) ((X) & 0xffffL)
void *gpgme;
struct gpg_s gpg;
static void *gpgme;
static struct gpg_s gpg;
static bool ensure_keyserver()
{


+ 1
- 3
src/transport.c View File

@ -33,10 +33,8 @@ DYNAMIC_API identity_list *new_identity_list(pEp_identity *ident)
{
identity_list *id_list = calloc(1, sizeof(identity_list));
assert(id_list);
if (id_list == NULL) {
free(ident);
if (id_list == NULL)
return NULL;
}
id_list->ident = ident;


+ 4
- 2
src/transport.h View File

@ -37,7 +37,8 @@ typedef struct _identity_list {
// new identity_list or NULL if out of memory
//
// caveat:
// ident is being moved, the caller loses ownership
// ident is being moved if the function succeeds, the caller loses
// ownership
DYNAMIC_API identity_list *new_identity_list(pEp_identity *ident);
@ -75,7 +76,8 @@ DYNAMIC_API void free_identity_list(identity_list *id_list);
// pointer to the last element in identity_list or NULL if out of memory
//
// caveat:
// ident is being moved, the caller loses ownership
// ident is being moved, the caller loses ownership if the function is
// successful
DYNAMIC_API identity_list *identity_list_add(identity_list *id_list, pEp_identity *ident);


Loading…
Cancel
Save