security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00
Code Activity

Finished the bulk of changes for gnupg 1.9. This included switching

Browse source 
to libgcrypt functions, using shared error codes from libgpg-error,
replacing the old functions we used to have in ../util by those in
../jnlib and ../common, renaming the malloc functions and a couple of
types.  Note, that not all changes are listed below becuause they are
too similar and done at far too many places.  As of today the code
builds using the current libgcrypt from CVS but it is very unlikely
that it actually works.
This commit is contained in:
Werner Koch 2003-06-18 19:56:13 +00:00
parent 66a7843c94
commit ed0d33f1d0
12 changed files with 3594 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

12
scd/card.c
View file

@ -52,7 +52,7 @@ map_sc_err (int rc)
#endif
default: e = GPG_ERR_CARD; break;
}
return gpg_make_error (GPG_ERR_SOURCE_UNKNOWN, e);
return gpg_err_make (GPG_ERR_SOURCE_UNKNOWN, e);
}
/* Get the keygrip from CERT, return 0 on success */
@ -443,7 +443,7 @@ card_enum_keypairs (CARD card, int idx,
rc = card->fnc.enum_keypairs (card, idx, keygrip, keyid);
if (opt.verbose)
log_info ("card operation enum_keypairs result: %s\n",
gnupg_strerror (rc));
gpg_strerror (rc));
return rc;
}
@ -475,7 +475,7 @@ card_enum_certs (CARD card, int idx, char **certid, int *certtype)
rc = card->fnc.enum_certs (card, idx, certid, certtype);
if (opt.verbose)
log_info ("card operation enum_certs result: %s\n",
gnupg_strerror (rc));
gpg_strerror (rc));
return rc;
}
@ -499,7 +499,7 @@ card_read_cert (CARD card, const char *certidstr,
return gpg_error (GPG_ERR_UNSUPPORTED_OPERATION);
rc = card->fnc.read_cert (card, certidstr, cert, ncert);
if (opt.verbose)
log_info ("card operation read_cert result: %s\n", gnupg_strerror (rc));
log_info ("card operation read_cert result: %s\n", gpg_strerror (rc));
return rc;
}
@ -527,7 +527,7 @@ card_sign (CARD card, const char *keyidstr, int hashalgo,
indata, indatalen,
outdata, outdatalen);
if (opt.verbose)
log_info ("card operation sign result: %s\n", gnupg_strerror (rc));
log_info ("card operation sign result: %s\n", gpg_strerror (rc));
return rc;
}
@ -555,6 +555,6 @@ card_decipher (CARD card, const char *keyidstr,
indata, indatalen,
outdata, outdatalen);
if (opt.verbose)
log_info ("card operation decipher result: %s\n", gnupg_strerror (rc));
log_info ("card operation decipher result: %s\n", gpg_strerror (rc));
return rc;
}

8
scd/command.c
View file

@ -317,7 +317,7 @@ cmd_readcert (ASSUAN_CONTEXT ctx, char *line)
rc = card_read_cert (ctrl->card_ctx, line, &cert, &ncert);
if (rc)
{
log_error ("card_read_cert failed: %s\n", gnupg_strerror (rc));
log_error ("card_read_cert failed: %s\n", gpg_strerror (rc));
}
if (!rc)
{
@ -351,7 +351,7 @@ cmd_readkey (ASSUAN_CONTEXT ctx, char *line)
rc = card_read_cert (ctrl->card_ctx, line, &cert, &ncert);
if (rc)
{
log_error ("card_read_cert failed: %s\n", gnupg_strerror (rc));
log_error ("card_read_cert failed: %s\n", gpg_strerror (rc));
goto leave;
}
@ -488,7 +488,7 @@ cmd_pksign (ASSUAN_CONTEXT ctx, char *line)
free (keyidstr);
if (rc)
{
log_error ("card_sign failed: %s\n", gnupg_strerror (rc));
log_error ("card_sign failed: %s\n", gpg_strerror (rc));
}
else
{
@ -527,7 +527,7 @@ cmd_pkdecrypt (ASSUAN_CONTEXT ctx, char *line)
free (keyidstr);
if (rc)
{
log_error ("card_create_signature failed: %s\n", gnupg_strerror (rc));
log_error ("card_create_signature failed: %s\n", gpg_strerror (rc));
}
else
{