node-mozilla-iot-gateway: add openssl 1.1 compat. #6088
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk | |
| PKG_NPM_NAME:=mozilla-iot-gateway | ||
| PKG_NAME:=node-$(PKG_NPM_NAME) | ||
| PKG_VERSION:=0.3.1 | ||
| PKG_RELEASE:=2 | ||
|
|
||
| PKG_SOURCE_PROTO:=git | ||
| PKG_SOURCE_URL:=https://github.com/mozilla-iot/gateway.git | ||
|
|
@@ -20,6 +20,14 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz | |
| PKG_MIRROR_HASH:=ba05bc3e93c36768244df922434e7132c2dae85a1ff9e3213beea087a4844d11 | ||
|
|
||
| PKG_BUILD_DEPENDS:=node/host openzwave | ||
| PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/$(PKG_NAME)-$(PKG_VERSION) | ||
| PKG_INSTALL_DIR:=$(BUILD_DIR)/$(PKG_NAME)/ipkg-install | ||
|
|
||
| URSA_VERSION:=0.9.4 | ||
| URSA_SOURCE:=ursa-$(URSA_VERSION).tgz | ||
| URSA_SUBDIR:=ursa-$(URSA_VERSION) | ||
| URSA_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/$(URSA_SUBDIR) | ||
| URSA_TGZ:=$(BUILD_DIR)/$(PKG_NAME)/$(URSA_SOURCE) | ||
|
|
||
| PKG_MAINTAINER:=Marko Ratkaj <[email protected]> | ||
| PKG_LICENSE:=MPL-2.0 | ||
|
|
@@ -44,6 +52,33 @@ define Package/node-mozilla-iot-gateway/description | |
| and defining a standard data model and APIs to make them interoperable. | ||
| endef | ||
|
|
||
| define Download/ursa | ||
| FILE:=$(URSA_SOURCE) | ||
| URL:=https://registry.yarnpkg.com/ursa/-/$(FILE) | ||
| HASH:=65516fc99958011572ef26ef02a3c84a004e47aabfd5b8aa46abb10481ae7153 | ||
| endef | ||
| $(eval $(call Download,ursa)) | ||
|
There was a problem hiding this comment. This really looks like it should be a separate package, so it gets all the regular package downloading treatment and all the dependency tracking like normal, instead of the hackjob you've got below. There was a problem hiding this comment. I agree with you. However, there are 1741 packages installed by node-mozilla-iot-gateway in that same situation--if you look at the compile log, there are 2 lines, adding 583 and 1203 packages. It's a 42MB ipk file. It installs an independent copy of the node-serialport package as well. The node-mozilla-iot-gateway package was added to the feed as is. I just wanted was to make it compile with openssl 1.1, and didn't fix anything else. |
||
|
|
||
| define Build/Prepare | ||
| $(PKG_UNPACK) | ||
| $(Build/Patch) | ||
| $(RM) -r "$(URSA_BUILD_DIR)" "$(BUILD_DIR)/$(PKG_NAME)/package" | ||
| ( \ | ||
| cd $(PKG_BUILD_DIR)/.. && \ | ||
| $(TAR) -xzf $(DL_DIR)/$(URSA_SOURCE) && \ | ||
| mv package $(URSA_SUBDIR) \ | ||
| ) | ||
| cat ./files/ursa.patch | ( cd $(URSA_BUILD_DIR) && patch -p1 ) | ||
| cat ./files/gateway.patch | ( cd $(PKG_BUILD_DIR) && patch -p1 ) | ||
| sed -i -e 's!@@URSA_TGZ@@!$(URSA_TGZ)!' $(PKG_BUILD_DIR)/package.json | ||
| ( \ | ||
| cd $(PKG_BUILD_DIR)/.. && \ | ||
| tar -czf $(PKG_SOURCE) $(PKG_NAME)-$(PKG_VERSION); \ | ||
| tar -czf $(URSA_SOURCE) $(URSA_SUBDIR) \ | ||
| ) | ||
| endef | ||
|
|
||
| EXTRA_CFLAGS += -Wno-error=format-security | ||
| CPU:=$(subst powerpc,ppc,$(subst aarch64,arm64,$(subst x86_64,x64,$(subst i386,ia32,$(ARCH))))) | ||
|
|
||
| define Build/Compile | ||
|
|
@@ -54,7 +89,12 @@ define Build/Compile | |
| npm_config_cache=$(TMP_DIR)/npm-cache \ | ||
| npm_config_tmp=$(TMP_DIR)/npm-tmp \ | ||
| PREFIX="$(PKG_INSTALL_DIR)/usr/" \ | ||
| $(STAGING_DIR_HOSTPKG)/bin/npm install --build-from-source --target_arch=$(CPU) -g \ | ||
| $(PKG_BUILD_DIR)/../$(PKG_SOURCE) | ||
| endef | ||
|
|
||
| define Build/Clean | ||
| $(RM) -r "$(BUILD_DIR)/$(PKG_NAME)/" | ||
| endef | ||
|
|
||
| define Package/node-mozilla-iot-gateway/install | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| --- a/package.json | ||
| +++ b/package.json | ||
| @@ -25,6 +25,7 @@ | ||
| }, | ||
| "homepage": "https://iot.mozilla.org", | ||
| "dependencies": { | ||
| + "ursa": "file:@@URSA_TGZ@@", | ||
| "asn1.js": "^5.0.0", | ||
| "bcryptjs": "^2.4.3", | ||
| "body-parser": "^1.17.1", |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,106 @@ | ||
| --- a/src/ursaNative.cc 2016-05-09 21:28:14.000000000 -0300 | ||
| +++ b/src/ursaNative.cc 2018-04-20 17:18:48.000000000 -0300 | ||
| @@ -386,8 +386,12 @@ | ||
| obj->rsa = RSA_new(); | ||
| } | ||
|
|
||
| +#if OPENSSL_VERSION_NUMBER >= 0x10100000L | ||
| + RSA_set0_key(obj->rsa, BN_bin2bn(data_n, n_length, NULL), BN_bin2bn(data_e, e_length, NULL), NULL); | ||
| +#else | ||
| obj->rsa->n = BN_bin2bn(data_n, n_length, NULL); | ||
| obj->rsa->e = BN_bin2bn(data_e, e_length, NULL); | ||
| +#endif | ||
| free(data_n); | ||
| free(data_e); | ||
| NanReturnUndefined(); | ||
| @@ -404,7 +408,15 @@ | ||
|
|
||
| // The "d" field should always be set on a private key and never | ||
| // set on a public key. | ||
| +#if OPENSSL_VERSION_NUMBER >= 0x10100000L | ||
| + const BIGNUM *d; | ||
| + if (obj != NULL) { | ||
| + RSA_get0_key(obj->rsa, NULL, NULL, &d); | ||
| + } | ||
| + if ((obj == NULL) || (d != NULL)) { | ||
| +#else | ||
| if ((obj == NULL) || (obj->rsa->d != NULL)) { | ||
| +#endif | ||
| return obj; | ||
| } | ||
|
|
||
| @@ -533,7 +545,13 @@ | ||
| obj = expectSet(obj); | ||
| if (obj == NULL) { NanReturnUndefined(); } | ||
|
|
||
| +#if OPENSSL_VERSION_NUMBER >= 0x10100000L | ||
| + BIGNUM *e; | ||
| + RSA_get0_key(obj->rsa, NULL, (const BIGNUM**) &e, NULL); | ||
| + bignumToBuffer(args, e); | ||
| +#else | ||
| bignumToBuffer(args, obj->rsa->e); | ||
| +#endif | ||
| } | ||
|
|
||
| /** | ||
| @@ -549,7 +567,13 @@ | ||
| obj = expectPrivateKey(obj); | ||
| if (obj == NULL) { NanReturnUndefined(); } | ||
|
|
||
| +#if OPENSSL_VERSION_NUMBER >= 0x10100000L | ||
| + BIGNUM *d; | ||
| + RSA_get0_key(obj->rsa, NULL, NULL, (const BIGNUM**) &d); | ||
| + bignumToBuffer(args, d); | ||
| +#else | ||
| bignumToBuffer(args, obj->rsa->d); | ||
| +#endif | ||
| } | ||
|
|
||
| /** | ||
| @@ -564,7 +588,13 @@ | ||
| obj = expectSet(obj); | ||
| if (obj == NULL) { NanReturnUndefined(); } | ||
|
|
||
| +#if OPENSSL_VERSION_NUMBER >= 0x10100000L | ||
| + BIGNUM *n; | ||
| + RSA_get0_key(obj->rsa, (const BIGNUM**) &n, NULL, NULL); | ||
| + bignumToBuffer(args, n); | ||
| +#else | ||
| bignumToBuffer(args, obj->rsa->n); | ||
| +#endif | ||
| } | ||
|
|
||
| /** | ||
| @@ -1215,6 +1245,11 @@ | ||
| } | ||
|
|
||
| if (ok) { | ||
| +#if OPENSSL_VERSION_NUMBER >= 0x10100000L | ||
| + RSA_set0_key(obj->rsa, modulus, exponent, d); | ||
| + RSA_set0_factors(obj->rsa, p, q); | ||
| + RSA_set0_crt_params(obj->rsa, dp, dq, inverseQ); | ||
| +#else | ||
| obj->rsa->n = modulus; | ||
| obj->rsa->e = exponent; | ||
| obj->rsa->p = p; | ||
| @@ -1223,6 +1258,7 @@ | ||
| obj->rsa->dmq1 = dq; | ||
| obj->rsa->iqmp = inverseQ; | ||
| obj->rsa->d = d; | ||
| +#endif | ||
| } else { | ||
| if (modulus) { BN_free(modulus); } | ||
| if (exponent) { BN_free(exponent); } | ||
| @@ -1267,8 +1303,12 @@ | ||
| } | ||
|
|
||
| if (ok) { | ||
| +#if OPENSSL_VERSION_NUMBER >= 0x10100000L | ||
| + RSA_set0_key(obj->rsa, modulus, exponent, NULL); | ||
| +#else | ||
| obj->rsa->n = modulus; | ||
| obj->rsa->e = exponent; | ||
| +#endif | ||
| } else { | ||
| if (modulus) { BN_free(modulus); } | ||
| if (exponent) { BN_free(exponent); } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
do you actually need both of these?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes. The INSTALL_DIR need to be outside of the build tree to avoid copying the directory to itself during installation--another quirk of building the package using npm. The PKG_BUILD_DIR holds INSTALL_DIR, as well as the build dirs of node-mozilla-iot-gateway and ursa, so they are easily and properly cleaned.