aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2021-03-02 12:49:55 +0000
committerWerner Koch <[email protected]>2021-03-02 12:49:55 +0000
commitc99f3599d80d351dda1400314b43ea8ccdcc7b7d (patch)
tree20baa9cb04521461d34fdbb76d7bb51937faa967
parentgpg: Keep temp files when opening images via xdg-open (diff)
downloadgnupg-c99f3599d80d351dda1400314b43ea8ccdcc7b7d.tar.gz
gnupg-c99f3599d80d351dda1400314b43ea8ccdcc7b7d.zip
sm: Remove unused function.
* sm/keydb.c (keydb_insert_cert): Remove. * kbx/keybox-update.c (keybox_update_cert): Remove stub.
-rw-r--r--kbx/keybox-update.c11
-rw-r--r--kbx/keybox.h2
-rw-r--r--sm/keydb.c38
-rw-r--r--sm/keydb.h1
4 files changed, 0 insertions, 52 deletions
diff --git a/kbx/keybox-update.c b/kbx/keybox-update.c
index ddda52ac1..6e45f3d4d 100644
--- a/kbx/keybox-update.c
+++ b/kbx/keybox-update.c
@@ -483,17 +483,6 @@ keybox_insert_cert (KEYBOX_HANDLE hd, ksba_cert_t cert,
return rc;
}
-int
-keybox_update_cert (KEYBOX_HANDLE hd, ksba_cert_t cert,
- unsigned char *sha1_digest)
-{
- (void)hd;
- (void)cert;
- (void)sha1_digest;
- return -1;
-}
-
-
#endif /*KEYBOX_WITH_X509*/
/* Note: We assume that the keybox has been locked before the current
diff --git a/kbx/keybox.h b/kbx/keybox.h
index c5f9b571e..565274c10 100644
--- a/kbx/keybox.h
+++ b/kbx/keybox.h
@@ -109,8 +109,6 @@ gpg_error_t keybox_update_keyblock (KEYBOX_HANDLE hd,
#ifdef KEYBOX_WITH_X509
int keybox_insert_cert (KEYBOX_HANDLE hd, ksba_cert_t cert,
unsigned char *sha1_digest);
-int keybox_update_cert (KEYBOX_HANDLE hd, ksba_cert_t cert,
- unsigned char *sha1_digest);
#endif /*KEYBOX_WITH_X509*/
int keybox_set_flags (KEYBOX_HANDLE hd, int what, int idx, unsigned int value);
diff --git a/sm/keydb.c b/sm/keydb.c
index 8c0537a9f..c4803f8b7 100644
--- a/sm/keydb.c
+++ b/sm/keydb.c
@@ -778,44 +778,6 @@ keydb_insert_cert (KEYDB_HANDLE hd, ksba_cert_t cert)
}
-
-/* Update the current keyblock with KB. */
-int
-keydb_update_cert (KEYDB_HANDLE hd, ksba_cert_t cert)
-{
- int rc = 0;
- unsigned char digest[20];
-
- if (!hd)
- return gpg_error (GPG_ERR_INV_VALUE);
-
- if ( hd->found < 0 || hd->found >= hd->used)
- return -1; /* nothing found */
-
- if (opt.dry_run)
- return 0;
-
- rc = lock_all (hd);
- if (rc)
- return rc;
-
- gpgsm_get_fingerprint (cert, GCRY_MD_SHA1, digest, NULL); /* kludge*/
-
- switch (hd->active[hd->found].type)
- {
- case KEYDB_RESOURCE_TYPE_NONE:
- rc = gpg_error (GPG_ERR_GENERAL); /* oops */
- break;
- case KEYDB_RESOURCE_TYPE_KEYBOX:
- rc = keybox_update_cert (hd->active[hd->found].u.kr, cert, digest);
- break;
- }
-
- unlock_all (hd);
- return rc;
-}
-
-
/*
* The current keyblock or cert will be deleted.
*/
diff --git a/sm/keydb.h b/sm/keydb.h
index 623462553..f4db5d394 100644
--- a/sm/keydb.h
+++ b/sm/keydb.h
@@ -47,7 +47,6 @@ void keydb_push_found_state (KEYDB_HANDLE hd);
void keydb_pop_found_state (KEYDB_HANDLE hd);
int keydb_get_cert (KEYDB_HANDLE hd, ksba_cert_t *r_cert);
int keydb_insert_cert (KEYDB_HANDLE hd, ksba_cert_t cert);
-int keydb_update_cert (KEYDB_HANDLE hd, ksba_cert_t cert);
int keydb_delete (KEYDB_HANDLE hd, int unlock);