Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAllan McRae <allan@archlinux.org>2012-11-02 23:44:11 +1000
committerAllan McRae <allan@archlinux.org>2013-02-09 12:43:37 +1000
commit198154962beca8707b19f5efb773f1a3ad10e154 (patch)
treeecae5f4b35af198c96670795aac98cfe74475425
parent05745089ac7009e5de84d676dd0823acd8c4d1fc (diff)
Make decode_signature available to the library
Signed-off-by: Allan McRae <allan@archlinux.org>
-rw-r--r--lib/libalpm/signing.c5
-rw-r--r--lib/libalpm/signing.h2
2 files changed, 5 insertions, 2 deletions
diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c
index dc882821..aa7e134a 100644
--- a/lib/libalpm/signing.c
+++ b/lib/libalpm/signing.c
@@ -418,7 +418,8 @@ int _alpm_key_import(alpm_handle_t *handle, const char *fpr) {
* @param data_len the length of the returned data
* @return 0 on success, -1 on failure to properly decode
*/
-static int decode_signature(const char *base64_data,
+
+int _alpm_decode_signature(const char *base64_data,
unsigned char **data, size_t *data_len)
{
size_t len = strlen(base64_data);
@@ -518,7 +519,7 @@ int _alpm_gpgme_checksig(alpm_handle_t *handle, const char *path,
if(base64_sig) {
/* memory-based, we loaded it from a sync DB */
size_t data_len;
- int decode_ret = decode_signature(base64_sig,
+ int decode_ret = _alpm_decode_signature(base64_sig,
&decoded_sigdata, &data_len);
if(decode_ret) {
handle->pm_errno = ALPM_ERR_SIG_INVALID;
diff --git a/lib/libalpm/signing.h b/lib/libalpm/signing.h
index ce9edcdc..2d49240b 100644
--- a/lib/libalpm/signing.h
+++ b/lib/libalpm/signing.h
@@ -34,6 +34,8 @@ int _alpm_process_siglist(alpm_handle_t *handle, const char *identifier,
int _alpm_key_in_keychain(alpm_handle_t *handle, const char *fpr);
int _alpm_key_import(alpm_handle_t *handle, const char *fpr);
+int _alpm_decode_signature(const char *base64_data,
+ unsigned char **data, size_t *data_len);
int _alpm_extract_keyid(alpm_handle_t *handle, const char *identifier,
const unsigned char *sig, const size_t len, alpm_list_t **keys);