From nobody Sat Jan 11 02:48:58 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YVNJW1qrLz5l4jx; Sat, 11 Jan 2025 02:48:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YVNJV4jJKz4Hmg; Sat, 11 Jan 2025 02:48:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736563738; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7s6E2UiIz8xNBliSgb4zRHHyjNjB4Zwgj3IPZjuMSQ8=; b=smU18a4gWiFvO8yQOQ9IzHwp6fKCUgyqNo7KvvU8oMu+GtSYDt2zSXC06sc6BVid/fdAay dsgA4W4RIPZW/OU8uDn7K4bb7k7WDWAjspK4CYsLALwNeGsCzWqn+ABKuYAbRsiFdWcTnK Bpr/9uGC5IhcVpzm1Ln37LH69Z1dP3JZiDpicaCH0Xy/Q8w5sJG1PFCgRCei/AKm2pWCdG 3sTtEwhYP8W24R9zfCXd9BVJg2RqCgfqohsN2fJFRE9FJE50asUX21xM3JyO/c+WIMRRfM lOKuaaFyBdDPOGZYfHxwlxwRMfFVHKgupJ0Xd8QXyCXAtswi5XwMj7Nuo9m+Bw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736563738; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7s6E2UiIz8xNBliSgb4zRHHyjNjB4Zwgj3IPZjuMSQ8=; b=bkQ91gZ1eeis++9YAUpdtawXilJj6cpJgq+qTEMkiurz0gwgSaDXwTxr13IV2TbrShI7xE xW9B9d5yFReEnUgvUSavCF/M8zcCLh8pwhcreE7+tnUqws6Ehh3LVCKiY75FNqY9NkqmJy p39lbfxYt3XRusVwbKa7c4n1eUP0gpemjMNQ4BbjHuFpCfgd+GI4k8QXm1qaupa3S4P+ZU 0UOZUGekJ8KBoOOrog+5dqch2J4tiXykC6lwWQAvy3qFEpRFUh2w2nj7EAjqXBSnelcoZa YhJ8ipTwoyz+zVmq2wJO9LDgJhP6nXijOgT1KPsKknoV/uD14Set7F83js2Hvw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736563738; a=rsa-sha256; cv=none; b=KD1uYBPZbsN8fEYd5L9aGCmETXVyMNdo6YxyhPqhkm54bAb69SHAnl55oNIrfT829Sn8Qs 25xkGnQdV+mR11g4qggPLwNgyVFGMmzEV4fMs4sW0vhVFZ6AF6/MYSAUwydrUWj2wXvjZn 9UcO/yheONJxDRNfS3u+LyEfqIhYLIrh6KFg3JEa0ZlkfI67+z7XqryJIDo0VRix8WSL8U FeAqNxo8NpvBemlQKP0xZ7a/jwrouRoxjkkv6PODPcmd2ErVNl+qYjwQiY95JnvgBVA/S5 NbqcFvAGqN9a05RueHUlXJjCFWoT8jpo6WiZYmZvKU+Q1E+qrggBRRgw0371IA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YVNJV43njzfy2; Sat, 11 Jan 2025 02:48:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50B2mwEe066272; Sat, 11 Jan 2025 02:48:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50B2mwxN066269; Sat, 11 Jan 2025 02:48:58 GMT (envelope-from git) Date: Sat, 11 Jan 2025 02:48:58 GMT Message-Id: <202501110248.50B2mwxN066269@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 1e3003bed3ad - stable/14 - pkg: abstract rsa out behind a pkgsign API List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1e3003bed3ad490f17e06df7b8ae075ec43470e8 Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=1e3003bed3ad490f17e06df7b8ae075ec43470e8 commit 1e3003bed3ad490f17e06df7b8ae075ec43470e8 Author: Kyle Evans AuthorDate: 2025-01-01 21:10:27 +0000 Commit: Kyle Evans CommitDate: 2025-01-11 02:48:25 +0000 pkg: abstract rsa out behind a pkgsign API This mirrors a change we made in pkg(8), and will be used to next add another signer that does ECC. Reviewed by: bapt, emaste (cherry picked from commit 5862580ded35e23581291a2e1052f04428369ead) --- usr.sbin/pkg/pkg.c | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- usr.sbin/pkg/pkg.h | 22 ++++++++++++-- usr.sbin/pkg/rsa.c | 11 +++++-- 3 files changed, 110 insertions(+), 9 deletions(-) diff --git a/usr.sbin/pkg/pkg.c b/usr.sbin/pkg/pkg.c index 9b7938c97211..4176639e25d9 100644 --- a/usr.sbin/pkg/pkg.c +++ b/usr.sbin/pkg/pkg.c @@ -35,6 +35,7 @@ #include #include +#include #include #include #include @@ -55,6 +56,16 @@ #include "config.h" #include "hash.h" +static const struct pkgsign_impl { + const char *pi_name; + const struct pkgsign_ops *pi_ops; +} pkgsign_builtins[] = { + { + .pi_name = "rsa", + .pi_ops = &pkgsign_rsa, + }, +}; + typedef enum { HASH_UNKNOWN, HASH_SHA256, @@ -77,6 +88,61 @@ STAILQ_HEAD(fingerprint_list, fingerprint); static int debug; +static int +pkgsign_new(const char *name, struct pkgsign_ctx **ctx) +{ + const struct pkgsign_impl *impl; + const struct pkgsign_ops *ops; + struct pkgsign_ctx *nctx; + size_t ctx_size; + int ret; + + assert(*ctx == NULL); + ops = NULL; + for (size_t i = 0; i < nitems(pkgsign_builtins); i++) { + impl = &pkgsign_builtins[i]; + + if (strcmp(name, impl->pi_name) == 0) { + ops = impl->pi_ops; + break; + } + } + + if (ops == NULL) + return (ENOENT); + + ctx_size = ops->pkgsign_ctx_size; + if (ctx_size == 0) + ctx_size = sizeof(*nctx); + assert(ctx_size >= sizeof(*nctx)); + + nctx = calloc(1, ctx_size); + if (nctx == NULL) + err(EXIT_FAILURE, "calloc"); + nctx->impl = impl; + + ret = 0; + if (ops->pkgsign_new != NULL) + ret = (*ops->pkgsign_new)(name, nctx); + + if (ret != 0) { + free(nctx); + return (ret); + } + + *ctx = nctx; + return (0); +} + +static bool +pkgsign_verify_cert(const struct pkgsign_ctx *ctx, int fd, const char *sigfile, + const unsigned char *key, int keylen, unsigned char *sig, int siglen) +{ + + return ((*ctx->impl->pi_ops->pkgsign_verify_cert)(ctx, fd, sigfile, + key, keylen, sig, siglen)); +} + static int extract_pkg_static(int fd, char *p, int sz) { @@ -509,10 +575,12 @@ verify_pubsignature(int fd_pkg, int fd_sig) { struct pubkey *pk; const char *pubkey; + struct pkgsign_ctx *sctx; bool ret; pk = NULL; pubkey = NULL; + sctx = NULL; ret = false; if (config_string(PUBKEY, &pubkey) != 0) { warnx("No CONFIG_PUBKEY defined"); @@ -524,9 +592,14 @@ verify_pubsignature(int fd_pkg, int fd_sig) goto cleanup; } + if (pkgsign_new("rsa", &sctx) != 0) { + warnx("Failed to fetch 'rsa' signer"); + goto cleanup; + } + /* Verify the signature. */ printf("Verifying signature with public key %s... ", pubkey); - if (rsa_verify_cert(fd_pkg, pubkey, NULL, 0, pk->sig, + if (pkgsign_verify_cert(sctx, fd_pkg, pubkey, NULL, 0, pk->sig, pk->siglen) == false) { fprintf(stderr, "Signature is not valid\n"); goto cleanup; @@ -549,6 +622,7 @@ verify_signature(int fd_pkg, int fd_sig) struct fingerprint_list *trusted, *revoked; struct fingerprint *fingerprint; struct sig_cert *sc; + struct pkgsign_ctx *sctx; bool ret; int trusted_count, revoked_count; const char *fingerprints; @@ -557,6 +631,7 @@ verify_signature(int fd_pkg, int fd_sig) hash = NULL; sc = NULL; + sctx = NULL; trusted = revoked = NULL; ret = false; @@ -620,10 +695,15 @@ verify_signature(int fd_pkg, int fd_sig) goto cleanup; } + if (pkgsign_new("rsa", &sctx) != 0) { + fprintf(stderr, "Failed to fetch 'rsa' signer\n"); + goto cleanup; + } + /* Verify the signature. */ printf("Verifying signature with trusted certificate %s... ", sc->name); - if (rsa_verify_cert(fd_pkg, NULL, sc->cert, sc->certlen, sc->sig, - sc->siglen) == false) { + if (pkgsign_verify_cert(sctx, fd_pkg, NULL, sc->cert, sc->certlen, + sc->sig, sc->siglen) == false) { fprintf(stderr, "Signature is not valid\n"); goto cleanup; } diff --git a/usr.sbin/pkg/pkg.h b/usr.sbin/pkg/pkg.h index faa2be6c8376..2d0dab96a20f 100644 --- a/usr.sbin/pkg/pkg.h +++ b/usr.sbin/pkg/pkg.h @@ -30,6 +30,25 @@ #ifndef _PKG_H #define _PKG_H +#include + +struct pkgsign_ctx { + const struct pkgsign_impl *impl; +}; + +/* Tentatively won't be needing to free any state, all allocated in the ctx. */ +typedef int pkgsign_new_cb(const char *, struct pkgsign_ctx *); +typedef bool pkgsign_verify_cert_cb(const struct pkgsign_ctx *, int, + const char *, const unsigned char *, int, unsigned char *, int); + +struct pkgsign_ops { + size_t pkgsign_ctx_size; + pkgsign_new_cb *pkgsign_new; + pkgsign_verify_cert_cb *pkgsign_verify_cert; +}; + +extern const struct pkgsign_ops pkgsign_rsa; + struct sig_cert { char *name; unsigned char *sig; @@ -44,9 +63,6 @@ struct pubkey { int siglen; }; -bool rsa_verify_cert(int, const char *, const unsigned char *, int, - unsigned char *, int); - char *pkg_read_fd(int fd, size_t *osz); #endif /* _PKG_H */ diff --git a/usr.sbin/pkg/rsa.c b/usr.sbin/pkg/rsa.c index afc446a6ad06..b6345cdcecb8 100644 --- a/usr.sbin/pkg/rsa.c +++ b/usr.sbin/pkg/rsa.c @@ -77,9 +77,10 @@ load_public_key_buf(const unsigned char *cert, int certlen) return (pkey); } -bool -rsa_verify_cert(int fd, const char *sigfile, const unsigned char *key, - int keylen, unsigned char *sig, int siglen) +static bool +rsa_verify_cert(const struct pkgsign_ctx *ctx __unused, int fd, + const char *sigfile, const unsigned char *key, int keylen, + unsigned char *sig, int siglen) { EVP_MD_CTX *mdctx; EVP_PKEY *pkey; @@ -153,3 +154,7 @@ cleanup: return (ret); } + +const struct pkgsign_ops pkgsign_rsa = { + .pkgsign_verify_cert = rsa_verify_cert, +};