1173234 More openssl isolation — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

More openssl isolation

Baptiste Daroussin committed 9 years ago

commit 1173234aab3b6a293ed3d83833366b925c854ac6
parent 72016be

2 files changed +5 -5

modified libpkg/pkg_checksum.c

@@ -43,6 +43,11 @@ struct pkg_checksum_entry {

 /* Separate checksum parts */
 #define PKG_CKSUM_SEPARATOR '$'
 /* Hash is in format <version>:<typeid>:<hexhash> */
 #define PKG_CHECKSUM_SHA256_LEN (SHA256_DIGEST_LENGTH * 2 + 1)
 #define PKG_CHECKSUM_BLAKE2_LEN (BLAKE2B_OUTBYTES * 8 / 5 + sizeof("100") * 2 + 2)
 #define PKG_CHECKSUM_CUR_VERSION 2
 typedef void (*pkg_checksum_hash_func)(struct pkg_checksum_entry *entries,
 				unsigned char **out, size_t *outlen);
 typedef void (*pkg_checksum_hash_bulk_func)(const unsigned char *in, size_t inlen,

modified libpkg/private/pkg.h

@@ -717,11 +717,6 @@ bool ucl_object_emit_file(const ucl_object_t *obj, enum ucl_emitter emit_type,

 pkg_object* pkg_emit_object(struct pkg *pkg, short flags);
 /* Hash is in format <version>:<typeid>:<hexhash> */
 #define PKG_CHECKSUM_SHA256_LEN (SHA256_DIGEST_LENGTH * 2 + 1)
 #define PKG_CHECKSUM_BLAKE2_LEN (BLAKE2B_OUTBYTES * 8 / 5 + sizeof("100") * 2 + 2)
 #define PKG_CHECKSUM_CUR_VERSION 2
 int pkg_checksum_generate(struct pkg *pkg, char *dest, size_t destlen,
 	pkg_checksum_type_t type);