diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2024-04-16 11:30:07 +0300 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2024-04-16 17:50:57 +0300 |
| commit | d435c805af8af4171438da3ec3429c094aac4c6e (patch) | |
| tree | d8b016970d283654093015ebba1cb46c326ba14e | |
| parent | ca3e00b8677c7e1de7084a02a7518d5707d8d3ce (diff) | |
| -rw-r--r-- | main/apk-tools/0001-pkg-always-use-real-digest-openssl-fips-module-crash.patch | 42 | ||||
| -rw-r--r-- | main/apk-tools/APKBUILD | 8 |
2 files changed, 3 insertions, 47 deletions
diff --git a/main/apk-tools/0001-pkg-always-use-real-digest-openssl-fips-module-crash.patch b/main/apk-tools/0001-pkg-always-use-real-digest-openssl-fips-module-crash.patch deleted file mode 100644 index 8ff374628cb..00000000000 --- a/main/apk-tools/0001-pkg-always-use-real-digest-openssl-fips-module-crash.patch +++ /dev/null @@ -1,42 +0,0 @@ -From ffc313c67ba506c4719cef0685b5f0a4971c6ee9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> -Date: Tue, 2 Apr 2024 00:36:25 +0300 -Subject: [PATCH] pkg: always use real digest, openssl-fips module crashes - otherwise - -Turns out the fips module crashes if EVP_md_null is used. - -fixes #10992 ---- - src/package.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/src/package.c b/src/package.c -index 8967389..05ebcf8 100644 ---- a/src/package.c -+++ b/src/package.c -@@ -479,20 +479,19 @@ void apk_sign_ctx_init(struct apk_sign_ctx *ctx, int action, - case APK_SIGN_VERIFY: - /* If we're only verifing, we're going to start with a - * signature section, which we don't need a hash of */ -- ctx->md = EVP_md_null(); - ctx->verify_error = -ENOKEY; - break; - case APK_SIGN_VERIFY_IDENTITY: - /* If we're checking the package against a particular hash, - * we need to start with that hash, because there may not - * be a signature section to deduce it from */ -- ctx->md = EVP_sha1(); - memcpy(&ctx->identity, identity, sizeof(ctx->identity)); - break; - default: - assert(!"valid sign mode"); - break; - } -+ ctx->md = EVP_sha1(); - ctx->mdctx = EVP_MD_CTX_new(); - EVP_DigestInit_ex(ctx->mdctx, ctx->md, NULL); - } --- -2.44.0 - diff --git a/main/apk-tools/APKBUILD b/main/apk-tools/APKBUILD index a910baf8a99..8d91e7a456a 100644 --- a/main/apk-tools/APKBUILD +++ b/main/apk-tools/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=apk-tools -pkgver=2.14.3 -pkgrel=1 +pkgver=2.14.4 +pkgrel=0 pkgdesc="Alpine Package Keeper - package manager for alpine" arch="all" url="https://gitlab.alpinelinux.org/alpine/apk-tools" @@ -28,7 +28,6 @@ if [ "$CBUILD" = "$CHOST" ]; then depends="$depends ca-certificates-bundle" fi source="https://gitlab.alpinelinux.org/alpine/apk-tools/-/archive/v$pkgver/apk-tools-v$pkgver.tar.gz - 0001-pkg-always-use-real-digest-openssl-fips-module-crash.patch _apk " builddir="$srcdir/$pkgname-v$pkgver" @@ -92,7 +91,6 @@ luaapk() { } sha512sums=" -bcedabc14b2697fbc7cdaebde57d9d76e51509cd7099a610b4abc8351f0628569da446ed8d47e355f6532239530b5b43907350ebcbdda6d41ecd0e731ba65a65 apk-tools-v2.14.3.tar.gz -fdaaafa478e881e9bce8784ee36c3b92013c8bedb053a2e108deae7113110cb2ebd26d4ed1bfaf316ef190b9608ef4e6407603800e579e3d52eeabfbd2d43984 0001-pkg-always-use-real-digest-openssl-fips-module-crash.patch +33aa67a1752e4188cd52a869df4bcf4e397bca082ce407e6ada3735621d56e17219c5c47e73ae90102bb0db2b6a479ff9da0466c5fd5e7dedfb903a74056592c apk-tools-v2.14.4.tar.gz 7870676720f5007eee9482786e02246f8e3474afb90e76c9c83aebe914747a8e007b5d2eed6441933f4922024b3f0664db270f21981ad6c2db877a110b0cd79e _apk " |