diff options
| author | Werner Koch <[email protected]> | 2020-05-05 06:07:11 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2020-05-05 06:07:11 +0000 |
| commit | 314859d7e7de5010ca1e9d90b83acf3bc8493631 (patch) | |
| tree | 7fb017efa8cac15991ce5fc0c8839d7db2c2c8c6 /scd/app-piv.c | |
| parent | scd:nks: Add do_with_keygrip and implement a cache. (diff) | |
| download | gnupg-314859d7e7de5010ca1e9d90b83acf3bc8493631.tar.gz gnupg-314859d7e7de5010ca1e9d90b83acf3bc8493631.zip | |
scd: Extend an internal function to also return the algo.
* 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 <[email protected]>
Diffstat (limited to 'scd/app-piv.c')
| -rw-r--r-- | scd/app-piv.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scd/app-piv.c b/scd/app-piv.c index e6298e575..e0bf886cd 100644 --- a/scd/app-piv.c +++ b/scd/app-piv.c @@ -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", |