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

scd: Extend an internal function to also return the algo.

Browse source 
* scd/app-help.c (app_help_get_keygrip_string_pk): Add optional arg
r_algo.  Change all callers.
(app_help_get_keygrip_string): Ditto.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2020-05-05 08:07:11 +02:00
parent 1e72a1a218
commit 314859d7e7
No known key found for this signature in database
GPG key ID: E3FDFF218E45B72B
8 changed files with 24 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

6
scd/app-piv.c
View file

@ -526,7 +526,7 @@ add_tlv (unsigned char *buffer, unsigned int tag, size_t length)
}
/* Function to build a list of TLV and return the result in a mallcoed
/* Function to build a list of TLV and return the result in a malloced
* buffer. The varargs are tuples of (int,size_t,void) each with the
* tag, the length and the actual data. A (0,0,NULL) tuple terminates
* the list. Up to 10 tuples are supported. If SECMEM is true the
@ -1331,7 +1331,7 @@ get_keygrip_by_tag (app_t app, unsigned int tag,
err = ksba_cert_init_from_mem (cert, certbuf, certbuflen);
if (err)
goto leave;
err = app_help_get_keygrip_string (cert, *r_keygripstr, NULL);
err = app_help_get_keygrip_string (cert, *r_keygripstr, NULL, NULL);
}
leave:
@ -1539,7 +1539,7 @@ do_readkey (app_t app, ctrl_t ctrl, const char *keyrefstr, unsigned int flags,
char idbuf[50];
const char *usage;
err = app_help_get_keygrip_string_pk (pk, pklen, keygripstr, NULL);
err = app_help_get_keygrip_string_pk (pk, pklen, keygripstr, NULL, NULL);
if (err)
{
log_error ("app_help_get_keygrip_string_pk failed: %s\n",