Browse Source

stripped useless pgp_getkeybyfpr parameter

master
Edouard Tisserant 7 years ago
parent
commit
e4f7ba589a
2 changed files with 11 additions and 3 deletions
  1. +11
    -2
      dist/src/lib/keyring.c
  2. +0
    -1
      dist/src/lib/keyring.h

+ 11
- 2
dist/src/lib/keyring.c View File

@ -1015,7 +1015,7 @@ pgp_deletekeybyid(pgp_io_t *io, pgp_keyring_t *keyring,
*/
const pgp_key_t *
pgp_getkeybyfpr(pgp_io_t *io, const pgp_keyring_t *keyring,
getkeybyfpr(pgp_io_t *io, const pgp_keyring_t *keyring,
const uint8_t *fpr, size_t length,
unsigned *from, pgp_pubkey_t **pubkey)
{
@ -1033,6 +1033,15 @@ pgp_getkeybyfpr(pgp_io_t *io, const pgp_keyring_t *keyring,
return NULL;
}
const pgp_key_t *
pgp_getkeybyfpr(pgp_io_t *io, const pgp_keyring_t *keyring,
const uint8_t *fpr, size_t length,
pgp_pubkey_t **pubkey)
{
unsigned from = 0;
return getkeybyfpr(io,keyring,fpr,length,&from,pubkey);
}
unsigned
pgp_deletekeybyfpr(pgp_io_t *io, pgp_keyring_t *keyring,
const uint8_t *fpr, size_t length)
@ -1040,7 +1049,7 @@ pgp_deletekeybyfpr(pgp_io_t *io, pgp_keyring_t *keyring,
unsigned from = 0;
pgp_key_t *key;
if ((key = (pgp_key_t *)pgp_getkeybyfpr(io, keyring, fpr, length,
if ((key = (pgp_key_t *)getkeybyfpr(io, keyring, fpr, length,
&from, NULL)) == NULL) {
return 0;
}


+ 0
- 1
dist/src/lib/keyring.h View File

@ -84,7 +84,6 @@ const pgp_key_t *pgp_getkeybyfpr(pgp_io_t *,
const pgp_keyring_t *,
const uint8_t *fpr,
size_t length,
unsigned *,
pgp_pubkey_t **);
unsigned pgp_deletekeybyfpr(pgp_io_t *,
pgp_keyring_t *,


Loading…
Cancel
Save