From f3a5fb1980abf84165064af383a12c0fc05d7629 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jochen=20Suckf=C3=BCll?= Date: Wed, 20 Mar 2019 21:43:47 +0100 Subject: [PATCH 1/4] fixed error adding signers --- gpg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gpg.c b/gpg.c index a80a7c9..b52839f 100644 --- a/gpg.c +++ b/gpg.c @@ -763,7 +763,7 @@ int gpgEncrypt(char* buffer, int size, char** newbuffer, int* newsize, if (fpr) { error = gpgme_get_key(context, fpr, &tkey, LIST_SECRET); - if (tkey -> secret); + if (tkey -> secret) { error = gpgme_signers_add(context, tkey); signers++; From e59735bc41e0b8ab4b6d9c6a41a04634f9b44d77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jochen=20Suckf=C3=BCll?= Date: Fri, 7 Aug 2020 22:16:16 +0200 Subject: [PATCH 2/4] fixed multiple definitions while linking --- configuration.c | 2 ++ configuration.h | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/configuration.c b/configuration.c index ab46700..dcdaa30 100644 --- a/configuration.c +++ b/configuration.c @@ -33,6 +33,8 @@ #include "listhandler.h" #include "memory.h" +cpmconfig_t* config; +cpmruntime_t* runtime; /* ############################################################################# * diff --git a/configuration.h b/configuration.h index b539e30..e48b65a 100644 --- a/configuration.h +++ b/configuration.h @@ -101,8 +101,8 @@ typedef struct /* ############################################################################# * global variables */ -cpmconfig_t* config; -cpmruntime_t* runtime; +extern cpmconfig_t* config; +extern cpmruntime_t* runtime; #define CRACKLIB_OFF 0 #define CRACKLIB_ON 1 From 5f29b6fa67275e0bbdeee2bc55f67616e57f28ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jochen=20Suckf=C3=BCll?= Date: Sat, 8 Aug 2020 17:47:18 +0200 Subject: [PATCH 3/4] Fixed key pattern used to look up keys. This fixes key lookup in recent gpgme versions. --- gpg.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gpg.c b/gpg.c index b52839f..1edac81 100644 --- a/gpg.c +++ b/gpg.c @@ -1268,8 +1268,7 @@ char* gpgValidateEncryptionKey(char* keyname) strlen(tname) + 1 + strlen(key -> uids -> email) + 2 + 1; identifier = memAlloc(__FILE__, __LINE__, size); - snprintf(identifier, size, "%s %s <%s>", - key -> subkeys -> keyid, + snprintf(identifier, size, "%s <%s>", tname, key -> uids -> email); } From b7ff54d1f112511a11debd763b8df0378f18418a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jochen=20Suckf=C3=BCll?= Date: Sat, 8 Aug 2020 17:51:58 +0200 Subject: [PATCH 4/4] gitignore generated files --- .gitignore | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.gitignore b/.gitignore index 5761abc..7f54c9c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,6 @@ *.o +Makefile +Makefile.dep +config.h +config.status +cpm