security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00
Code Activity

Minor fixes

Browse Source
This commit is contained in:
Werner Koch 2003-09-30 13:22:33 +00:00
parent 5cf6152b4c
commit 3af881581f
4 changed files with 10 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
g10/ChangeLog
View File

@ -1,3 +1,7 @@
2003-09-27 Werner Koch <wk@gnupg.org>
* sign.c (do_sign): Removed disabled testcode.
2003-09-26 Timo Schulz <twoaday@freakmail.de> 2003-09-26 Timo Schulz <twoaday@freakmail.de>
* card_status (card_status): Do not use fputs since the fp * card_status (card_status): Do not use fputs since the fp

38
g10/sign.c
View File

@ -307,43 +307,7 @@ do_sign( PKT_secret_key *sk, PKT_signature *sig,
sig->digest_algo = digest_algo; sig->digest_algo = digest_algo;
sig->digest_start[0] = dp[0]; sig->digest_start[0] = dp[0];
sig->digest_start[1] = dp[1]; sig->digest_start[1] = dp[1];
#if 0 if (sk->is_protected && sk->protect.s2k.mode == 1002)
if (sk->is_protected && sk->protect.s2k.mode == 1002 && !sk->is_primary)
{ /* Temporary hack to test tey auth command. */
char *rbuf;
size_t rbuflen;
char *snbuf;
char *tmpbuf;
size_t tmp_n;
frame = encode_md_value( sk->pubkey_algo, md,
digest_algo, mpi_get_nbits(sk->skey[0]), 0 );
if (!frame)
return GPG_ERR_GENERAL;
if (gcry_mpi_aprint (GCRYMPI_FMT_USG, (void **)&tmpbuf, &tmp_n, frame ))
BUG ();
for (; tmp_n && *tmpbuf; tmp_n--, tmpbuf++)
;
assert (tmp_n);
tmp_n--;
tmpbuf++;
snbuf = serialno_and_fpr_from_sk (sk->protect.iv, sk->protect.ivlen, sk);
rc = agent_scd_pksign (snbuf, 0,
tmpbuf, tmp_n,
&rbuf, &rbuflen);
xfree (snbuf);
if (!rc)
{
if (gcry_mpi_scan (&sig->data[0], GCRYMPI_FMT_USG,
rbuf, rbuflen, NULL ))
BUG ();
}
}
else
#endif
if (sk->is_protected && sk->protect.s2k.mode == 1002)
{ /* FIXME: Note that we do only support RSA for now. */ { /* FIXME: Note that we do only support RSA for now. */
char *rbuf; char *rbuf;
size_t rbuflen; size_t rbuflen;

4
scd/ChangeLog
View File

@ -1,3 +1,7 @@
2003-09-28 Werner Koch <wk@gnupg.org>
* app-openpgp.c (dump_all_do): Use gpg_err_code and not gpg_error.
2003-09-19 Werner Koch <wk@gnupg.org> 2003-09-19 Werner Koch <wk@gnupg.org>
* ccid-driver.c (parse_ccid_descriptor): New. * ccid-driver.c (parse_ccid_descriptor): New.

2
scd/app-openpgp.c
View File

@ -228,7 +228,7 @@ dump_all_do (int slot)
continue; continue;
rc = iso7816_get_data (slot, data_objects[i].tag, &buffer, &buflen); rc = iso7816_get_data (slot, data_objects[i].tag, &buffer, &buflen);
if (gpg_error (rc) == GPG_ERR_NO_OBJ) if (gpg_err_code (rc) == GPG_ERR_NO_OBJ)
; ;
else if (rc) else if (rc)
log_info ("DO `%s' not available: %s\n", log_info ("DO `%s' not available: %s\n",