coolaj86
/
x509.js
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

v0.7.2: bugfixes for @root/keypairs.js

This commit is contained in:
AJ ONeal 2019-10-15 04:06:54 -06:00
parent b051cb96b0
commit c089e05908
6 changed files with 135 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
dist/x509.all.js vendored
View File

@ -536,7 +536,7 @@ X509.parsePkcs1 = function parseRsaPkcs1(asn1, jwk) {
}
// might be a buffer
if (!Array.isArray(asn1)) {
if (asn1.byteLength) {
asn1 = ASN1.parse({ der: asn1, verbose: true, json: false });
}
@ -664,7 +664,7 @@ X509.parseRsaPkcs8 = function parseRsaPkcs8(asn1, jwk) {
}
// might be a buffer
if (!Array.isArray(asn1)) {
if (asn1.byteLength) {
asn1 = ASN1.parse({ der: asn1, verbose: true, json: false });
}
if (
@ -696,6 +696,7 @@ X509.parseRsaPkcs8 = function parseRsaPkcs8(asn1, jwk) {
'not an RSA PKCS#8 public or private key (wrong format)'
);
}
return jwk;
};
@ -739,6 +740,47 @@ X509.parseEcSpki = function(u8, jwk) {
X509.parsePkix = X509.parseSpki;
// TODO look for ECDSA as well
X509._parseRsa = function(asn1) {
// accepting der for compatability with other usages
if (asn1.byteLength) {
asn1 = ASN1.parse({ der: asn1, verbose: true, json: false });
}
var meta = { kty: 'RSA', format: 'pkcs1', public: true };
//meta.asn1 = ASN1.parse(u8);
if (
asn1.children.every(function(el) {
return 0x02 === el.type;
})
) {
if (2 === asn1.children.length) {
// rsa pkcs1 public
//return meta;
} else if (asn1.children.length >= 9) {
// the standard allows for "otherPrimeInfos", hence at least 9
meta.public = false;
// rsa pkcs1 private
//return meta;
} else {
throw new Error(
'not an RSA PKCS#1 public or private key (wrong number of ints)'
);
}
} else {
meta.format = 'pkcs8';
}
var jwk = { kty: 'RSA', n: null, e: null };
if ('pkcs1' === meta.format) {
return X509.parsePkcs1(asn1, jwk);
} else {
return X509.parsePkcs8(asn1, jwk);
}
};
// 1.2.840.10045.3.1.7
// prime256v1 (ANSI X9.62 named elliptic curve)

2
dist/x509.all.min.js vendored
View File

File diff suppressed because one or more lines are too long

46
dist/x509.js vendored
View File

@ -18,7 +18,7 @@ X509.parsePkcs1 = function parseRsaPkcs1(asn1, jwk) {
}
// might be a buffer
if (!Array.isArray(asn1)) {
if (asn1.byteLength) {
asn1 = ASN1.parse({ der: asn1, verbose: true, json: false });
}
@ -146,7 +146,7 @@ X509.parseRsaPkcs8 = function parseRsaPkcs8(asn1, jwk) {
}
// might be a buffer
if (!Array.isArray(asn1)) {
if (asn1.byteLength) {
asn1 = ASN1.parse({ der: asn1, verbose: true, json: false });
}
if (
@ -178,6 +178,7 @@ X509.parseRsaPkcs8 = function parseRsaPkcs8(asn1, jwk) {
'not an RSA PKCS#8 public or private key (wrong format)'
);
}
return jwk;
};
@ -221,6 +222,47 @@ X509.parseEcSpki = function(u8, jwk) {
X509.parsePkix = X509.parseSpki;
// TODO look for ECDSA as well
X509._parseRsa = function(asn1) {
// accepting der for compatability with other usages
if (asn1.byteLength) {
asn1 = ASN1.parse({ der: asn1, verbose: true, json: false });
}
var meta = { kty: 'RSA', format: 'pkcs1', public: true };
//meta.asn1 = ASN1.parse(u8);
if (
asn1.children.every(function(el) {
return 0x02 === el.type;
})
) {
if (2 === asn1.children.length) {
// rsa pkcs1 public
//return meta;
} else if (asn1.children.length >= 9) {
// the standard allows for "otherPrimeInfos", hence at least 9
meta.public = false;
// rsa pkcs1 private
//return meta;
} else {
throw new Error(
'not an RSA PKCS#1 public or private key (wrong number of ints)'
);
}
} else {
meta.format = 'pkcs8';
}
var jwk = { kty: 'RSA', n: null, e: null };
if ('pkcs1' === meta.format) {
return X509.parsePkcs1(asn1, jwk);
} else {
return X509.parsePkcs8(asn1, jwk);
}
};
// 1.2.840.10045.3.1.7
// prime256v1 (ANSI X9.62 named elliptic curve)

2
dist/x509.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "@root/x509",
"version": "0.7.1",
"version": "0.7.2",
"description": "VanillaJS, Lightweight, Zero-Dependency, X509 schema encoder and decoder.",
"main": "index.js",
"browser": {

46
parsers.js
View File

@ -17,7 +17,7 @@ X509.parsePkcs1 = function parseRsaPkcs1(asn1, jwk) {
}
// might be a buffer
if (!Array.isArray(asn1)) {
if (asn1.byteLength) {
asn1 = ASN1.parse({ der: asn1, verbose: true, json: false });
}
@ -145,7 +145,7 @@ X509.parseRsaPkcs8 = function parseRsaPkcs8(asn1, jwk) {
}
// might be a buffer
if (!Array.isArray(asn1)) {
if (asn1.byteLength) {
asn1 = ASN1.parse({ der: asn1, verbose: true, json: false });
}
if (
@ -177,6 +177,7 @@ X509.parseRsaPkcs8 = function parseRsaPkcs8(asn1, jwk) {
'not an RSA PKCS#8 public or private key (wrong format)'
);
}
return jwk;
};
@ -219,3 +220,44 @@ X509.parseEcSpki = function(u8, jwk) {
};
X509.parsePkix = X509.parseSpki;
// TODO look for ECDSA as well
X509._parseRsa = function(asn1) {
// accepting der for compatability with other usages
if (asn1.byteLength) {
asn1 = ASN1.parse({ der: asn1, verbose: true, json: false });
}
var meta = { kty: 'RSA', format: 'pkcs1', public: true };
//meta.asn1 = ASN1.parse(u8);
if (
asn1.children.every(function(el) {
return 0x02 === el.type;
})
) {
if (2 === asn1.children.length) {
// rsa pkcs1 public
//return meta;
} else if (asn1.children.length >= 9) {
// the standard allows for "otherPrimeInfos", hence at least 9
meta.public = false;
// rsa pkcs1 private
//return meta;
} else {
throw new Error(
'not an RSA PKCS#1 public or private key (wrong number of ints)'
);
}
} else {
meta.format = 'pkcs8';
}
var jwk = { kty: 'RSA', n: null, e: null };
if ('pkcs1' === meta.format) {
return X509.parsePkcs1(asn1, jwk);
} else {
return X509.parsePkcs8(asn1, jwk);
}
};