git: 7bc2192380e1 - stable/13 - pkg(7): use libmd for sha256 instead of openssl
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 19 May 2023 08:17:27 UTC
The branch stable/13 has been updated by bapt:
URL: https://cgit.FreeBSD.org/src/commit/?id=7bc2192380e10f3469ab4eda69ade324aae976cd
commit 7bc2192380e10f3469ab4eda69ade324aae976cd
Author: Baptiste Daroussin <bapt@FreeBSD.org>
AuthorDate: 2023-03-09 16:38:30 +0000
Commit: Baptiste Daroussin <bapt@FreeBSD.org>
CommitDate: 2023-05-19 08:16:51 +0000
pkg(7): use libmd for sha256 instead of openssl
OpenSSL 3.0 has deprecated the sha256 api, let's use libmd which has the
same API instead.
In order to avoid the collision in definitions (sha256.h cannot be
included in the same file as a file where openssl headers has been
included) let's move the sha256 related code in its own file
PR: 270023
Reported by: ngie
(cherry picked from commit b2654064c2d11a1ee36667b3ff8b0f4d2536af74)
---
usr.sbin/pkg/Makefile | 4 +-
usr.sbin/pkg/hash.c | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++
usr.sbin/pkg/hash.h | 32 +++++++++++++++
usr.sbin/pkg/pkg.c | 78 +----------------------------------
4 files changed, 147 insertions(+), 79 deletions(-)
diff --git a/usr.sbin/pkg/Makefile b/usr.sbin/pkg/Makefile
index e40265146657..895438982309 100644
--- a/usr.sbin/pkg/Makefile
+++ b/usr.sbin/pkg/Makefile
@@ -23,11 +23,11 @@ CONFSNAME_${PKGCONF}= ${PKGCONF:C/\.conf.+$/.conf/}
CONFSDIR= /etc/pkg
CONFSMODE= 644
PROG= pkg
-SRCS= pkg.c dns_utils.c config.c
+SRCS= pkg.c dns_utils.c config.c hash.c
MAN= pkg.7
CFLAGS+=-I${SRCTOP}/contrib/libucl/include
.PATH: ${SRCTOP}/contrib/libucl/include
-LIBADD= archive fetch ucl crypto ssl util
+LIBADD= archive fetch ucl crypto ssl util md
.include <bsd.prog.mk>
diff --git a/usr.sbin/pkg/hash.c b/usr.sbin/pkg/hash.c
new file mode 100644
index 000000000000..47bcae6c5b6a
--- /dev/null
+++ b/usr.sbin/pkg/hash.c
@@ -0,0 +1,112 @@
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
+ * Copyright (c) 2012-2014 Baptiste Daroussin <bapt@FreeBSD.org>
+ * Copyright (c) 2013 Bryan Drewery <bdrewery@FreeBSD.org>
+ * All rights reserved.
+ *
+ * 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.
+ * 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 AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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 <err.h>
+#include <sha256.h>
+#include <stdio.h>
+#include <unistd.h>
+
+#include "hash.h"
+
+static void
+sha256_hash(unsigned char hash[SHA256_DIGEST_LENGTH],
+ char out[SHA256_DIGEST_LENGTH * 2 + 1])
+{
+ int i;
+
+ for (i = 0; i < SHA256_DIGEST_LENGTH; i++)
+ sprintf(out + (i * 2), "%02x", hash[i]);
+
+ out[SHA256_DIGEST_LENGTH * 2] = '\0';
+}
+
+void
+sha256_buf(char *buf, size_t len, char out[SHA256_DIGEST_LENGTH * 2 + 1])
+{
+ unsigned char hash[SHA256_DIGEST_LENGTH];
+ SHA256_CTX sha256;
+
+ out[0] = '\0';
+
+ SHA256_Init(&sha256);
+ SHA256_Update(&sha256, buf, len);
+ SHA256_Final(hash, &sha256);
+ sha256_hash(hash, out);
+}
+
+int
+sha256_fd(int fd, char out[SHA256_DIGEST_LENGTH * 2 + 1])
+{
+ int my_fd;
+ FILE *fp;
+ char buffer[BUFSIZ];
+ unsigned char hash[SHA256_DIGEST_LENGTH];
+ size_t r;
+ int ret;
+ SHA256_CTX sha256;
+
+ fp = NULL;
+ ret = 1;
+
+ out[0] = '\0';
+
+ /* Duplicate the fd so that fclose(3) does not close it. */
+ if ((my_fd = dup(fd)) == -1) {
+ warnx("dup");
+ goto cleanup;
+ }
+
+ if ((fp = fdopen(my_fd, "rb")) == NULL) {
+ warnx("fdopen");
+ goto cleanup;
+ }
+
+ SHA256_Init(&sha256);
+
+ while ((r = fread(buffer, 1, BUFSIZ, fp)) > 0)
+ SHA256_Update(&sha256, buffer, r);
+
+ if (ferror(fp) != 0) {
+ warnx("fread");
+ goto cleanup;
+ }
+
+ SHA256_Final(hash, &sha256);
+ sha256_hash(hash, out);
+ ret = 0;
+
+cleanup:
+ if (fp != NULL)
+ fclose(fp);
+ else if (my_fd != -1)
+ close(my_fd);
+ (void)lseek(fd, 0, SEEK_SET);
+
+ return (ret);
+}
diff --git a/usr.sbin/pkg/hash.h b/usr.sbin/pkg/hash.h
new file mode 100644
index 000000000000..dcdc458b5e61
--- /dev/null
+++ b/usr.sbin/pkg/hash.h
@@ -0,0 +1,32 @@
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
+ * Copyright (c) 2023 Baptiste Daroussin <bapt@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.
+ * 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 AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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.
+ *
+ */
+
+#pragma once
+
+void sha256_buf(char *buf, size_t len, char out[]);
+int sha256_fd(int fd, char out[]);
diff --git a/usr.sbin/pkg/pkg.c b/usr.sbin/pkg/pkg.c
index f3c338c6961e..7c4749f8089e 100644
--- a/usr.sbin/pkg/pkg.c
+++ b/usr.sbin/pkg/pkg.c
@@ -56,6 +56,7 @@ __FBSDID("$FreeBSD$");
#include "dns_utils.h"
#include "config.h"
+#include "hash.h"
struct sig_cert {
char *name;
@@ -400,83 +401,6 @@ load_fingerprints(const char *path, int *count)
return (fingerprints);
}
-static void
-sha256_hash(unsigned char hash[SHA256_DIGEST_LENGTH],
- char out[SHA256_DIGEST_LENGTH * 2 + 1])
-{
- int i;
-
- for (i = 0; i < SHA256_DIGEST_LENGTH; i++)
- sprintf(out + (i * 2), "%02x", hash[i]);
-
- out[SHA256_DIGEST_LENGTH * 2] = '\0';
-}
-
-static void
-sha256_buf(char *buf, size_t len, char out[SHA256_DIGEST_LENGTH * 2 + 1])
-{
- unsigned char hash[SHA256_DIGEST_LENGTH];
- SHA256_CTX sha256;
-
- out[0] = '\0';
-
- SHA256_Init(&sha256);
- SHA256_Update(&sha256, buf, len);
- SHA256_Final(hash, &sha256);
- sha256_hash(hash, out);
-}
-
-static int
-sha256_fd(int fd, char out[SHA256_DIGEST_LENGTH * 2 + 1])
-{
- int my_fd;
- FILE *fp;
- char buffer[BUFSIZ];
- unsigned char hash[SHA256_DIGEST_LENGTH];
- size_t r;
- int ret;
- SHA256_CTX sha256;
-
- fp = NULL;
- ret = 1;
-
- out[0] = '\0';
-
- /* Duplicate the fd so that fclose(3) does not close it. */
- if ((my_fd = dup(fd)) == -1) {
- warnx("dup");
- goto cleanup;
- }
-
- if ((fp = fdopen(my_fd, "rb")) == NULL) {
- warnx("fdopen");
- goto cleanup;
- }
-
- SHA256_Init(&sha256);
-
- while ((r = fread(buffer, 1, BUFSIZ, fp)) > 0)
- SHA256_Update(&sha256, buffer, r);
-
- if (ferror(fp) != 0) {
- warnx("fread");
- goto cleanup;
- }
-
- SHA256_Final(hash, &sha256);
- sha256_hash(hash, out);
- ret = 0;
-
-cleanup:
- if (fp != NULL)
- fclose(fp);
- else if (my_fd != -1)
- close(my_fd);
- (void)lseek(fd, 0, SEEK_SET);
-
- return (ret);
-}
-
static EVP_PKEY *
load_public_key_file(const char *file)
{