suzanne.soy/fork-openpgpjs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add native RSA keygen (WebCrypto) support for Safari/iOS

Browse Source
This commit is contained in:
Tankred Hase 2015-02-13 21:36:06 +01:00
parent 6835ff0872
commit cb3cc86a88
2 changed files with 34 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/crypto/public_key/rsa.js
View File

@ -135,7 +135,6 @@ function RSA() {
function generate(B, E) { function generate(B, E) {
var webCrypto = util.getWebCrypto(); var webCrypto = util.getWebCrypto();
var promise;
// //
// Native RSA keygen using Web Crypto // Native RSA keygen using Web Crypto
@ -144,7 +143,11 @@ function RSA() {
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) {
// current standard spec
keyGenOpt = {
name: 'RSASSA-PKCS1-v1_5', name: 'RSASSA-PKCS1-v1_5',
modulusLength: B, // the specified keysize in bits modulusLength: B, // the specified keysize in bits
publicExponent: Euint8.subarray(0, 3), // take three bytes (max 65537) publicExponent: Euint8.subarray(0, 3), // take three bytes (max 65537)
@ -152,14 +155,29 @@ 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'
} }
}; };
promise = webCrypto.generateKey(keyGenOpt, true, ['sign', 'verify']); return webCrypto.generateKey(keyGenOpt, true, ['sign', 'verify']).then(exportKey).then(decodeKey);
return promise.then(exportKey).then(decodeKey);
} else if (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)
};
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);
});
}
} }
function exportKey(key) { 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', key.privateKey); return webCrypto.exportKey('jwk', keypair.privateKey);
} }
function decodeKey(jwk) { function decodeKey(jwk) {
@ -185,7 +203,7 @@ function RSA() {
// JS code // JS code
// //
promise = new Promise(function(resolve) { return new Promise(function(resolve) {
var key = new keyObject(); var key = new keyObject();
var rng = new SecureRandom(); var rng = new SecureRandom();
var qs = B >> 1; var qs = B >> 1;
@ -223,8 +241,6 @@ function RSA() {
resolve(key); resolve(key);
}); });
return promise;
} }
this.encrypt = encrypt; this.encrypt = encrypt;

4
src/util.js
View File

@ -320,8 +320,8 @@ module.exports = {
return; return;
} }
if (typeof window !== 'undefined' && window.crypto && window.crypto.subtle) { if (typeof window !== 'undefined' && window.crypto) {
return window.crypto.subtle; return window.crypto.subtle || window.crypto.webkitSubtle;
} }
} }
}; };