mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
Use gpgrt_b64* API of libgpg-error.
* common/Makefile.am (common_sources): Remove b64enc.c and b64dec.c. (module_maint_tests): Remove t-b64. (t_b64_LDADD): Remove. * common/util.h: Remove the internal API. * common/ssh-utils.c (get_fingerprint): Use the gpgrt_b64 API. (ssh_public_key_in_base64): Likewise. * dirmngr/crlfetch.c (my_es_read, crl_close_reader): Likewise. * dirmngr/dirmngr-client.c (data_cb, do_lookup): Likewise. * dirmngr/misc.c (armor_data): Likewise. * g10/export.c (export_one_ssh_key, export_secret_ssh_key): Likewise. * tools/gpg-card.c (cmd_writecert): Likewise. * tools/mime-parser.c (parse_message_cb, mime_parser_release) (process_part_data): Likewise. * tools/wks-util.c (wks_armor_key): Likewise. -- GnuPG-bug-id: 6734 Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
parent
34f812475e
commit
26939ea222
10 changed files with 75 additions and 99 deletions
|
@ -143,35 +143,6 @@ ssize_t read_line (FILE *fp,
|
|||
char **addr_of_buffer, size_t *length_of_buffer,
|
||||
size_t *max_length);
|
||||
|
||||
|
||||
/*-- b64enc.c and b64dec.c --*/
|
||||
struct b64state
|
||||
{
|
||||
unsigned int flags;
|
||||
int idx;
|
||||
int quad_count;
|
||||
FILE *fp;
|
||||
estream_t stream;
|
||||
char *title;
|
||||
unsigned char radbuf[4];
|
||||
u32 crc;
|
||||
int stop_seen:1;
|
||||
int invalid_encoding:1;
|
||||
gpg_error_t lasterr;
|
||||
};
|
||||
|
||||
gpg_error_t b64enc_start (struct b64state *state, FILE *fp, const char *title);
|
||||
gpg_error_t b64enc_start_es (struct b64state *state, estream_t fp,
|
||||
const char *title);
|
||||
gpg_error_t b64enc_write (struct b64state *state,
|
||||
const void *buffer, size_t nbytes);
|
||||
gpg_error_t b64enc_finish (struct b64state *state);
|
||||
|
||||
gpg_error_t b64dec_start (struct b64state *state, const char *title);
|
||||
gpg_error_t b64dec_proc (struct b64state *state, void *buffer, size_t length,
|
||||
size_t *r_nbytes);
|
||||
gpg_error_t b64dec_finish (struct b64state *state);
|
||||
|
||||
/*-- sexputil.c */
|
||||
char *canon_sexp_to_string (const unsigned char *canon, size_t canonlen);
|
||||
void log_printcanon (const char *text,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue