diff options
| author | Werner Koch <[email protected]> | 2003-11-12 15:17:44 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2003-11-12 15:17:44 +0000 |
| commit | dba40e5e45e80896dc8864c2ae97f026069e2906 (patch) | |
| tree | 724a2e0f0f73ef66cf6284adb7e2463785874ffe /agent | |
| parent | 2003-11-10 Moritz Schulte <[email protected]> (diff) | |
| download | gnupg-dba40e5e45e80896dc8864c2ae97f026069e2906.tar.gz gnupg-dba40e5e45e80896dc8864c2ae97f026069e2906.zip | |
Mainly changes to adjust for the changed KSBA API.
Diffstat (limited to '')
| -rw-r--r-- | agent/command.c | 4 | ||||
| -rw-r--r-- | agent/genkey.c | 2 | ||||
| -rw-r--r-- | agent/pkdecrypt.c | 1 | ||||
| -rw-r--r-- | agent/pksign.c | 5 |
4 files changed, 6 insertions, 6 deletions
diff --git a/agent/command.c b/agent/command.c index f7a042ba9..a3e1c514a 100644 --- a/agent/command.c +++ b/agent/command.c @@ -329,7 +329,7 @@ cmd_pkdecrypt (ASSUAN_CONTEXT ctx, char *line) { int rc; CTRL ctrl = assuan_get_pointer (ctx); - char *value; + unsigned char *value; size_t valuelen; /* First inquire the data to decrypt */ @@ -365,7 +365,7 @@ cmd_genkey (ASSUAN_CONTEXT ctx, char *line) { CTRL ctrl = assuan_get_pointer (ctx); int rc; - char *value; + unsigned char *value; size_t valuelen; /* First inquire the parameters */ diff --git a/agent/genkey.c b/agent/genkey.c index 0a0577f17..1417abb02 100644 --- a/agent/genkey.c +++ b/agent/genkey.c @@ -137,7 +137,7 @@ agent_genkey (CTRL ctrl, const char *keyparam, size_t keyparamlen, { log_error ("key generation failed: %s\n", gpg_strerror (rc)); xfree (pi); - return map_gcry_err (rc); + return rc; } /* break out the parts */ diff --git a/agent/pkdecrypt.c b/agent/pkdecrypt.c index 543a82737..d17c688a0 100644 --- a/agent/pkdecrypt.c +++ b/agent/pkdecrypt.c @@ -105,7 +105,6 @@ agent_pkdecrypt (CTRL ctrl, const char *ciphertext, size_t ciphertextlen, if (rc) { log_error ("decryption failed: %s\n", gpg_strerror (rc)); - rc = map_gcry_err (rc); goto leave; } diff --git a/agent/pksign.c b/agent/pksign.c index 342582177..d5fe17bb7 100644 --- a/agent/pksign.c +++ b/agent/pksign.c @@ -39,7 +39,9 @@ do_encode_md (const byte * md, size_t mdlen, int algo, gcry_sexp_t * r_hash) char * p, tmp[16]; int i, rc; -#warning I do do like that stuff - libgcrypt provides easier interfaces. -wk +#ifdef __GNUC__ +#warning I do not like that stuff - libgcrypt provides easier interfaces. -wk +#endif /* FIXME: Either use the build function or create canonical encoded S-expressions. */ @@ -128,7 +130,6 @@ agent_pksign (CTRL ctrl, FILE *outfp, int ignore_cache) if (rc) { log_error ("signing failed: %s\n", gpg_strerror (rc)); - rc = map_gcry_err (rc); goto leave; } |