diff --git a/usr.sbin/pkg/pkg.h b/usr.sbin/pkg/pkg.h --- 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,7 +63,4 @@ int siglen; }; -bool rsa_verify_cert(int, const char *, const unsigned char *, int, - unsigned char *, int); - #endif /* _PKG_H */ diff --git a/usr.sbin/pkg/pkg.c b/usr.sbin/pkg/pkg.c --- a/usr.sbin/pkg/pkg.c +++ b/usr.sbin/pkg/pkg.c @@ -34,6 +34,7 @@ #include #include +#include #include #include #include @@ -54,6 +55,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, @@ -76,6 +87,61 @@ 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) { @@ -494,10 +560,12 @@ { 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"); @@ -509,9 +577,14 @@ 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; @@ -534,6 +607,7 @@ 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; @@ -542,6 +616,7 @@ hash = NULL; sc = NULL; + sctx = NULL; trusted = revoked = NULL; ret = false; @@ -605,10 +680,15 @@ 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/rsa.c b/usr.sbin/pkg/rsa.c --- a/usr.sbin/pkg/rsa.c +++ b/usr.sbin/pkg/rsa.c @@ -77,9 +77,10 @@ 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 @@ return (ret); } + +const struct pkgsign_ops pkgsign_rsa = { + .pkgsign_verify_cert = rsa_verify_cert, +};