aboutsummaryrefslogtreecommitdiffstats
path: root/sm
diff options
context:
space:
mode:
Diffstat (limited to 'sm')
-rw-r--r--sm/call-dirmngr.c6
-rw-r--r--sm/certchain.c2
-rw-r--r--sm/delete.c2
-rw-r--r--sm/export.c4
-rw-r--r--sm/gpgsm.c10
-rw-r--r--sm/gpgsm.h8
-rw-r--r--sm/keydb.c4
-rw-r--r--sm/keydb.h2
-rw-r--r--sm/keylist.c8
-rw-r--r--sm/server.c12
10 files changed, 29 insertions, 29 deletions
diff --git a/sm/call-dirmngr.c b/sm/call-dirmngr.c
index 376940bd5..5cc34e132 100644
--- a/sm/call-dirmngr.c
+++ b/sm/call-dirmngr.c
@@ -575,9 +575,9 @@ lookup_cb (void *opaque, const void *buffer, size_t length)
/* Return a properly escaped pattern from NAMES. The only error
return is NULL to indicate a malloc failure. */
static char *
-pattern_from_strlist (STRLIST names)
+pattern_from_strlist (strlist_t names)
{
- STRLIST sl;
+ strlist_t sl;
int n;
const char *s;
char *pattern, *p;
@@ -665,7 +665,7 @@ lookup_status_cb (void *opaque, const char *line)
the callback CB which will be passed cert by cert. Note that CTRL
is optional. */
int
-gpgsm_dirmngr_lookup (ctrl_t ctrl, STRLIST names,
+gpgsm_dirmngr_lookup (ctrl_t ctrl, strlist_t names,
void (*cb)(void*, ksba_cert_t), void *cb_value)
{
int rc;
diff --git a/sm/certchain.c b/sm/certchain.c
index ea4a3792a..bd130494b 100644
--- a/sm/certchain.c
+++ b/sm/certchain.c
@@ -701,7 +701,7 @@ gpgsm_validate_chain (ctrl_t ctrl, ksba_cert_t cert, ksba_isotime_t r_exptime,
for (;;)
{
int is_root;
- gpg_error_t istrusted_rc;
+ gpg_error_t istrusted_rc = -1;
struct rootca_flags_s rootca_flags;
xfree (issuer);
diff --git a/sm/delete.c b/sm/delete.c
index 5066a737e..199e53eb4 100644
--- a/sm/delete.c
+++ b/sm/delete.c
@@ -148,7 +148,7 @@ delete_one (ctrl_t ctrl, const char *username)
/* Delete the certificates specified by NAMES. */
int
-gpgsm_delete (ctrl_t ctrl, STRLIST names)
+gpgsm_delete (ctrl_t ctrl, strlist_t names)
{
int rc;
diff --git a/sm/export.c b/sm/export.c
index 0f01e5f64..dc0820e50 100644
--- a/sm/export.c
+++ b/sm/export.c
@@ -129,14 +129,14 @@ insert_duptable (duptable_t *table, unsigned char *fpr, int *exists)
/* Export all certificates or just those given in NAMES. */
void
-gpgsm_export (ctrl_t ctrl, STRLIST names, FILE *fp)
+gpgsm_export (ctrl_t ctrl, strlist_t names, FILE *fp)
{
KEYDB_HANDLE hd = NULL;
KEYDB_SEARCH_DESC *desc = NULL;
int ndesc;
Base64Context b64writer = NULL;
ksba_writer_t writer;
- STRLIST sl;
+ strlist_t sl;
ksba_cert_t cert = NULL;
int rc=0;
int count = 0;
diff --git a/sm/gpgsm.c b/sm/gpgsm.c
index 6769a486d..08251647b 100644
--- a/sm/gpgsm.c
+++ b/sm/gpgsm.c
@@ -721,8 +721,8 @@ main ( int argc, char **argv)
const char *fname;
/* char *username;*/
int may_coredump;
- STRLIST sl, remusr= NULL, locusr=NULL;
- STRLIST nrings=NULL;
+ strlist_t sl, remusr= NULL, locusr=NULL;
+ strlist_t nrings=NULL;
int detached_sig = 0;
FILE *configfp = NULL;
char *configname = NULL;
@@ -1673,10 +1673,10 @@ main ( int argc, char **argv)
/* cleanup */
gpgsm_release_certlist (recplist);
gpgsm_release_certlist (signerlist);
- FREE_STRLIST(remusr);
- FREE_STRLIST(locusr);
+ FREE_STRLIST (remusr);
+ FREE_STRLIST (locusr);
gpgsm_exit(0);
- return 8; /*NEVER REACHED*/
+ return 8; /*NOTREACHED*/
}
/* Note: This function is used by signal handlers!. */
diff --git a/sm/gpgsm.h b/sm/gpgsm.h
index ba0ea3d27..541783dd7 100644
--- a/sm/gpgsm.h
+++ b/sm/gpgsm.h
@@ -278,7 +278,7 @@ void gpgsm_release_certlist (certlist_t list);
int gpgsm_find_cert (const char *name, ksba_sexp_t keyid, ksba_cert_t *r_cert);
/*-- keylist.c --*/
-gpg_error_t gpgsm_list_keys (ctrl_t ctrl, STRLIST names,
+gpg_error_t gpgsm_list_keys (ctrl_t ctrl, strlist_t names,
FILE *fp, unsigned int mode);
/*-- import.c --*/
@@ -287,11 +287,11 @@ int gpgsm_import_files (ctrl_t ctrl, int nfiles, char **files,
int (*of)(const char *fname));
/*-- export.c --*/
-void gpgsm_export (ctrl_t ctrl, STRLIST names, FILE *fp);
+void gpgsm_export (ctrl_t ctrl, strlist_t names, FILE *fp);
void gpgsm_p12_export (ctrl_t ctrl, const char *name, FILE *fp);
/*-- delete.c --*/
-int gpgsm_delete (ctrl_t ctrl, STRLIST names);
+int gpgsm_delete (ctrl_t ctrl, strlist_t names);
/*-- verify.c --*/
int gpgsm_verify (ctrl_t ctrl, int in_fd, int data_fd, FILE *out_fp);
@@ -341,7 +341,7 @@ gpg_error_t gpgsm_agent_get_confirmation (ctrl_t ctrl, const char *desc);
int gpgsm_dirmngr_isvalid (ctrl_t ctrl,
ksba_cert_t cert, ksba_cert_t issuer_cert,
int use_ocsp);
-int gpgsm_dirmngr_lookup (ctrl_t ctrl, STRLIST names,
+int gpgsm_dirmngr_lookup (ctrl_t ctrl, strlist_t names,
void (*cb)(void*, ksba_cert_t), void *cb_value);
int gpgsm_dirmngr_run_command (ctrl_t ctrl, const char *command,
int argc, char **argv);
diff --git a/sm/keydb.c b/sm/keydb.c
index 8ba1287fc..da2ec4ac5 100644
--- a/sm/keydb.c
+++ b/sm/keydb.c
@@ -1420,13 +1420,13 @@ keydb_set_cert_flags (ksba_cert_t cert, int which, int idx, unsigned int value)
/* Reset all the certificate flags we have stored with the certificates
for performance reasons. */
void
-keydb_clear_some_cert_flags (ctrl_t ctrl, STRLIST names)
+keydb_clear_some_cert_flags (ctrl_t ctrl, strlist_t names)
{
gpg_error_t err;
KEYDB_HANDLE hd = NULL;
KEYDB_SEARCH_DESC *desc = NULL;
int ndesc;
- STRLIST sl;
+ strlist_t sl;
int rc=0;
unsigned int old_value, value;
diff --git a/sm/keydb.h b/sm/keydb.h
index a6a6f3c29..e12afe1f6 100644
--- a/sm/keydb.h
+++ b/sm/keydb.h
@@ -77,7 +77,7 @@ int keydb_store_cert (ksba_cert_t cert, int ephemeral, int *existed);
gpg_error_t keydb_set_cert_flags (ksba_cert_t cert, int which, int idx,
unsigned int value);
-void keydb_clear_some_cert_flags (ctrl_t ctrl, STRLIST names);
+void keydb_clear_some_cert_flags (ctrl_t ctrl, strlist_t names);
#endif /*GNUPG_KEYDB_H*/
diff --git a/sm/keylist.c b/sm/keylist.c
index 3994afedc..39c4e5003 100644
--- a/sm/keylist.c
+++ b/sm/keylist.c
@@ -1135,12 +1135,12 @@ list_cert_chain (ctrl_t ctrl, KEYDB_HANDLE hd,
output mode will be used instead of the standard beautified one.
*/
static gpg_error_t
-list_internal_keys (ctrl_t ctrl, STRLIST names, FILE *fp,
+list_internal_keys (ctrl_t ctrl, strlist_t names, FILE *fp,
unsigned int mode, int raw_mode)
{
KEYDB_HANDLE hd;
KEYDB_SEARCH_DESC *desc = NULL;
- STRLIST sl;
+ strlist_t sl;
int ndesc;
ksba_cert_t cert = NULL;
gpg_error_t rc = 0;
@@ -1329,7 +1329,7 @@ list_external_cb (void *cb_value, ksba_cert_t cert)
make sense here because it would be unwise to list external secret
keys */
static gpg_error_t
-list_external_keys (ctrl_t ctrl, STRLIST names, FILE *fp, int raw_mode)
+list_external_keys (ctrl_t ctrl, strlist_t names, FILE *fp, int raw_mode)
{
int rc;
struct list_external_parm_s parm;
@@ -1359,7 +1359,7 @@ list_external_keys (ctrl_t ctrl, STRLIST names, FILE *fp, int raw_mode)
Bit 8: Do a raw format dump.
*/
gpg_error_t
-gpgsm_list_keys (ctrl_t ctrl, STRLIST names, FILE *fp, unsigned int mode)
+gpgsm_list_keys (ctrl_t ctrl, strlist_t names, FILE *fp, unsigned int mode)
{
gpg_error_t err = 0;
diff --git a/sm/server.c b/sm/server.c
index 4054c1857..4b6fe390b 100644
--- a/sm/server.c
+++ b/sm/server.c
@@ -537,12 +537,12 @@ cmd_export (assuan_context_t ctx, char *line)
int fd = assuan_get_output_fd (ctx);
FILE *out_fp;
char *p;
- STRLIST list, sl;
+ strlist_t list, sl;
if (fd == -1)
return set_error (GPG_ERR_ASS_NO_OUTPUT, NULL);
- /* break the line down into an STRLIST */
+ /* break the line down into an strlist_t */
list = NULL;
for (p=line; *p; line = p)
{
@@ -588,10 +588,10 @@ cmd_delkeys (assuan_context_t ctx, char *line)
{
ctrl_t ctrl = assuan_get_pointer (ctx);
char *p;
- STRLIST list, sl;
+ strlist_t list, sl;
int rc;
- /* break the line down into an STRLIST */
+ /* break the line down into an strlist_t */
list = NULL;
for (p=line; *p; line = p)
{
@@ -658,11 +658,11 @@ do_listkeys (assuan_context_t ctx, char *line, int mode)
ctrl_t ctrl = assuan_get_pointer (ctx);
FILE *fp;
char *p;
- STRLIST list, sl;
+ strlist_t list, sl;
unsigned int listmode;
gpg_error_t err;
- /* Break the line down into an STRLIST. */
+ /* Break the line down into an strlist. */
list = NULL;
for (p=line; *p; line = p)
{
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-18 16:57:46 +0000