basic: Add some sha256 helper functions
Adds a util function to sha256 an open fd (moved from dissect). Also adds functions to check if a string contains a valid sha256 hash, and parse it into a sha256 array.
This commit is contained in:
@@ -79,6 +79,7 @@ basic_sources = files(
|
||||
'replace-var.c',
|
||||
'rlimit-util.c',
|
||||
'runtime-scope.c',
|
||||
'sha256.c',
|
||||
'sigbus.c',
|
||||
'signal-util.c',
|
||||
'siphash24.c',
|
||||
|
||||
@@ -0,0 +1,50 @@
|
||||
/* SPDX-License-Identifier: LGPL-2.1-or-later */
|
||||
|
||||
#include <unistd.h>
|
||||
|
||||
#include "hexdecoct.h"
|
||||
#include "macro.h"
|
||||
#include "sha256.h"
|
||||
|
||||
int sha256_fd(int fd, uint64_t max_size, uint8_t ret[static SHA256_DIGEST_SIZE]) {
|
||||
struct sha256_ctx ctx;
|
||||
uint64_t total_size = 0;
|
||||
|
||||
sha256_init_ctx(&ctx);
|
||||
|
||||
for (;;) {
|
||||
uint8_t buffer[64 * 1024];
|
||||
ssize_t n;
|
||||
|
||||
n = read(fd, buffer, sizeof(buffer));
|
||||
if (n < 0)
|
||||
return -errno;
|
||||
if (n == 0)
|
||||
break;
|
||||
|
||||
if (!INC_SAFE(&total_size, n) || total_size > max_size)
|
||||
return -EFBIG;
|
||||
|
||||
sha256_process_bytes(buffer, n, &ctx);
|
||||
}
|
||||
|
||||
sha256_finish_ctx(&ctx, ret);
|
||||
return 0;
|
||||
}
|
||||
|
||||
int parse_sha256(const char *s, uint8_t ret[static SHA256_DIGEST_SIZE]) {
|
||||
_cleanup_free_ uint8_t *data = NULL;
|
||||
size_t size = 0;
|
||||
int r;
|
||||
|
||||
if (!sha256_is_valid(s))
|
||||
return -EINVAL;
|
||||
|
||||
r = unhexmem_full(s, SHA256_DIGEST_SIZE * 2, false, (void**) &data, &size);
|
||||
if (r < 0)
|
||||
return r;
|
||||
assert(size == SHA256_DIGEST_SIZE);
|
||||
|
||||
memcpy(ret, data, size);
|
||||
return 0;
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
/* SPDX-License-Identifier: LGPL-2.1-or-later */
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
#include "sha256-fundamental.h"
|
||||
#include "string-util.h"
|
||||
|
||||
int sha256_fd(int fd, uint64_t max_size, uint8_t ret[static SHA256_DIGEST_SIZE]);
|
||||
|
||||
int parse_sha256(const char *s, uint8_t res[static SHA256_DIGEST_SIZE]);
|
||||
|
||||
static inline bool sha256_is_valid(const char *s) {
|
||||
return s && in_charset(s, HEXDIGITS) && (strlen(s) == SHA256_DIGEST_SIZE * 2);
|
||||
}
|
||||
@@ -4,7 +4,7 @@
|
||||
#include "proto/rng.h"
|
||||
#include "random-seed.h"
|
||||
#include "secure-boot.h"
|
||||
#include "sha256.h"
|
||||
#include "sha256-fundamental.h"
|
||||
#include "util.h"
|
||||
|
||||
#define RANDOM_MAX_SIZE_MIN (32U)
|
||||
|
||||
+1
-18
@@ -1130,7 +1130,6 @@ static int list_print_item(
|
||||
|
||||
static int get_file_sha256(int inode_fd, uint8_t ret[static SHA256_DIGEST_SIZE]) {
|
||||
_cleanup_close_ int fd = -EBADF;
|
||||
struct sha256_ctx ctx;
|
||||
|
||||
/* convert O_PATH fd into a regular one */
|
||||
fd = fd_reopen(inode_fd, O_RDONLY|O_CLOEXEC);
|
||||
@@ -1140,23 +1139,7 @@ static int get_file_sha256(int inode_fd, uint8_t ret[static SHA256_DIGEST_SIZE])
|
||||
/* Calculating the SHA sum might be slow, hence let's flush STDOUT first, to give user an idea where we are slow. */
|
||||
fflush(stdout);
|
||||
|
||||
sha256_init_ctx(&ctx);
|
||||
|
||||
for (;;) {
|
||||
uint8_t buffer[64 * 1024];
|
||||
ssize_t n;
|
||||
|
||||
n = read(fd, buffer, sizeof(buffer));
|
||||
if (n < 0)
|
||||
return -errno;
|
||||
if (n == 0)
|
||||
break;
|
||||
|
||||
sha256_process_bytes(buffer, n, &ctx);
|
||||
}
|
||||
|
||||
sha256_finish_ctx(&ctx, ret);
|
||||
return 0;
|
||||
return sha256_fd(fd, UINT64_MAX, ret);
|
||||
}
|
||||
|
||||
static const char *pick_color_for_uid_gid(uid_t uid) {
|
||||
|
||||
@@ -5,7 +5,7 @@ fundamental_include = include_directories('.')
|
||||
fundamental_sources = files(
|
||||
'bootspec-fundamental.c',
|
||||
'efivars-fundamental.c',
|
||||
'sha256.c',
|
||||
'sha256-fundamental.c',
|
||||
'string-util-fundamental.c',
|
||||
'uki.c',
|
||||
)
|
||||
|
||||
@@ -29,7 +29,7 @@
|
||||
#endif
|
||||
|
||||
#include "macro-fundamental.h"
|
||||
#include "sha256.h"
|
||||
#include "sha256-fundamental.h"
|
||||
#include "unaligned-fundamental.h"
|
||||
|
||||
#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
|
||||
Reference in New Issue
Block a user