summaryrefslogtreecommitdiffstats
path: root/lib/libalpm/signing.c
diff options
context:
space:
mode:
authorAllan McRae <allan@archlinux.org>2016-09-25 12:31:01 +0200
committerAllan McRae <allan@archlinux.org>2016-09-25 12:31:01 +0200
commit09acd289e72fc40e91f9f1daf7554d26818d33bb (patch)
tree8d80ee53177c150aba842141770c946d2f200d32 /lib/libalpm/signing.c
parent2f09a3fd0aadf9650f0641b56f8b5a2af3f71f84 (diff)
downloadpacman-09acd289e72fc40e91f9f1daf7554d26818d33bb.tar.gz
pacman-09acd289e72fc40e91f9f1daf7554d26818d33bb.tar.xz
use openssl for base64
Diffstat (limited to 'lib/libalpm/signing.c')
-rw-r--r--lib/libalpm/signing.c17
1 files changed, 2 insertions, 15 deletions
diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c
index 6557c200..421e3acb 100644
--- a/lib/libalpm/signing.c
+++ b/lib/libalpm/signing.c
@@ -29,7 +29,6 @@
/* libalpm */
#include "signing.h"
#include "package.h"
-#include "base64.h"
#include "util.h"
#include "log.h"
#include "alpm.h"
@@ -46,22 +45,10 @@
int SYMEXPORT alpm_decode_signature(const char *base64_data,
unsigned char **data, size_t *data_len)
{
- size_t len = strlen(base64_data);
- unsigned char *usline = (unsigned char *)base64_data;
- /* reasonable allocation of expected length is 3/4 of encoded length */
- size_t destlen = len * 3 / 4;
- MALLOC(*data, destlen, goto error);
- if(base64_decode(*data, &destlen, usline, len)) {
- free(*data);
- goto error;
+ if(_alpm_base64_decode(base64_data, *data, data_len)) {
+ return -1;
}
- *data_len = destlen;
return 0;
-
-error:
- *data = NULL;
- *data_len = 0;
- return -1;
}
#ifdef HAVE_LIBGPGME