Skip to content

Commit 2da3e18

Browse files
FABN-1549: Remove non-TypeScript build for fabric-network (#231)
Also: - Tidied up incorrect dependencies - Updated some dependencies to resolve security audit warnings Signed-off-by: Mark S. Lewis <[email protected]>
1 parent 5c0a28b commit 2da3e18

12 files changed

+1686
-213
lines changed

fabric-ca-client/lib/helper.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ function checkRegistrar(registrar) {
3535
// first which as of [email protected] always assumes RSA based certificates and
3636
// fails to parse certs that includes ECDSA keys.
3737
function getSubjectCommonName(pem) {
38-
const hex = X509.pemToHex(pem);
39-
const d = ASN1HEX.getDecendantHexTLVByNthList(hex, 0, [0, 5]);
38+
const hex = jsrsasign.pemtohex(pem);
39+
const d = ASN1HEX.getTLVbyList(hex, 0, [0, 5]);
4040
const subject = X509.hex2dn(d); // format: '/C=US/ST=California/L=San Francisco/[email protected]/[email protected]'
4141
const m = subject.match(/CN=.+[^/]/);
4242
if (!m) {

fabric-ca-client/package.json

+1-10
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,10 @@
2222
"types": "./types/index.d.ts",
2323
"dependencies": {
2424
"fabric-common": "file:../fabric-common",
25-
"jsrsasign": "^7.2.2",
25+
"jsrsasign": "^8.0.15",
2626
"url": "^0.11.0",
27-
"util": "^0.10.3",
2827
"winston": "^2.4.0"
2928
},
30-
"devDependencies": {
31-
"chai": "^4.1.2",
32-
"chai-as-promised": "^7.1.1",
33-
"mocha": "^5.2.0",
34-
"nyc": "^15.0.0",
35-
"rewire": "^4.0.1",
36-
"sinon": "^6.3.5"
37-
},
3829
"license": "Apache-2.0",
3930
"licenses": [
4031
{

fabric-common/package.json

+1-10
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"elliptic": "^6.2.3",
3030
"fabric-protos": "file:../fabric-protos",
3131
"js-sha3": "^0.7.0",
32-
"nano": "^6.4.4",
32+
"jsrsasign": "^8.0.15",
3333
"nconf": "^0.10.0",
3434
"promise-settle": "^0.3.0",
3535
"sjcl": "1.0.7",
@@ -39,15 +39,6 @@
3939
"optionalDependencies": {
4040
"pkcs11js": "^1.0.6"
4141
},
42-
"devDependencies": {
43-
"chai": "^4.1.2",
44-
"chai-as-promised": "^7.1.1",
45-
"mocha": "^5.2.0",
46-
"nyc": "^15.0.0",
47-
"rewire": "^4.0.1",
48-
"sinon": "^6.3.5",
49-
"sinon-chai": "^3.4.0"
50-
},
5142
"nyc": {
5243
"exclude": [
5344
"coverage/**",

0 commit comments

Comments
 (0)