composer and npm

This commit is contained in:
Henry Whitaker
2020-08-25 00:59:44 +01:00
parent 6726d93cc6
commit c8f853dc84
2504 changed files with 88530 additions and 41367 deletions

View File

@@ -1,7 +1,7 @@
// adapted from https://github.com/apatil/pemstrip
var findProc = /Proc-Type: 4,ENCRYPTED[\n\r]+DEK-Info: AES-((?:128)|(?:192)|(?:256))-CBC,([0-9A-H]+)[\n\r]+([0-9A-z\n\r\+\/\=]+)[\n\r]+/m
var findProc = /Proc-Type: 4,ENCRYPTED[\n\r]+DEK-Info: AES-((?:128)|(?:192)|(?:256))-CBC,([0-9A-H]+)[\n\r]+([0-9A-z\n\r+/=]+)[\n\r]+/m
var startRegex = /^-----BEGIN ((?:.*? KEY)|CERTIFICATE)-----/m
var fullRegex = /^-----BEGIN ((?:.*? KEY)|CERTIFICATE)-----([0-9A-z\n\r\+\/\=]+)-----END \1-----$/m
var fullRegex = /^-----BEGIN ((?:.*? KEY)|CERTIFICATE)-----([0-9A-z\n\r+/=]+)-----END \1-----$/m
var evp = require('evp_bytestokey')
var ciphers = require('browserify-aes')
var Buffer = require('safe-buffer').Buffer
@@ -11,7 +11,7 @@ module.exports = function (okey, password) {
var decrypted
if (!match) {
var match2 = key.match(fullRegex)
decrypted = new Buffer(match2[2].replace(/[\r\n]/g, ''), 'base64')
decrypted = Buffer.from(match2[2].replace(/[\r\n]/g, ''), 'base64')
} else {
var suite = 'aes' + match[1]
var iv = Buffer.from(match[2], 'hex')

View File

@@ -47,7 +47,7 @@ function parseKeys (buffer) {
}
default: throw new Error('unknown key id ' + subtype)
}
throw new Error('unknown key type ' + type)
// throw new Error('unknown key type ' + type)
case 'ENCRYPTED PRIVATE KEY':
data = asn1.EncryptedPrivateKey.decode(data, 'der')
data = decrypt(data, password)
@@ -71,7 +71,7 @@ function parseKeys (buffer) {
}
default: throw new Error('unknown key id ' + subtype)
}
throw new Error('unknown key type ' + type)
// throw new Error('unknown key type ' + type)
case 'RSA PUBLIC KEY':
return asn1.RSAPublicKey.decode(data, 'der')
case 'RSA PRIVATE KEY':

View File

@@ -1,50 +1,49 @@
{
"_args": [
[
"parse-asn1@5.1.5",
"parse-asn1@5.1.6",
"/home/henry/Documents/git/Speedtest-tracker-docker/conf/site"
]
],
"_development": true,
"_from": "parse-asn1@5.1.5",
"_id": "parse-asn1@5.1.5",
"_from": "parse-asn1@5.1.6",
"_id": "parse-asn1@5.1.6",
"_inBundle": false,
"_integrity": "sha512-jkMYn1dcJqF6d5CpU689bq7w/b5ALS9ROVSpQDPrZsqqesUJii9qutvoT5ltGedNXMO2e16YUWIghG9KxaViTQ==",
"_integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==",
"_location": "/parse-asn1",
"_phantomChildren": {},
"_requested": {
"type": "version",
"registry": true,
"raw": "parse-asn1@5.1.5",
"raw": "parse-asn1@5.1.6",
"name": "parse-asn1",
"escapedName": "parse-asn1",
"rawSpec": "5.1.5",
"rawSpec": "5.1.6",
"saveSpec": null,
"fetchSpec": "5.1.5"
"fetchSpec": "5.1.6"
},
"_requiredBy": [
"/browserify-sign",
"/public-encrypt"
],
"_resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.5.tgz",
"_spec": "5.1.5",
"_resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz",
"_spec": "5.1.6",
"_where": "/home/henry/Documents/git/Speedtest-tracker-docker/conf/site",
"author": "",
"bugs": {
"url": "https://github.com/crypto-browserify/parse-asn1/issues"
},
"dependencies": {
"asn1.js": "^4.0.0",
"asn1.js": "^5.2.0",
"browserify-aes": "^1.0.0",
"create-hash": "^1.1.0",
"evp_bytestokey": "^1.0.0",
"pbkdf2": "^3.0.3",
"safe-buffer": "^5.1.1"
},
"description": "utility library for parsing asn1 files for use with browserify-sign.",
"devDependencies": {
"standard": "^5.0.0",
"tape": "^3.4.0"
"standard": "^14.3.4",
"tape": "^5.0.1"
},
"files": [
"asn1.js",
@@ -66,5 +65,5 @@
"test": "npm run standard && npm run unit",
"unit": "node ./test"
},
"version": "5.1.5"
"version": "5.1.6"
}