Skip to content

Commit 351bd62

Browse files
committed
main/nodejs: fix crypto hash error handling
fixes #4999 Upstream regression. Cherry-pick fix from nodejs/node#4221
1 parent faf85ab commit 351bd62

File tree

2 files changed

+23
-5
lines changed

2 files changed

+23
-5
lines changed

main/nodejs/APKBUILD

+9-5
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,16 @@
22
# Maintainer: Eivind Uggedal <[email protected]>
33
pkgname=nodejs
44
pkgver=4.2.4
5-
pkgrel=0
5+
pkgrel=1
66
pkgdesc='Evented I/O for V8 javascript'
77
url='http://nodejs.org/'
88
arch='all'
99
license='MIT'
1010
makedepends="$depends_dev python openssl-dev zlib-dev libuv-dev
1111
linux-headers paxmark"
1212
subpackages="$pkgname-dev $pkgname-doc"
13-
source="http://nodejs.org/dist/v$pkgver/node-v$pkgver.tar.gz"
13+
source="http://nodejs.org/dist/v$pkgver/node-v$pkgver.tar.gz
14+
issue-4221.patch"
1415
_builddir="$srcdir"/node-v$pkgver
1516

1617
prepare() {
@@ -48,6 +49,9 @@ package() {
4849
done
4950
}
5051

51-
md5sums="86e4d0d8b626f6e60ca7bef02f2543d2 node-v4.2.4.tar.gz"
52-
sha256sums="4ee244ffede7328d9fa24c3024787e71225b7abaac49fe2b30e68b27460c10ec node-v4.2.4.tar.gz"
53-
sha512sums="78f216e8d8a3d7af4b75e091a6c1426073e1d089a67a19bbc71a4494f5a2f22275dfc68fd7341c3d60971c37098f3455e243486289c15b69b8e74537c7da1fa0 node-v4.2.4.tar.gz"
52+
md5sums="86e4d0d8b626f6e60ca7bef02f2543d2 node-v4.2.4.tar.gz
53+
d5e343fc9d1da1718ec15280b290b4a1 issue-4221.patch"
54+
sha256sums="4ee244ffede7328d9fa24c3024787e71225b7abaac49fe2b30e68b27460c10ec node-v4.2.4.tar.gz
55+
4e241e38c96629a4d96b19c99bd9c82da86a766aa53a08f4b1bb3d90a7ec7eee issue-4221.patch"
56+
sha512sums="78f216e8d8a3d7af4b75e091a6c1426073e1d089a67a19bbc71a4494f5a2f22275dfc68fd7341c3d60971c37098f3455e243486289c15b69b8e74537c7da1fa0 node-v4.2.4.tar.gz
57+
36f91895bb339e0e386b4c2da9bca7eb5051083761ff66a61483fcc76b75e76b5e1a405e56ab4b39e53e3ee47d9cac5b7d949c42c1e7d919ee279fe8505dc58e issue-4221.patch"

main/nodejs/issue-4221.patch

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
diff --git a/src/node_crypto.cc b/src/node_crypto.cc
2+
index 63d767a..1b4cc1a 100644
3+
--- a/src/node_crypto.cc
4+
+++ b/src/node_crypto.cc
5+
@@ -3556,8 +3556,7 @@ bool Hash::HashInit(const char* hash_type) {
6+
if (md_ == nullptr)
7+
return false;
8+
EVP_MD_CTX_init(&mdctx_);
9+
- EVP_DigestInit_ex(&mdctx_, md_, nullptr);
10+
- if (0 != ERR_peek_error()) {
11+
+ if (EVP_DigestInit_ex(&mdctx_, md_, nullptr) <= 0) {
12+
return false;
13+
}
14+
initialised_ = true;

0 commit comments

Comments
 (0)