aboutsummaryrefslogtreecommitdiffstats
path: root/g10
diff options
context:
space:
mode:
Diffstat (limited to 'g10')
-rw-r--r--g10/exec.c2
-rw-r--r--g10/keydb.c6
-rw-r--r--g10/keylist.c2
-rw-r--r--g10/keyserver.c2
-rw-r--r--g10/mainproc.c4
-rw-r--r--g10/options.h2
-rw-r--r--g10/plaintext.c39
-rw-r--r--g10/seckey-cert.c3
-rw-r--r--g10/sign.c5
9 files changed, 36 insertions, 29 deletions
diff --git a/g10/exec.c b/g10/exec.c
index cdc86e16b..6938a409a 100644
--- a/g10/exec.c
+++ b/g10/exec.c
@@ -473,9 +473,9 @@ int exec_write(struct exec_info **info,const char *program,
(*info)->tochild=fopen((*info)->tempfile_in,binary?"wb":"w");
if((*info)->tochild==NULL)
{
+ ret = gpg_error_from_errno (errno);
log_error(_("can't create `%s': %s\n"),
(*info)->tempfile_in,strerror(errno));
- ret=G10ERR_WRITE_FILE;
goto fail;
}
diff --git a/g10/keydb.c b/g10/keydb.c
index dbad8435a..b3595cf36 100644
--- a/g10/keydb.c
+++ b/g10/keydb.c
@@ -134,9 +134,9 @@ maybe_create_keyring (char *filename, int force)
log_info ("can't allocate lock for `%s'\n", filename );
if (!force)
- return G10ERR_OPEN_FILE;
+ return gpg_error (GPG_ERR_ENOENT);
else
- return G10ERR_GENERAL;
+ return gpg_error (GPG_ERR_GENERAL);
}
if ( make_dotlock (lockhd, -1) )
@@ -166,9 +166,9 @@ maybe_create_keyring (char *filename, int force)
umask (oldmask);
if (!iobuf)
{
+ rc = gpg_error_from_errno (errno);
log_error ( _("error creating keyring `%s': %s\n"),
filename, strerror(errno));
- rc = G10ERR_OPEN_FILE;
goto leave;
}
diff --git a/g10/keylist.c b/g10/keylist.c
index 0b1a51b6d..441606299 100644
--- a/g10/keylist.c
+++ b/g10/keylist.c
@@ -1310,7 +1310,7 @@ list_keyblock_colon( KBNODE keyblock, int secret, int fpr )
case 0: sigrc = '!'; break;
case GPG_ERR_BAD_SIGNATURE: sigrc = '-'; break;
case GPG_ERR_NO_PUBKEY:
- case Gpg_Err_UNUSABLE_PUBKEY: sigrc = '?'; break;
+ case GPG_ERR_UNUSABLE_PUBKEY: sigrc = '?'; break;
default: sigrc = '%'; break;
}
diff --git a/g10/keyserver.c b/g10/keyserver.c
index 4fd90d08b..3e72b2820 100644
--- a/g10/keyserver.c
+++ b/g10/keyserver.c
@@ -31,13 +31,13 @@
#endif
#include "gpg.h"
+#include "iobuf.h"
#include "filter.h"
#include "keydb.h"
#include "status.h"
#include "exec.h"
#include "main.h"
#include "i18n.h"
-#include "iobuf.h"
#include "ttyio.h"
#include "options.h"
#include "packet.h"
diff --git a/g10/mainproc.c b/g10/mainproc.c
index 8e9b3ab65..27989d3b2 100644
--- a/g10/mainproc.c
+++ b/g10/mainproc.c
@@ -647,7 +647,7 @@ proc_plaintext( CTX c, PACKET *pkt )
else if(n->pkt->pkttype==PKT_SIGNATURE)
{
/* For the SIG+LITERAL case that PGP used to use. */
- md_enable( c->mfx.md, n->pkt->pkt.signature->digest_algo );
+ gcry_md_enable ( c->mfx.md, n->pkt->pkt.signature->digest_algo );
any=1;
}
}
@@ -2010,7 +2010,7 @@ proc_tree( CTX c, KBNODE node )
&& is_RSA( sig->pubkey_algo ) ) {
/* enable a workaround for a pgp2 bug */
if (gcry_md_open (&c->mfx.md2, DIGEST_ALGO_MD5, 0))
- BUG ():
+ BUG ();
}
else if( sig->digest_algo == DIGEST_ALGO_SHA1
&& sig->pubkey_algo == PUBKEY_ALGO_DSA
diff --git a/g10/options.h b/g10/options.h
index 7e9d0261c..f61cd4c9e 100644
--- a/g10/options.h
+++ b/g10/options.h
@@ -262,6 +262,7 @@ struct {
#define DBG_CARD_IO_VALUE 2048 /* debug smart card I/O. */
#define DBG_PACKET (opt.debug & DBG_PACKET_VALUE)
+#define DBG_CIPHER (opt.debug & DBG_CIPHER_VALUE)
#define DBG_FILTER (opt.debug & DBG_FILTER_VALUE)
#define DBG_CACHE (opt.debug & DBG_CACHE_VALUE)
#define DBG_TRUST (opt.debug & DBG_TRUST_VALUE)
@@ -304,6 +305,7 @@ EXTERN_UNLESS_MAIN_MODULE int memory_stat_debug_mode;
#define EXPORT_RESET_SUBKEY_PASSWD (1<<3)
#define EXPORT_MINIMAL (1<<4)
#define EXPORT_CLEAN (1<<5)
+#define EXPORT_SEXP_FORMAT (1<<6)
#define LIST_SHOW_PHOTOS (1<<0)
#define LIST_SHOW_POLICY_URLS (1<<1)
diff --git a/g10/plaintext.c b/g10/plaintext.c
index 1f8c5759f..2ae851e30 100644
--- a/g10/plaintext.c
+++ b/g10/plaintext.c
@@ -133,13 +133,13 @@ handle_plaintext( PKT_plaintext *pt, md_filter_context_t *mfx,
else if (is_secured_filename (fname))
{
errno = EPERM;
+ rc = gpg_error_from_errno (errno);
log_error(_("error creating `%s': %s\n"), fname, strerror(errno) );
- rc = G10ERR_CREATE_FILE;
goto leave;
}
else if( !(fp = fopen(fname,"wb")) ) {
+ rc = gpg_error_from_errno (errno);
log_error(_("error creating `%s': %s\n"), fname, strerror(errno) );
- rc = G10ERR_CREATE_FILE;
goto leave;
}
#else /* __riscos__ */
@@ -205,7 +205,7 @@ handle_plaintext( PKT_plaintext *pt, md_filter_context_t *mfx,
{
log_error ("error writing to `%s': %s\n",
fname,"exceeded --max-output limit\n");
- rc = gpg_error (GPG_ERR_GENERAL);
+ rc = gpg_error (GPG_ERR_TOO_LARGE);
goto leave;
}
else if( putc( c, fp ) == EOF )
@@ -239,17 +239,17 @@ handle_plaintext( PKT_plaintext *pt, md_filter_context_t *mfx,
{
if(opt.max_output && (count+=len)>opt.max_output)
{
- log_error("Error writing to `%s': %s\n",
- fname,"exceeded --max-output limit\n");
- rc = G10ERR_WRITE_FILE;
+ log_error ("error writing to `%s': %s\n",
+ fname,"exceeded --max-output limit\n");
+ rc = gpg_error (GPG_ERR_TOO_LARGE);
xfree( buffer );
goto leave;
}
else if( fwrite( buffer, 1, len, fp ) != len )
{
- log_error("Error writing to `%s': %s\n",
- fname, strerror(errno) );
- rc = G10ERR_WRITE_FILE;
+ rc = gpg_error_from_errno (errno);
+ log_error ("error writing to `%s': %s\n",
+ fname, strerror(errno) );
xfree( buffer );
goto leave;
}
@@ -274,14 +274,17 @@ handle_plaintext( PKT_plaintext *pt, md_filter_context_t *mfx,
{
log_error("Error writing to `%s': %s\n",
fname,"exceeded --max-output limit\n");
- rc = G10ERR_WRITE_FILE;
+ rc = gpg_error (GPG_ERR_TOO_LARGE);
goto leave;
}
else if( putc( c, fp ) == EOF )
{
+ if ( ferror (fp ) )
+ rc = gpg_error_from_errno (errno);
+ else
+ rc = gpg_error (GPG_ERR_EOF);
log_error("Error writing to `%s': %s\n",
fname, strerror(errno) );
- rc = G10ERR_WRITE_FILE;
goto leave;
}
}
@@ -310,7 +313,7 @@ handle_plaintext( PKT_plaintext *pt, md_filter_context_t *mfx,
{
log_error("Error writing to `%s': %s\n",
fname,"exceeded --max-output limit\n");
- rc = G10ERR_WRITE_FILE;
+ rc = gpg_error (GPG_ERR_TOO_LARGE);
xfree( buffer );
goto leave;
}
@@ -337,7 +340,7 @@ handle_plaintext( PKT_plaintext *pt, md_filter_context_t *mfx,
{
log_error("Error writing to `%s': %s\n",
fname,"exceeded --max-output limit\n");
- rc = G10ERR_WRITE_FILE;
+ rc = gpg_error (GPG_ERR_TOO_LARGE);
goto leave;
}
else if( putc( c, fp ) == EOF )
@@ -351,8 +354,8 @@ handle_plaintext( PKT_plaintext *pt, md_filter_context_t *mfx,
if( !mfx->md )
continue;
if( state == 2 ) {
- md_putc(mfx->md, '\r' );
- md_putc(mfx->md, '\n' );
+ gcry_md_putc (mfx->md, '\r' );
+ gcry_md_putc (mfx->md, '\n' );
state = 0;
}
if( !state ) {
@@ -361,18 +364,18 @@ handle_plaintext( PKT_plaintext *pt, md_filter_context_t *mfx,
else if( c == '\n' )
state = 2;
else
- md_putc(mfx->md, c );
+ gcry_md_putc(mfx->md, c );
}
else if( state == 1 ) {
if( c == '\n' )
state = 2;
else {
- md_putc(mfx->md, '\r' );
+ gcry_md_putc(mfx->md, '\r' );
if( c == '\r' )
state = 1;
else {
state = 0;
- md_putc(mfx->md, c );
+ gcry_md_putc(mfx->md, c );
}
}
}
diff --git a/g10/seckey-cert.c b/g10/seckey-cert.c
index acb2cdada..ad5b75603 100644
--- a/g10/seckey-cert.c
+++ b/g10/seckey-cert.c
@@ -294,7 +294,8 @@ check_secret_key( PKT_secret_key *sk, int n )
log_info (_("%s ...\n"), _(tryagain));
}
rc = do_check( sk, tryagain, mode, &canceled );
- if ( gpg_err_code (rc) == G10ERR_BAD_PASS && is_status_enabled () ) {
+ if ( gpg_err_code (rc) == GPG_ERR_BAD_PASSPHRASE
+ && is_status_enabled () ) {
u32 kid[2];
char buf[50];
diff --git a/g10/sign.c b/g10/sign.c
index 3553079d6..9bb35c898 100644
--- a/g10/sign.c
+++ b/g10/sign.c
@@ -656,7 +656,8 @@ write_signature_packets (SK_LIST sk_list, IOBUF out, gcry_md_hd_t hash,
sig->expiredate = sig->timestamp+duration;
sig->sig_class = sigclass;
- md = gcry_md_copy (hash);
+ if (gcry_md_copy (&md, hash))
+ BUG ();
if (sig->version >= 4)
build_sig_subpkt_from_sig (sig);
@@ -938,9 +939,9 @@ sign_file( STRLIST filenames, int detached, STRLIST locusr,
}
if( !inp )
{
+ rc = gpg_error_from_errno (errno);
log_error(_("can't open `%s': %s\n"),
sl->d,strerror(errno));
- rc = G10ERR_OPEN_FILE;
goto leave;
}
handle_progress (&pfx, inp, sl->d);
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-21 15:15:53 +0000