tanx updates

This commit is contained in:
Bart Butler 2015-05-22 12:02:23 -07:00
parent e8465350fc
commit 2a89baa837
2 changed files with 15 additions and 15 deletions

View File

@ -140,17 +140,6 @@ function RSA() {
// 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) {
var Euint32 = new Uint32Array([parseInt(E, 16)]); // get integer of exponent
var Euint8 = new Uint8Array(Euint32.buffer); // get bytes of exponent
@ -195,7 +184,7 @@ function RSA() {
function exportKey(keypair) {
// export the generated keys as JsonWebKey (JWK)
// https://tools.ietf.org/html/draft-ietf-jose-json-web-key-33
key = webCrypto.exportKey('jwk', keypair.privateKey);
var key = webCrypto.exportKey('jwk', keypair.privateKey);
if (!(key instanceof Promise)) { // IE11 KeyOperation
key = convertKeyOperation(key, 'Error exporting RSA key pair.');
}
@ -221,6 +210,17 @@ function RSA() {
return key;
}
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);
}
});
}
//
// JS code
//