Support for crypto API keygen in IE11 on Windows 7 and 8
This commit is contained in:
parent
f0808c6e0c
commit
e8465350fc
|
@ -140,12 +140,33 @@ function RSA() {
|
||||||
// Native RSA keygen using Web Crypto
|
// Native RSA keygen using Web Crypto
|
||||||
//
|
//
|
||||||
|
|
||||||
|
function convertKeyOperation(keyop, errmsg) {
|
||||||
|
return new Promise(function(resolve, reject) {
|
||||||
|
keyop.onerror = function (err) {
|
||||||
|
reject(new Error(errmsg));
|
||||||
|
}
|
||||||
|
keyop.oncomplete = function (e) {
|
||||||
|
resolve(e.target.result);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
if (webCrypto) {
|
if (webCrypto) {
|
||||||
var Euint32 = new Uint32Array([parseInt(E, 16)]); // get integer of exponent
|
var Euint32 = new Uint32Array([parseInt(E, 16)]); // get integer of exponent
|
||||||
var Euint8 = new Uint8Array(Euint32.buffer); // get bytes of exponent
|
var Euint8 = new Uint8Array(Euint32.buffer); // get bytes of exponent
|
||||||
var keyGenOpt;
|
var keyGenOpt;
|
||||||
|
|
||||||
if (window.crypto.subtle) {
|
var keys;
|
||||||
|
if (window.crypto && window.crypto.webkitSubtle) {
|
||||||
|
// outdated spec implemented by Webkit
|
||||||
|
keyGenOpt = {
|
||||||
|
name: 'RSA-OAEP',
|
||||||
|
modulusLength: B, // the specified keysize in bits
|
||||||
|
publicExponent: Euint8.subarray(0, 3), // take three bytes (max 65537)
|
||||||
|
};
|
||||||
|
keys = webCrypto.generateKey(keyGenOpt, true, ['encrypt', 'decrypt']);
|
||||||
|
}
|
||||||
|
else {
|
||||||
// current standard spec
|
// current standard spec
|
||||||
keyGenOpt = {
|
keyGenOpt = {
|
||||||
name: 'RSASSA-PKCS1-v1_5',
|
name: 'RSASSA-PKCS1-v1_5',
|
||||||
|
@ -155,29 +176,30 @@ function RSA() {
|
||||||
name: 'SHA-1' // not required for actual RSA keys, but for crypto api 'sign' and 'verify'
|
name: 'SHA-1' // not required for actual RSA keys, but for crypto api 'sign' and 'verify'
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
return webCrypto.generateKey(keyGenOpt, true, ['sign', 'verify']).then(exportKey).then(decodeKey);
|
|
||||||
|
keys = webCrypto.generateKey(keyGenOpt, true, ['sign', 'verify']);
|
||||||
} else if (window.crypto.webkitSubtle) {
|
if(!(keys instanceof Promise)) { // IE11 KeyOperation
|
||||||
// outdated spec implemented by Webkit
|
keys = convertKeyOperation(keys, 'Error generating RSA key pair.');
|
||||||
keyGenOpt = {
|
}
|
||||||
name: 'RSA-OAEP',
|
|
||||||
modulusLength: B, // the specified keysize in bits
|
|
||||||
publicExponent: Euint8.subarray(0, 3), // take three bytes (max 65537)
|
|
||||||
};
|
|
||||||
return webCrypto.generateKey(keyGenOpt, true, ['encrypt', 'decrypt']).then(exportKey).then(function(key) {
|
|
||||||
if (key instanceof ArrayBuffer) {
|
|
||||||
// parse raw ArrayBuffer bytes to jwk/json (WebKit/Safari quirk)
|
|
||||||
return decodeKey(JSON.parse(String.fromCharCode.apply(null, new Uint8Array(key))));
|
|
||||||
}
|
|
||||||
return decodeKey(key);
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return keys.then(exportKey).then(function(key) {
|
||||||
|
if (key instanceof ArrayBuffer) {
|
||||||
|
// parse raw ArrayBuffer bytes to jwk/json (WebKit/Safari/IE11 quirk)
|
||||||
|
return decodeKey(JSON.parse(String.fromCharCode.apply(null, new Uint8Array(key))));
|
||||||
|
}
|
||||||
|
return decodeKey(key);
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function exportKey(keypair) {
|
function exportKey(keypair) {
|
||||||
// export the generated keys as JsonWebKey (JWK)
|
// export the generated keys as JsonWebKey (JWK)
|
||||||
// https://tools.ietf.org/html/draft-ietf-jose-json-web-key-33
|
// https://tools.ietf.org/html/draft-ietf-jose-json-web-key-33
|
||||||
return webCrypto.exportKey('jwk', keypair.privateKey);
|
key = webCrypto.exportKey('jwk', keypair.privateKey);
|
||||||
|
if(!(key instanceof Promise)) { // IE11 KeyOperation
|
||||||
|
key = convertKeyOperation(key, 'Error exporting RSA key pair.');
|
||||||
|
}
|
||||||
|
return key;
|
||||||
}
|
}
|
||||||
|
|
||||||
function decodeKey(jwk) {
|
function decodeKey(jwk) {
|
||||||
|
|
|
@ -320,8 +320,13 @@ module.exports = {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (typeof window !== 'undefined' && window.crypto) {
|
if (typeof window !== 'undefined') {
|
||||||
return window.crypto.subtle || window.crypto.webkitSubtle;
|
if(window.crypto) {
|
||||||
|
return window.crypto.subtle || window.crypto.webkitSubtle;
|
||||||
|
}
|
||||||
|
if(window.msCrypto) {
|
||||||
|
return window.msCrypto.subtle;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in New Issue
Block a user