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

Fix decoding of JWK. Webcrypto works.

Browse Source
This commit is contained in:
Tankred Hase 2014-09-30 21:57:46 +02:00
parent 85d2199971
commit 7c2cf89589
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -140,12 +140,15 @@ function RSA() {
// //
if (typeof window !== 'undefined' && window.crypto && window.crypto.subtle) { if (typeof window !== 'undefined' && window.crypto && window.crypto.subtle) {
var Euint32 = new Uint32Array([parseInt(E, 16)]); // get integer of exponent
var Eunit8 = new Uint8Array(Euint32.buffer); // get bytes of exponent
var keyGenOpt = { var 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: new Uint8Array([0x01, 0x00, 0x01]), // Equivalent to 65537, TODO: use provided argument E publicExponent: Eunit8.subarray(0, 3), // take three bytes (max 65537)
hash: { hash: {
name: 'SHA-256' // not required for actual RSA keys, but for crypto api 'sign' and 'verifiy' name: 'SHA-1' // not required for actual RSA keys, but for crypto api 'sign' and 'verifiy'
} }
}; };
@ -171,15 +174,17 @@ function RSA() {
function onExported(jwk) { function onExported(jwk) {
// map JWK parameters to local BigInteger type system // map JWK parameters to local BigInteger type system
var key = new keyObject(); var key = new keyObject();
key.n = new BigInteger(util.hexstrdump(base64(jwk.n)), 16); key.n = toBigInteger(jwk.n);
key.ee = new BigInteger(E, 16); key.ee = new BigInteger(E, 16);
key.d = new BigInteger(util.hexstrdump(base64(jwk.d)), 16); key.d = toBigInteger(jwk.d);
key.p = new BigInteger(util.hexstrdump(base64(jwk.p)), 16); key.p = toBigInteger(jwk.p);
key.q = new BigInteger(util.hexstrdump(base64(jwk.q)), 16); key.q = toBigInteger(jwk.q);
key.u = key.p.modInverse(key.q); key.u = key.p.modInverse(key.q);
function base64(base64url) { function toBigInteger(base64url) {
return base64url.replace(/-/g, '+').replace(/_/g, '/'); var base64 = base64url.replace(/\-/g, '+').replace(/_/g, '/');
var hex = util.hexstrdump(atob(base64));
return new BigInteger(hex, 16);
} }
callback(null, key); callback(null, key);

5
src/openpgp.js
View File

@ -240,6 +240,11 @@ function generateKeyPair(options, callback) {
} }
key.generate(options, function(err, newKey) { key.generate(options, function(err, newKey) {
if (err) {
callback(err);
return;
}
var result = {}; var result = {};
result.key = newKey; result.key = newKey;
result.privateKeyArmored = newKey.armor(); result.privateKeyArmored = newKey.armor();