Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 4a70c81
libpkg: add a public-facing pkg_key API
Kyle Evans committed 2 years ago
commit 4a70c812412751e4a3e175af298e94e81b946853
parent 3026f48
5 files changed +139 -0
modified libpkg/Makefile.autosetup
@@ -6,6 +6,7 @@ SRCS= backup_lib.c \
	pkg_deps.c \

	pkg_repo_meta.c \

	pkg.c \
+ 
	pkg_key.c \

	pkgsign.c \

	pkgsign_ossl.c \

	clean_cache.c \
modified libpkg/libpkg.ver
@@ -233,6 +233,11 @@ global:
	pkgdb_transaction_rollback;

	pkgdb_upgrade_lock;

	ports_parse_plist;
+ 
	pkg_key_new;
+ 
	pkg_key_free;
+ 
	pkg_key_create;
+ 
	pkg_key_pubkey;
+ 
	pkg_key_info;

# Symbols from libcsu

	__progname;

	environ;
modified libpkg/pkg.h.in
@@ -92,6 +92,8 @@ extern "C" {


#define EX_NEEDRESTART	4
+ 
struct iovec;
+ 


struct pkg;

struct pkg_dep;

struct pkg_conflict;
@@ -109,6 +111,8 @@ struct pkgdb_it;
struct pkg_jobs;

struct pkg_solve_problem;
+ 
struct pkg_key;
+ 


struct pkg_repo;



struct pkg_plugin;
@@ -1481,6 +1485,13 @@ int pkgdb_reanalyse_shlibs(struct pkgdb *, struct pkg *);
void pkgdb_cmd(int argc, char **argv);

int pkg_sshserve(int fd);
+ 
int pkg_key_new(struct pkg_key **, const char *, const char *,
+ 
    pkg_password_cb *);
+ 
int pkg_key_create(struct pkg_key *, const struct iovec *, int);
+ 
int pkg_key_pubkey(struct pkg_key *, char **, size_t *);
+ 
int pkg_key_info(struct pkg_key *, struct iovec **, int *);
+ 
void pkg_key_free(struct pkg_key *);
+ 


int pkg_repos_total_count(void);

int pkg_repos_activated_count(void);

int pkg_repos(struct pkg_repo **);
added libpkg/pkg_key.c
@@ -0,0 +1,116 @@
+ 
/*-
+ 
 * Copyright (c) 2021 Kyle Evans <kevans@FreeBSD.org>
+ 
 *
+ 
 * Redistribution and use in source and binary forms, with or without
+ 
 * modification, are permitted provided that the following conditions
+ 
 * are met:
+ 
 * 1. Redistributions of source code must retain the above copyright
+ 
 *    notice, this list of conditions and the following disclaimer
+ 
 *    in this position and unchanged.
+ 
 * 2. Redistributions in binary form must reproduce the above copyright
+ 
 *    notice, this list of conditions and the following disclaimer in the
+ 
 *    documentation and/or other materials provided with the distribution.
+ 
 *
+ 
 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
+ 
 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ 
 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ 
 * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
+ 
 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ 
 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ 
 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ 
 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ 
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ 
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ 
 */
+
+ 
#include <sys/cdefs.h>
+
+ 
#include <assert.h>
+ 
#include <errno.h>
+ 
#include <stdlib.h>
+ 
#include <string.h>
+
+ 
#include "pkg.h"
+ 
#include "xmalloc.h"
+ 
#include "private/pkg.h"
+ 
#include "private/pkgsign.h"
+
+ 
int
+ 
pkg_key_new(struct pkg_key **key, const char *keytype, const char *keypath,
+ 
    pkg_password_cb *cb)
+ 
{
+ 
	struct pkg_key *nkey;
+ 
	struct pkgsign_ctx *ctx = NULL;
+ 
	int ret;
+
+ 
	assert(*key == NULL);
+ 
	assert(keytype != NULL);	/* XXX for now. */
+ 
	if (*keypath == '\0')
+ 
		return (EPKG_FATAL);
+
+ 
	ret = pkgsign_new_sign(keytype, &ctx);
+ 
	if (ret != 0)
+ 
		return (EPKG_FATAL);
+
+ 
	pkgsign_set(ctx, cb, keypath);
+
+ 
	nkey = xcalloc(1, sizeof(*nkey));
+ 
	nkey->ctx = ctx;
+
+ 
	*key = nkey;
+ 
	return (EPKG_OK);
+ 
}
+
+ 
void
+ 
pkg_key_free(struct pkg_key *key)
+ 
{
+
+ 
	pkgsign_free(key->ctx);
+ 
	free(key);
+ 
}
+
+ 
/*
+ 
 * Key generation callbacks may take any number of options, so we handle those
+ 
 * with an iovec.  The pkg_key layer does not discriminate, beyond enforcing
+ 
 * that options come in pairs.  The intention is that the first option in every
+ 
 * pair names the option.
+ 
 */
+ 
int
+ 
pkg_key_create(struct pkg_key *key, const struct iovec *iov, int niov)
+ 
{
+
+ 
	/* Malformed arguments; must come in pairs. */
+ 
	if ((niov % 2) != 0)
+ 
		return (EPKG_FATAL);
+
+ 
	return (pkgsign_generate(key->ctx, iov, niov));
+ 
}
+
+ 
int
+ 
pkg_key_info(struct pkg_key *key, struct iovec **iov, int *niov)
+ 
{
+ 
	int rc;
+ 
	struct iovec *kiov;
+ 
	int nkiov;
+
+ 
	kiov = NULL;
+ 
	rc = pkgsign_keyinfo(key->ctx, &kiov, &nkiov);
+ 
	if (rc != EPKG_OK)
+ 
		return (rc);
+ 
	if ((nkiov % 2) != 0) {
+ 
		free(kiov);
+ 
		return (EPKG_FATAL);
+ 
	}
+
+ 
	*iov = kiov;
+ 
	*niov = nkiov;
+
+ 
	return (EPKG_OK);
+ 
}
+
+ 
int
+ 
pkg_key_pubkey(struct pkg_key *key, char **pubkey, size_t *len)
+ 
{
+
+ 
	return (pkgsign_pubkey(key->ctx, pubkey, len));
+ 
}
modified libpkg/private/pkg.h
@@ -185,6 +185,8 @@ struct pkg_repo_content {
	int data_fd;

};
+ 
struct pkgsign_ctx;
+ 


struct pkg_repo_it;

struct pkg_repo;

struct url;
@@ -525,6 +527,10 @@ struct pkg_repo_ops {
		const char *destdir);

};
+ 
struct pkg_key {
+ 
	struct pkgsign_ctx	*ctx;
+ 
};
+ 


struct pkg_repo {

	struct pkg_repo_ops *ops;