security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-02-22 19:58:29 +01:00
Code Activity

Fixed auto generation of the key stub.

Browse Source 
Fixed bug 851.
Allow decryption using type 20 Elgamal keys.
This commit is contained in:
Werner Koch 2007-12-10 15:34:20 +00:00
parent aa9aec7068
commit 0e927e3941
5 changed files with 65 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
g10/ChangeLog
View File

@ -1,3 +1,20 @@
2007-12-10 Werner Koch <wk@g10code.com>
* cardglue.h (gpg_error_from_syserror): New.
* app-openpgp.c (do_decipher): Take care of cryptograms shorter
that 128 bytes. Fixes bug#851.
* import.c (auto_create_card_key_stub): Do not clear the entire
fingerprint. This finally makes the stub creation work. My past
tests seemed to work because there was a key with a all zero
fingerprint available (Elgamal signing keys).
2007-12-08 Werner Koch <wk@g10code.com>
* misc.c (openpgp_pk_algo_usage): Allow Elgamal type 20 for
encryption.
2007-12-03 Werner Koch <wk@g10code.com>
* keygen.c (ask_key_flags): Add a translation remark and implement

43
g10/app-openpgp.c
View File

@ -1,5 +1,5 @@
/* app-openpgp.c - The OpenPGP card application.
* Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
* Copyright (C) 2003, 2004, 2005, 2007 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
@ -2315,8 +2315,49 @@ do_decipher (app_t app, const char *keyidstr,
rc = verify_chv2 (app, pincb, pincb_arg);
if (!rc)
{
size_t fixuplen;
/* We might encounter a couple of leading zeroes in the
cryptogram. Due to internal use of MPIs thease leading
zeroes are stripped. However the OpenPGP card expects
exactly 128 bytes for the cryptogram (for a 1k key). Thus we
need to fix it up. We do this for up to 16 leading zero
bytes; a cryptogram with more than this is with a very high
probability anyway broken. */
if (indatalen >= (128-16) && indatalen < 128) /* 1024 bit key. */
fixuplen = 128 - indatalen;
else if (indatalen >= (256-16) && indatalen < 256) /* 2048 bit key. */
fixuplen = 256 - indatalen;
else if (indatalen >= (192-16) && indatalen < 192) /* 1536 bit key. */
fixuplen = 192 - indatalen;
else
fixuplen = 0;
if (fixuplen)
{
unsigned char *fixbuf;
/* While we have to prepend stuff anyway, we can also
include the padding byte here so that iso1816_decipher
does not need to do yet another data mangling. */
fixuplen++;
fixbuf = xtrymalloc (fixuplen + indatalen);
if (!fixbuf)
rc = gpg_error_from_syserror ();
else
{
memset (fixbuf, 0, fixuplen);
memcpy (fixbuf+fixuplen, indata, indatalen);
rc = iso7816_decipher (app->slot, fixbuf, fixuplen+indatalen, -1,
outdata, outdatalen);
xfree (fixbuf);
}
}
else
rc = iso7816_decipher (app->slot, indata, indatalen, 0,
outdata, outdatalen);
}
return rc;
}

1
g10/cardglue.h
View File

@ -127,6 +127,7 @@ typedef int gpg_err_code_t;
#define gpg_strerror(n) g10_errstr ((n))
#define gpg_error_from_errno(n) (G10ERR_GENERAL) /*FIXME*/
#define gpg_err_code_from_errno(n) (G10ERR_GENERAL)
#define gpg_error_from_syserror() (G10ERR_GENERAL) /*FIXME*/
/* We are not using it in a library, so we even let xtrymalloc
abort. Because we won't never return from these malloc functions,

3
g10/import.c
View File

@ -2348,7 +2348,8 @@ auto_create_card_key_stub ( const char *serialnostr,
size_t an;
fingerprint_from_pk (pk, afp, &an);
memset (afp, 0, MAX_FINGERPRINT_LEN);
if (an < MAX_FINGERPRINT_LEN)
memset (afp+an, 0, MAX_FINGERPRINT_LEN-an);
rc = keydb_search_fpr (hd, afp);
}

1
g10/misc.c
View File

@ -413,6 +413,7 @@ openpgp_pk_algo_usage ( int algo )
case PUBKEY_ALGO_RSA_S:
use = PUBKEY_USAGE_CERT | PUBKEY_USAGE_SIG;
break;
case PUBKEY_ALGO_ELGAMAL:
case PUBKEY_ALGO_ELGAMAL_E:
use = PUBKEY_USAGE_ENC;
break;