mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
* encrypt.c (init_dek): Check for too weak algorithms.
* import.c (parse_p12, popen_protect_tool): New. * base64.c (gpgsm_create_reader): New arg ALLOW_MULTI_PEM. Changed all callers. (base64_reader_cb): Handle it here. (gpgsm_reader_eof_seen): New. (base64_reader_cb): Set a flag for EOF. (simple_reader_cb): Ditto.
This commit is contained in:
parent
8b49254b97
commit
1a159fd8e3
8 changed files with 457 additions and 68 deletions
|
@ -1,5 +1,5 @@
|
|||
/* gpgsm.h - Global definitions for GpgSM
|
||||
* Copyright (C) 2001, 2003 Free Software Foundation, Inc.
|
||||
* Copyright (C) 2001, 2003, 2004 Free Software Foundation, Inc.
|
||||
*
|
||||
* This file is part of GnuPG.
|
||||
*
|
||||
|
@ -54,6 +54,7 @@ struct {
|
|||
char *lc_messages;
|
||||
|
||||
const char *dirmngr_program;
|
||||
const char *protect_tool_program;
|
||||
char *outfile; /* name of output file */
|
||||
|
||||
int with_key_data;/* include raw key in the column delimted output */
|
||||
|
@ -176,7 +177,9 @@ char *gpgsm_get_certid (ksba_cert_t cert);
|
|||
|
||||
/*-- base64.c --*/
|
||||
int gpgsm_create_reader (Base64Context *ctx,
|
||||
ctrl_t ctrl, FILE *fp, ksba_reader_t *r_reader);
|
||||
ctrl_t ctrl, FILE *fp, int allow_multi_pem,
|
||||
ksba_reader_t *r_reader);
|
||||
int gpgsm_reader_eof_seen (Base64Context ctx);
|
||||
void gpgsm_destroy_reader (Base64Context ctx);
|
||||
int gpgsm_create_writer (Base64Context *ctx,
|
||||
ctrl_t ctrl, FILE *fp, ksba_writer_t *r_writer);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue