diff options
| author | Werner Koch <[email protected]> | 2010-10-01 20:33:53 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2010-10-01 20:33:53 +0000 |
| commit | bfbd80feb95fba36292cd9dab43016f17b1e6972 (patch) | |
| tree | 9afbfd29e8aeb78fa34a1a49d8b8071554d4f593 /common | |
| parent | * options.skel: Make the example for force-v3-sigs match reality (it (diff) | |
| download | gnupg-bfbd80feb95fba36292cd9dab43016f17b1e6972.tar.gz gnupg-bfbd80feb95fba36292cd9dab43016f17b1e6972.zip | |
Exporting secret keys via gpg-agent is now basically supported.
A couple of forward ported changes.
Doc updates.
Diffstat (limited to 'common')
| -rw-r--r-- | common/ChangeLog | 14 | ||||
| -rw-r--r-- | common/http.c | 3 | ||||
| -rw-r--r-- | common/logging.c | 3 | ||||
| -rw-r--r-- | common/sexp-parse.h | 2 | ||||
| -rw-r--r-- | common/status.c | 1 | ||||
| -rw-r--r-- | common/util.h | 6 |
6 files changed, 28 insertions, 1 deletions
diff --git a/common/ChangeLog b/common/ChangeLog index 0c8698bab..b7e33baf1 100644 --- a/common/ChangeLog +++ b/common/ChangeLog @@ -1,3 +1,17 @@ +2010-09-30 Werner Koch <[email protected]> + + * util.h (GPG_ERR_FULLY_CANCELED): Add replacement. + +2010-09-17 Werner Koch <[email protected]> + + * http.c (INADDR_NONE): Provide fallback. + * logging.c (INADDR_NONE): Ditto. + +2010-09-16 Werner Koch <[email protected]> + + * util.h: Add GPG_ERR_MISSING_ISSUER_CERT. + * status.c (get_inv_recpsgnr_code): Ditto. + 2010-09-13 Werner Koch <[email protected]> * homedir.c (gnupg_bindir) [W32CE]: Change to bin/. diff --git a/common/http.c b/common/http.c index 1e3e89790..1d84051a2 100644 --- a/common/http.c +++ b/common/http.c @@ -114,6 +114,9 @@ struct srventry #ifndef EAGAIN #define EAGAIN EWOULDBLOCK #endif +#ifndef INADDR_NONE /* Slowaris is missing that. */ +#define INADDR_NONE ((unsigned long)(-1)) +#endif /*INADDR_NONE*/ #define HTTP_PROXY_ENV "http_proxy" #define MAX_LINELEN 20000 /* Max. length of a HTTP header line. */ diff --git a/common/logging.c b/common/logging.c index 4c2d61b1e..5a61c609c 100644 --- a/common/logging.c +++ b/common/logging.c @@ -68,6 +68,9 @@ #ifndef EAFNOSUPPORT # define EAFNOSUPPORT EINVAL #endif +#ifndef INADDR_NONE /* Slowaris is missing that. */ +#define INADDR_NONE ((unsigned long)(-1)) +#endif /*INADDR_NONE*/ #ifdef HAVE_W32_SYSTEM #define sock_close(a) closesocket(a) diff --git a/common/sexp-parse.h b/common/sexp-parse.h index b3213a6fe..5ec7c7f71 100644 --- a/common/sexp-parse.h +++ b/common/sexp-parse.h @@ -82,7 +82,7 @@ sskip (unsigned char const **buf, int *depth) /* Check whether the the string at the address BUF points to matches the token. Return true on match and update BUF to point behind the - token. Return false and dont update tha buffer if it does not + token. Return false and do not update the buffer if it does not match. */ static inline int smatch (unsigned char const **buf, size_t buflen, const char *token) diff --git a/common/status.c b/common/status.c index e9f84bfd1..7b9f4a3ae 100644 --- a/common/status.c +++ b/common/status.c @@ -58,6 +58,7 @@ get_inv_recpsgnr_code (gpg_error_t err) case GPG_ERR_NOT_TRUSTED: errstr = "10"; break; case GPG_ERR_MISSING_CERT: errstr = "11"; break; + case GPG_ERR_MISSING_ISSUER_CERT: errstr = "12"; break; default: errstr = "0"; break; } diff --git a/common/util.h b/common/util.h index 341df2531..286cf50a2 100644 --- a/common/util.h +++ b/common/util.h @@ -33,6 +33,12 @@ #ifndef GPG_ERR_NOT_INITIALIZED #define GPG_ERR_NOT_INITIALIZED 184 #endif +#ifndef GPG_ERR_MISSING_ISSUER_CERT +#define GPG_ERR_MISSING_ISSUER_CERT 185 +#endif +#ifndef GPG_ERR_FULLY_CANCELED +#define GPG_ERR_FULLY_CANCELED 198 +#endif /* Hash function used with libksba. */ |