diff options
| -rw-r--r-- | common/Makefile.am | 2 | ||||
| -rw-r--r-- | common/util.h | 5 | ||||
| -rw-r--r-- | common/zb32.h | 38 | ||||
| -rw-r--r-- | dirmngr/server.c | 1 | ||||
| -rw-r--r-- | g10/keylist.c | 1 | ||||
| -rw-r--r-- | g10/misc.c | 1 |
6 files changed, 42 insertions, 6 deletions
diff --git a/common/Makefile.am b/common/Makefile.am index 6cbde0bc0..fd3a04f4f 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -64,7 +64,7 @@ common_sources = \ homedir.c \ gettime.c gettime.h \ yesno.c \ - b64enc.c b64dec.c zb32.c \ + b64enc.c b64dec.c zb32.c zb32.h \ convert.c \ percent.c \ mbox-util.c mbox-util.h \ diff --git a/common/util.h b/common/util.h index 06d5f8772..b2651c444 100644 --- a/common/util.h +++ b/common/util.h @@ -274,11 +274,6 @@ 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); - -/*-- zb32.c --*/ -char *zb32_encode (const void *data, unsigned int databits); - - /*-- sexputil.c */ char *canon_sexp_to_string (const unsigned char *canon, size_t canonlen); void log_printcanon (const char *text, diff --git a/common/zb32.h b/common/zb32.h new file mode 100644 index 000000000..1fb41ecae --- /dev/null +++ b/common/zb32.h @@ -0,0 +1,38 @@ +/* zb32.h - z-base-32 functions + * Copyright (C) 2014 Werner Koch + * + * This file is part of GnuPG. + * + * This file is free software; you can redistribute it and/or modify + * it under the terms of either + * + * - the GNU Lesser General Public License as published by the Free + * Software Foundation; either version 3 of the License, or (at + * your option) any later version. + * + * or + * + * - the GNU General Public License as published by the Free + * Software Foundation; either version 2 of the License, or (at + * your option) any later version. + * + * or both in parallel, as here. + * + * This file is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. + */ + +#ifndef GNUPG_COMMON_ZB32_H +#define GNUPG_COMMON_ZB32_H + +/* Encode DATA which has a length of DATABITS (bits!) using the + zbase32 encoder and return a malloced string. Returns NULL on + error and sets ERRNO. */ +char *zb32_encode (const void *data, unsigned int databits); + +#endif /*GNUPG_COMMON_ZB32_H*/ diff --git a/dirmngr/server.c b/dirmngr/server.c index a41d34f03..74e00fb2b 100644 --- a/dirmngr/server.c +++ b/dirmngr/server.c @@ -52,6 +52,7 @@ #endif #include "dns-stuff.h" #include "mbox-util.h" +#include "zb32.h" /* To avoid DoS attacks we limit the size of a certificate to something reasonable. The DoS was actually only an issue back when diff --git a/g10/keylist.c b/g10/keylist.c index 509cf7c1b..cc9784663 100644 --- a/g10/keylist.c +++ b/g10/keylist.c @@ -43,6 +43,7 @@ #include "status.h" #include "call-agent.h" #include "mbox-util.h" +#include "zb32.h" #include "tofu.h" diff --git a/g10/misc.c b/g10/misc.c index 5c77714d3..7f0b08a28 100644 --- a/g10/misc.c +++ b/g10/misc.c @@ -67,6 +67,7 @@ #include "options.h" #include "call-agent.h" #include "i18n.h" +#include "zb32.h" #include <assert.h> |